Add beta setting for Employee authentication (#1003)

* Add beta feature flag for Employee authentication

lib/shopify-cli/commands/config.rb

@@ -7,6 +7,7 @@ class Config < ShopifyCli::Command
 
       subcommand :Feature, 'feature'
       subcommand :Analytics, 'analytics'
+      subcommand :ShopifolkBeta, 'shopifolk-beta'
 
       def call(*)
         @ctx.puts(self.class.help)
@@ -71,6 +72,29 @@ def call(_args, _name)
           end
         end
       end
+
+      class ShopifolkBeta < ShopifyCli::SubCommand
+        options do |parser, flags|
+          parser.on('--enable') { flags[:action] = 'enable' }
+          parser.on('--disable') { flags[:action] = 'disable' }
+          parser.on('--status') { flags[:action] = 'status' }
+        end
+
+        def call(_args, _name)
+          is_enabled = ShopifyCli::Config.get_bool('shopifolk-beta', 'enabled')
+          if options.flags[:action] == 'disable' && is_enabled
+            ShopifyCli::Config.set('shopifolk-beta', 'enabled', false)
+            @ctx.puts(@ctx.message('core.config.shopifolk_beta.disabled'))
+          elsif options.flags[:action] == 'enable' && !is_enabled
+            ShopifyCli::Config.set('shopifolk-beta', 'enabled', true)
+            @ctx.puts(@ctx.message('core.config.shopifolk_beta.enabled'))
+          elsif is_enabled
+            @ctx.puts(@ctx.message('core.config.shopifolk_beta.is_enabled'))
+          else
+            @ctx.puts(@ctx.message('core.config.shopifolk_beta.is_disabled'))
+          end
+        end
+      end
     end
   end
 end

lib/shopify-cli/messages/messages.rb

@@ -76,6 +76,16 @@ module Messages
             is_enabled: "{{v}} analytics are currently enabled",
             is_disabled: "{{v}} analytics are currently disabled",
           },
+          shopifolk_beta: {
+            help: <<~HELP,
+            Opt in/out of shopifolk beta
+              Usage: {{command:%s config [ analytics ] }}
+            HELP
+            enabled: "{{v}} shopifolk-beta has been enabled",
+            disabled: "{{v}} shopifolk-beta has been disabled",
+            is_enabled: "{{v}} shopifolk-beta is currently enabled",
+            is_disabled: "{{v}} shopifolk-beta is currently disabled",
+          },
         },
 
         git: {

lib/shopify-cli/shopifolk.rb

@@ -25,6 +25,7 @@ class << self
       #     ShopifyCli::Shopifolk.check
       #
       def check
+        return false unless Feature.enabled?('shopifolk-beta')
         ShopifyCli::Shopifolk.new.shopifolk?
       end
 
@@ -50,7 +51,9 @@ def reset
     # a valid google cloud config file with email ending in "@shopify.com"
     #
     def shopifolk?
+      return false unless Feature.enabled?('shopifolk-beta')
       return true if Feature.enabled?(FEATURE_NAME)
+
       if shopifolk_by_gcloud? && shopifolk_by_dev?
         ShopifyCli::Feature.enable(FEATURE_NAME)
         true

test/shopify-cli/commands/config_test.rb

@@ -62,6 +62,18 @@ def test_will_disable_analytics_that_is_enabled
         run_cmd("config analytics --disable")
         refute ShopifyCli::Config.get_bool('analytics', 'enabled')
       end
+
+      def test_will_enable_shopifolk_beta_that_is_disabled
+        ShopifyCli::Config.set('shopifolk-beta', 'enabled', false)
+        run_cmd("config shopifolk-beta --enable")
+        assert ShopifyCli::Config.get_bool('shopifolk-beta', 'enabled')
+      end
+
+      def test_will_disable_shopifolk_beta_that_is_enabled
+        ShopifyCli::Config.set('shopifolk-beta', 'enabled', true)
+        run_cmd("config shopifolk-beta --disable")
+        refute ShopifyCli::Config.get_bool('shopifolk-beta', 'enabled')
+      end
     end
   end
 end

test/shopify-cli/shopifolk_test.rb

@@ -5,8 +5,13 @@ module ShopifyCli
   class ShopifolkTest < MiniTest::Test
     include TestHelpers::FakeFS
 
-    def test_correct_features_is_shopifolk
+    def setup
+      super
+      ShopifyCli::Feature.enable('shopifolk-beta')
       ShopifyCli::Feature.disable('shopifolk')
+    end
+
+    def test_correct_features_is_shopifolk
       FileUtils.mkdir_p("/opt/dev/bin")
       FileUtils.touch("/opt/dev/bin/dev")
       FileUtils.touch("/opt/dev/.shopify-build")
@@ -24,17 +29,14 @@ def test_feature_always_returns_true
     end
 
     def test_no_gcloud_config_disables_shopifolk_feature
-      ShopifyCli::Feature.enable('shopifolk')
-      ShopifyCli::Feature.stubs(:enabled?).with('shopifolk').returns(false)
+      refute ShopifyCli::Config.get_bool('features', 'shopifolk')
 
       ShopifyCli::Shopifolk.check
 
       refute ShopifyCli::Config.get_bool('features', 'shopifolk')
     end
 
     def test_no_section_in_gcloud_config_disables_shopifolk_feature
-      ShopifyCli::Feature.enable('shopifolk')
-      ShopifyCli::Feature.stubs(:enabled?).with('shopifolk').returns(false)
       stub_gcloud_ini({ "account" => "[email protected]", "project" => "shopify-dev" })
 
       ShopifyCli::Shopifolk.check
@@ -43,8 +45,6 @@ def test_no_section_in_gcloud_config_disables_shopifolk_feature
     end
 
     def test_no_account_in_gcloud_config_disables_shopifolk_feature
-      ShopifyCli::Feature.enable('shopifolk')
-      ShopifyCli::Feature.stubs(:enabled?).with('shopifolk').returns(false)
       stub_gcloud_ini({ "[core]" => { "project" => "shopify-dev" } })
 
       ShopifyCli::Shopifolk.check
@@ -53,8 +53,6 @@ def test_no_account_in_gcloud_config_disables_shopifolk_feature
     end
 
     def test_incorrect_email_in_gcloud_config_disables_shopifolk_feature
-      ShopifyCli::Feature.enable('shopifolk')
-      ShopifyCli::Feature.stubs(:enabled?).with('shopifolk').returns(false)
       stub_gcloud_ini({ "[core]" => { "account" => "[email protected]", "project" => "shopify-dev" } })
 
       ShopifyCli::Shopifolk.check
@@ -63,8 +61,6 @@ def test_incorrect_email_in_gcloud_config_disables_shopifolk_feature
     end
 
     def test_incorrect_dev_path_disables_dev_shopifolk_feature
-      ShopifyCli::Feature.enable('shopifolk')
-      ShopifyCli::Feature.stubs(:enabled?).with('shopifolk').returns(false)
       stub_gcloud_ini({ "[core]" => { "account" => "[email protected]", "project" => "shopify-dev" } })
 
       ShopifyCli::Shopifolk.check