shopify-cli 1.2.0 → 1.5.0

data/lib/shopify-cli/messages/messages.rb

@@ -3,6 +3,16 @@
 module ShopifyCli
   module Messages
     MESSAGES = {
+      apps: {
+        create: {
+          info: {
+            created: "{{v}} {{green:%s}} was created in the organization's Partner Dashboard {{underline:%s}}",
+            serve: "{{*}} Change directories to your new project folder {{green:%s}} and run {{command:%s serve}} " \
+            "to start a local server",
+            install: "{{*}} Then, visit {{underline:%s/test}} to install {{green:%s}} on your Dev Store",
+          },
+        },
+      },
       core: {
         connect: {
           help: <<~HELP,
@@ -10,11 +20,7 @@ module ShopifyCli
             Usage: {{command:%s connect}}
           HELP
 
-          production_warning: <<~MESSAGE,
-          {{yellow:! Warning: if you have connected to an {{bold:app in production}}, running {{command:serve}} may update the app URL and cause an outage.
-          MESSAGE
           already_connected_warning: "{{yellow:! This app appears to be already connected}}",
-          connected: "{{v}} Project now connected to {{green:%s}}",
           project_type_select: "What type of project would you like to connect?",
           cli_yml_saved: ".shopify-cli.yml saved to project root",
         },
@@ -48,13 +54,37 @@ module ShopifyCli
         config: {
           help: <<~HELP,
           Change configuration of how the CLI operates
-            Usage: {{command:%s config [ feature ] [ feature_name ] }}
+            Usage: {{command:%s config [ feature | analytics ] }}
           HELP
           feature: {
-            enabled: "{{v}} feature {{green:%s}} was enabled",
-            disabled: "{{v}} feature {{green:%s}} was disabled",
-            is_enabled: "{{v}} feature {{green:%s}} is enabled",
-            is_disabled: "{{v}} feature {{green:%s}} is disabled",
+            help: <<~HELP,
+            Change configuration of various features
+              Usage: {{command:%s config [ feature ] [ feature_name ] }}
+            HELP
+            enabled: "{{v}} feature {{green:%s}} has been enabled",
+            disabled: "{{v}} feature {{green:%s}} has been disabled",
+            is_enabled: "{{v}} feature {{green:%s}} is currently enabled",
+            is_disabled: "{{v}} feature {{green:%s}} is currently disabled",
+          },
+          analytics: {
+            help: <<~HELP,
+            Opt in/out of anonymous usage reporting
+              Usage: {{command:%s config [ analytics ] }}
+            HELP
+            enabled: "{{v}} analytics have been enabled",
+            disabled: "{{v}} analytics have been disabled",
+            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",
           },
         },
 
@@ -163,6 +193,7 @@ module ShopifyCli
         api: {
           error: {
             internal_server_error: '{{red:{{x}} An unexpected error occurred on Shopify.}}',
+            internal_server_error_debug: "\n{{red:Response details:}}\n%s\n\n",
           },
         },
 
@@ -237,6 +268,8 @@ module ShopifyCli
           },
           environment_header: "{{bold:Environment}}",
           env: "%-17s = %s",
+          identity_header: "{{bold:Identity}}",
+          identity_is_shopifolk: "{{v}} Checked user settings: you’re Shopify staff!",
         },
 
         tasks: {
@@ -283,6 +316,8 @@ module ShopifyCli
               organization_not_found: "Cannot find a partner organization with that ID",
               partners_notice: "Please visit https://partners.shopify.com/ to create a partners account",
             },
+            first_party: "Are you working on a 1P (1st Party) app?",
+            identified_as_shopify: "We've identified you as a {{green:Shopify}} employee.",
             organization: "Partner organization {{green:%s (%s)}}",
             organization_select: "Select partner organization",
           },

data/lib/shopify-cli/partners_api.rb

@@ -27,7 +27,7 @@ module ShopifyCli
       # #### Parameters
       # - `ctx`: running context from your command
       # - `query_name`: name of the query you want to use, loaded from the `lib/graphql` directory.
-      # - `**variable`: a hash of variables to be supplied to the query ro mutation
+      # - `**variables`: a hash of variables to be supplied to the query or mutation
       #
       # #### Raises
       #
@@ -50,6 +50,13 @@ module ShopifyCli
         end
       end
 
+      def partners_url_for(organization_id, api_client_id, local_debug)
+        if ShopifyCli::Shopifolk.acting_as_shopify_organization?
+          organization_id = 'internal'
+        end
+        "#{partners_endpoint(local_debug)}/#{organization_id}/apps/#{api_client_id}"
+      end
+
       private
 
       def authenticated_req(ctx)
@@ -105,6 +112,15 @@ module ShopifyCli
         return 'https://partners.shopify.com' if ENV[LOCAL_DEBUG].nil?
         'https://partners.myshopify.io/'
       end
+
+      def partners_endpoint(local_debug)
+        domain = if local_debug
+          'partners.myshopify.io'
+        else
+          'partners.shopify.com'
+        end
+        "https://#{domain}"
+      end
     end
 
     def auth_headers(token)

data/lib/shopify-cli/process_supervision.rb

@@ -206,7 +206,7 @@ module ShopifyCli
       unless ctx.windows?
         Process.kill('TERM', id)
         50.times do
-          sleep 0.1
+          sleep(0.1)
           break unless stat(id)
         end
       end

data/lib/shopify-cli/project.rb

@@ -34,7 +34,8 @@ module ShopifyCli
       #   project = ShopifyCli::Project.current
       #
       def current(force_reload: false)
-        at(Dir.pwd, force_reload: force_reload)
+        clear if force_reload
+        at(Dir.pwd)
       end
 
       ##
@@ -87,27 +88,30 @@ module ShopifyCli
         content = Hash[{ project_type: project_type, organization_id: organization_id.to_i }
           .merge(identifiers)
           .collect { |k, v| [k.to_s, v] }]
+        content['shopify_organization'] = true if Shopifolk.acting_as_shopify_organization?
 
         ctx.write('.shopify-cli.yml', YAML.dump(content))
+        clear
       end
 
       def project_name
         File.basename(current.directory)
       end
 
-      private
+      def clear
+        @at = nil
+        @dir = nil
+      end
 
-      def directory(dir, force_reload: false)
-        @dir = nil if force_reload
+      private
 
+      def directory(dir)
         @dir ||= Hash.new { |h, k| h[k] = __directory(k) }
         @dir[dir]
       end
 
-      def at(dir, force_reload: false)
-        @at = nil if force_reload
-
-        proj_dir = directory(dir, force_reload: force_reload)
+      def at(dir)
+        proj_dir = directory(dir)
         unless proj_dir
           raise(ShopifyCli::Abort, Context.message('core.project.error.not_in_project'))
         end

data/lib/shopify-cli/project_type.rb

@@ -45,8 +45,11 @@ module ShopifyCli
         File.join(ShopifyCli::PROJECT_TYPES_DIR, project_type.to_s, path)
       end
 
-      def creator(name, command_const)
+      def title(name)
         @project_name = name
+      end
+
+      def creator(command_const)
         @project_creator_command_class = command_const
         ShopifyCli::Commands::Create.subcommand(command_const, @project_type)
       end
@@ -55,6 +58,19 @@ module ShopifyCli
         const_get(@project_creator_command_class)
       end
 
+      def connector(command_const)
+        @project_connector_command_class = command_const
+        ShopifyCli::Commands::Connect.subcommand(command_const, @project_type)
+      end
+
+      def connect_command
+        if @project_connector_command_class.nil?
+          nil
+        else
+          const_get(@project_connector_command_class)
+        end
+      end
+
       def register_command(const, cmd)
         return if project_load_shallow
         Context.new.abort(

data/lib/shopify-cli/shopifolk.rb

@@ -0,0 +1,86 @@
+module ShopifyCli
+  ##
+  # ShopifyCli::Shopifolk contains the logic to determine if the user appears to be a Shopify staff
+  #
+  # The Shopifolk Feature flag will persist between runs so if the flag is enabled or disabled,
+  # it will still be in that same state until the next class invocation.
+  class Shopifolk
+    GCLOUD_CONFIG_FILE = File.expand_path('~/.config/gcloud/configurations/config_default')
+    DEV_PATH = '/opt/dev'
+    SECTION = 'core'
+    FEATURE_NAME = 'shopifolk'
+
+    class << self
+      attr_writer :acting_as_shopify_organization
+
+      ##
+      # will return if the user appears to be a Shopify employee, based on several heuristics
+      #
+      # #### Returns
+      #
+      # * `is_shopifolk` - returns true if the user is a Shopify Employee
+      #
+      # #### Example
+      #
+      #     ShopifyCli::Shopifolk.check
+      #
+      def check
+        return false unless Feature.enabled?('shopifolk-beta')
+        ShopifyCli::Shopifolk.new.shopifolk?
+      end
+
+      def act_as_shopify_organization
+        @acting_as_shopify_organization = true
+      end
+
+      def acting_as_shopify_organization?
+        !!@acting_as_shopify_organization || (Project.has_current? && Project.current.config['shopify_organization'])
+      end
+
+      def reset
+        @acting_as_shopify_organization = nil
+      end
+    end
+
+    ##
+    # will return if the user is a Shopify employee
+    #
+    # #### Returns
+    #
+    # * `is_shopifolk` - returns true if the user has `dev` installed and
+    # 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
+      else
+        ShopifyCli::Feature.disable(FEATURE_NAME)
+        false
+      end
+    end
+
+    private
+
+    def shopifolk_by_gcloud?
+      ini&.dig("[#{SECTION}]", 'account')&.match?(/@shopify.com\z/)
+    end
+
+    def shopifolk_by_dev?
+      File.exist?("#{DEV_PATH}/bin/dev") && File.exist?("#{DEV_PATH}/.shopify-build")
+    end
+
+    def ini
+      @ini ||= begin
+        if File.exist?(GCLOUD_CONFIG_FILE)
+          CLI::Kit::Ini
+            .new(GCLOUD_CONFIG_FILE, default_section: "[#{SECTION}]", convert_types: false)
+            .tap(&:parse).ini
+        end
+      end
+    end
+  end
+end

data/lib/shopify-cli/task.rb

@@ -6,5 +6,13 @@ module ShopifyCli
       task = new
       task.call(*args, **kwargs)
     end
+
+    private
+
+    def wants_to_run_against_shopify_org?
+      @ctx.puts(@ctx.message('core.tasks.select_org_and_shop.identified_as_shopify'))
+      message = @ctx.message('core.tasks.select_org_and_shop.first_party')
+      CLI::UI::Prompt.confirm(message, default: false)
+    end
   end
 end

data/lib/shopify-cli/tasks/create_api_client.rb

@@ -17,12 +17,23 @@ module ShopifyCli
           redir: [OAuth::REDIRECT_HOST]
         )
 
-        user_errors = resp["data"]["appCreate"]["userErrors"]
+        unless resp
+          ctx.abort("Error - empty response")
+        end
+
+        errors = resp.dig("errors")
+        if !errors.nil? && errors.any?
+          ctx.abort(errors.map { |err| "#{err['field']} #{err['message']}" }.join(", "))
+        end
+
+        user_errors = resp.dig("data", "appCreate", "userErrors")
         if !user_errors.nil? && user_errors.any?
           ctx.abort(user_errors.map { |err| "#{err['field']} #{err['message']}" }.join(", "))
         end
 
-        resp["data"]["appCreate"]["app"]
+        ShopifyCli::Core::Monorail.metadata[:api_key] = resp.dig("data", "appCreate", "app", "apiKey")
+
+        resp.dig("data", "appCreate", "app")
       end
     end
   end

data/lib/shopify-cli/tasks/ensure_env.rb

@@ -22,6 +22,9 @@ module ShopifyCli
       private
 
       def fetch_org
+        if Shopifolk.check && wants_to_run_against_shopify_org?
+          Shopifolk.act_as_shopify_organization
+        end
         orgs = PartnersAPI::Organizations.fetch_with_app(@ctx)
         org_id = if orgs.count == 1
           orgs.first["id"]

data/lib/shopify-cli/tasks/select_org_and_shop.rb

@@ -8,8 +8,12 @@ module ShopifyCli
       def call(ctx, organization_id: nil, shop_domain: nil)
         @ctx = ctx
         return response(organization_id.to_i, shop_domain) unless organization_id.nil? || shop_domain.nil?
+        if Shopifolk.check && wants_to_run_against_shopify_org?
+          Shopifolk.act_as_shopify_organization
+        end
         org = get_organization(organization_id)
         shop_domain ||= get_shop_domain(org)
+        ShopifyCli::Core::Monorail.metadata[:organization_id] = org["id"].to_i
         response(org["id"].to_i, shop_domain)
       end
 

data/lib/shopify-cli/tunnel.rb

@@ -210,7 +210,7 @@ module ShopifyCli
       end
 
       def parse_account
-        account, timeout, _ = @log.match(/AccountName:([\w\s\d@._\-]*) SessionDuration:([\d]+) PlanName/)&.captures
+        account, timeout, _ = @log.match(/AccountName:(.*)\s+SessionDuration:([\d]+) PlanName/)&.captures
         @account = account&.empty? ? nil : account
         @timeout = timeout&.empty? ? 0 : timeout.to_i
       end

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = '1.2.0'
+  VERSION = '1.5.0'
 end

data/lib/shopify_cli.rb

@@ -116,6 +116,7 @@ module ShopifyCli
   autoload :Project, 'shopify-cli/project'
   autoload :ProjectType, 'shopify-cli/project_type'
   autoload :Resources, 'shopify-cli/resources'
+  autoload :Shopifolk, 'shopify-cli/shopifolk'
   autoload :SubCommand, 'shopify-cli/sub_command'
   autoload :Task, 'shopify-cli/task'
   autoload :Tasks, 'shopify-cli/tasks'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,8 +77,11 @@ files:
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/probots.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/triage.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".ruby-version"
 - ".tmp/.gitkeep"
 - ".tmp/sv/.gitkeep"
@@ -147,7 +150,9 @@ files:
 - lib/project_types/extension/commands/tunnel.rb
 - lib/project_types/extension/extension_project.rb
 - lib/project_types/extension/extension_project_keys.rb
-- lib/project_types/extension/features/argo.rb
+- lib/project_types/extension/features/argo/admin.rb
+- lib/project_types/extension/features/argo/base.rb
+- lib/project_types/extension/features/argo/checkout.rb
 - lib/project_types/extension/features/argo_config.rb
 - lib/project_types/extension/features/argo_dependencies.rb
 - lib/project_types/extension/features/argo_setup.rb
@@ -162,7 +167,7 @@ files:
 - lib/project_types/extension/models/registration.rb
 - lib/project_types/extension/models/type.rb
 - lib/project_types/extension/models/types/checkout_post_purchase.rb
-- lib/project_types/extension/models/types/subscription_management.rb
+- lib/project_types/extension/models/types/product_subscription.rb
 - lib/project_types/extension/models/validation_error.rb
 - lib/project_types/extension/models/version.rb
 - lib/project_types/extension/tasks/converters/app_converter.rb
@@ -175,6 +180,7 @@ files:
 - lib/project_types/extension/tasks/update_draft.rb
 - lib/project_types/extension/tasks/user_errors.rb
 - lib/project_types/node/cli.rb
+- lib/project_types/node/commands/connect.rb
 - lib/project_types/node/commands/create.rb
 - lib/project_types/node/commands/deploy.rb
 - lib/project_types/node/commands/deploy/heroku.rb
@@ -192,6 +198,7 @@ files:
 - lib/project_types/node/forms/create.rb
 - lib/project_types/node/messages/messages.rb
 - lib/project_types/rails/cli.rb
+- lib/project_types/rails/commands/connect.rb
 - lib/project_types/rails/commands/create.rb
 - lib/project_types/rails/commands/deploy.rb
 - lib/project_types/rails/commands/deploy/heroku.rb
@@ -233,7 +240,6 @@ files:
 - lib/project_types/script/layers/domain/script.rb
 - lib/project_types/script/layers/infrastructure/assemblyscript_project_creator.rb
 - lib/project_types/script/layers/infrastructure/assemblyscript_task_runner.rb
-- lib/project_types/script/layers/infrastructure/assemblyscript_tsconfig.rb
 - lib/project_types/script/layers/infrastructure/errors.rb
 - lib/project_types/script/layers/infrastructure/extension_point_repository.rb
 - lib/project_types/script/layers/infrastructure/project_creator.rb
@@ -276,6 +282,7 @@ files:
 - lib/shopify-cli/helpers.rb
 - lib/shopify-cli/helpers/haikunator.rb
 - lib/shopify-cli/heroku.rb
+- lib/shopify-cli/http_request.rb
 - lib/shopify-cli/js_deps.rb
 - lib/shopify-cli/js_system.rb
 - lib/shopify-cli/messages/messages.rb
@@ -290,6 +297,7 @@ files:
 - lib/shopify-cli/project_type.rb
 - lib/shopify-cli/resources.rb
 - lib/shopify-cli/resources/env_file.rb
+- lib/shopify-cli/shopifolk.rb
 - lib/shopify-cli/sub_command.rb
 - lib/shopify-cli/task.rb
 - lib/shopify-cli/tasks.rb