shopify-cli 1.4.1 → 1.8.0

data/lib/shopify-cli/admin_api/populate_resource_command.rb

@@ -1,5 +1,5 @@
-require 'shopify_cli'
-require 'optparse'
+require "shopify_cli"
+require "optparse"
 
 module ShopifyCli
   class AdminAPI
@@ -36,7 +36,7 @@ module ShopifyCli
 
         if @help
           output = display_parent_extended_help
-          output += "\n#{@ctx.message('core.populate.options.header', camel_case_resource_type)}\n"
+          output += "\n#{@ctx.message("core.populate.options.header", camel_case_resource_type)}\n"
           output += resource_options.help
           return @ctx.puts(output)
         end
@@ -45,7 +45,7 @@ module ShopifyCli
 
         if @silent
           spin_group = CLI::UI::SpinGroup.new
-          spin_group.add(@ctx.message('core.populate.populating', @count, camel_case_resource_type)) do |spinner|
+          spin_group.add(@ctx.message("core.populate.populating", @count, camel_case_resource_type)) do |spinner|
             populate
             spinner.update_title(completion_message)
           end
@@ -78,18 +78,18 @@ module ShopifyCli
           opts.on(
             "-c #{DEFAULT_COUNT}",
             "--count=#{DEFAULT_COUNT}",
-            @ctx.message('core.populate.options.count_help')
+            @ctx.message("core.populate.options.count_help")
           ) do |value|
             @count = value.to_i
           end
 
-          opts.on('-h', '--help', 'print help') do |value|
+          opts.on("-h", "--help", "print help") do |value|
             @help = value
           end
 
           opts.on("--silent") { |v| @silent = v }
 
-          opts.on('--shop=', '-s') { |value| @shop = value }
+          opts.on("--shop=", "-s") { |value| @shop = value }
         end
       end
 
@@ -100,12 +100,12 @@ module ShopifyCli
       end
 
       def input_options
-        schema.type(self.class.input_type)['inputFields'].each do |field|
+        schema.type(self.class.input_type)["inputFields"].each do |field|
           resource_options.on(
-            "--#{field['name']}=#{field['defaultValue']}",
-            field['description']
+            "--#{field["name"]}=#{field["defaultValue"]}",
+            field["description"]
           ) do |value|
-            @input[field['name']] = value
+            @input[field["name"]] = value
           end
         end
       end
@@ -120,14 +120,14 @@ module ShopifyCli
         resp = AdminAPI.query(
           @ctx, "create_#{snake_case_resource_type}", **kwargs
         )
-        @ctx.abort(resp['errors']) if resp['errors']
-        @ctx.done(message(resp['data'])) unless @silent
+        @ctx.abort(resp["errors"]) if resp["errors"]
+        @ctx.done(message(resp["data"])) unless @silent
       end
 
       def completion_message
         plural = @count > 1 ? "s" : ""
         @ctx.message(
-          'core.populate.completion_message',
+          "core.populate.completion_message",
           @count,
           "#{camel_case_resource_type}#{plural}",
           Project.current.env.shop,
@@ -142,7 +142,7 @@ module ShopifyCli
       end
 
       def price
-        format('%.2f', rand(1..10))
+        format("%.2f", rand(1..10))
       end
 
       private
@@ -155,7 +155,7 @@ module ShopifyCli
       end
 
       def camel_case_resource_type
-        @camel_case_resource_type ||= self.class.to_s.split('::').last
+        @camel_case_resource_type ||= self.class.to_s.split("::").last
       end
 
       def snake_case_resource_type
@@ -167,7 +167,7 @@ module ShopifyCli
       end
 
       def parent_command_klass
-        @parent_command_klass ||= Module.const_get(self.class.to_s.split('::')[0..-2].join('::'))
+        @parent_command_klass ||= Module.const_get(self.class.to_s.split("::")[0..-2].join("::"))
       end
     end
   end

data/lib/shopify-cli/admin_api/schema.rb

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   class AdminAPI
@@ -7,7 +7,7 @@ module ShopifyCli
         def get(ctx)
           unless ShopifyCli::DB.exists?(:shopify_admin_schema)
             shop = Project.current.env.shop || get_shop(ctx)
-            schema = AdminAPI.query(ctx, 'admin_introspection', shop: shop)
+            schema = AdminAPI.query(ctx, "admin_introspection", shop: shop)
             ShopifyCli::DB.set(shopify_admin_schema: JSON.dump(schema))
           end
           # This is ruby magic for making a new hash with another hash.
@@ -30,7 +30,7 @@ module ShopifyCli
         data = self["data"]
         schema = data["__schema"]
         schema["types"].find do |object|
-          object['name'] == name.to_s
+          object["name"] == name.to_s
         end
       end
 

data/lib/shopify-cli/api.rb

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   class API
@@ -19,49 +19,36 @@ module ShopifyCli
     class APIRequestThrottledError < APIRequestRetriableError; end
 
     def self.gid_to_id(gid)
-      gid.split('/').last
+      gid.split("/").last
     end
 
     def query(query_name, variables: {})
       _, resp = request(
-        load_query(query_name),
-        variables: variables,
-        headers: default_headers,
-        graphql_url: url,
+        body: JSON.dump(query: load_query(query_name).tr("\n", ""), variables: variables),
+        url: url,
       )
       ctx.debug(resp)
       resp
     rescue API::APIRequestServerError, API::APIRequestUnexpectedError => e
-      ctx.puts(ctx.message('core.api.error.internal_server_error'))
-      ctx.debug(ctx.message('core.api.error.internal_server_error_debug', e.message))
+      ctx.puts(ctx.message("core.api.error.internal_server_error"))
+      ctx.debug(ctx.message("core.api.error.internal_server_error_debug", e.message))
     end
 
-    protected
-
-    def load_query(name)
-      project_type = ShopifyCli::Project.current_project_type
-      project_file_path = File.join(
-        ShopifyCli::ROOT, 'lib', 'project_types', project_type.to_s, 'graphql', "#{name}.graphql"
-      )
-      if !project_type.nil? && File.exist?(project_file_path)
-        File.read(project_file_path)
-      else
-        File.read(File.join(ShopifyCli::ROOT, 'lib', 'graphql', "#{name}.graphql"))
-      end
-    end
-
-    private
-
-    def request(body, graphql_url:, variables: {}, headers: {})
+    def request(url:, body: nil, headers: {}, method: "POST")
       CLI::Kit::Util.begin do
-        uri = URI.parse(graphql_url)
+        uri = URI.parse(url)
         unless uri.is_a?(URI::HTTP)
-          ctx.abort("Invalid URL: #{graphql_url}")
+          ctx.abort(ctx.message("core.api.error.invalid_url", url))
         end
 
         # we delay this require so as to avoid a performance hit on starting the CLI
-        require 'shopify-cli/http_request'
-        response = HttpRequest.call(uri, body, variables, headers)
+        require "shopify-cli/http_request"
+        headers = default_headers.merge(headers)
+        response = if method == "POST"
+          HttpRequest.post(uri, body, headers)
+        elsif method == "GET"
+          HttpRequest.get(uri, body, headers)
+        end
 
         case response.code.to_i
         when 200..399
@@ -84,14 +71,32 @@ module ShopifyCli
       end
     end
 
+    protected
+
+    def load_query(name)
+      project_type = ShopifyCli::Project.current_project_type
+      project_file_path = File.join(
+        ShopifyCli::ROOT, "lib", "project_types", project_type.to_s, "graphql", "#{name}.graphql"
+      )
+      if !project_type.nil? && File.exist?(project_file_path)
+        File.read(project_file_path)
+      else
+        File.read(File.join(ShopifyCli::ROOT, "lib", "graphql", "#{name}.graphql"))
+      end
+    end
+
+    private
+
     def current_sha
       @current_sha ||= Git.sha(dir: ShopifyCli::ROOT)
     end
 
     def default_headers
       {
-        'User-Agent' => "Shopify App CLI #{ShopifyCli::VERSION} #{current_sha} | #{ctx.uname}",
-      }.merge(auth_headers(token))
+        "User-Agent" => "Shopify App CLI #{ShopifyCli::VERSION} #{current_sha} | #{ctx.uname}",
+      }.tap do |headers|
+        headers["X-Shopify-Cli-Employee"] = "1" if Shopifolk.acting_as_shopify_organization?
+      end.merge(auth_headers(token))
     end
 
     def auth_headers(token)

data/lib/shopify-cli/command.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   class Command < CLI::Kit::BaseCommand

data/lib/shopify-cli/commands.rb

@@ -1,9 +1,9 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   module Commands
     Registry = CLI::Kit::CommandRegistry.new(
-      default: 'help',
+      default: "help",
       contextual_resolver: nil,
     )
     @core_commands = []
@@ -18,12 +18,12 @@ module ShopifyCli
       @core_commands.include?(cmd)
     end
 
-    register :Config, 'config', 'shopify-cli/commands/config', true
-    register :Connect, 'connect', 'shopify-cli/commands/connect', true
-    register :Create, 'create', 'shopify-cli/commands/create', true
-    register :Help, 'help', 'shopify-cli/commands/help', true
-    register :Logout, 'logout', 'shopify-cli/commands/logout', true
-    register :System, 'system', 'shopify-cli/commands/system', true
-    register :Version, 'version', 'shopify-cli/commands/version', true
+    register :Config, "config", "shopify-cli/commands/config", true
+    register :Connect, "connect", "shopify-cli/commands/connect", true
+    register :Create, "create", "shopify-cli/commands/create", true
+    register :Help, "help", "shopify-cli/commands/help", true
+    register :Logout, "logout", "shopify-cli/commands/logout", true
+    register :System, "system", "shopify-cli/commands/system", true
+    register :Version, "version", "shopify-cli/commands/version", true
   end
 end

data/lib/shopify-cli/commands/config.rb

@@ -1,73 +1,73 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   module Commands
     class Config < ShopifyCli::Command
       hidden_feature(feature_set: :debug)
 
-      subcommand :Feature, 'feature'
-      subcommand :Analytics, 'analytics'
+      subcommand :Feature, "feature"
+      subcommand :Analytics, "analytics"
 
       def call(*)
         @ctx.puts(self.class.help)
       end
 
       def self.help
-        ShopifyCli::Context.message('core.config.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("core.config.help", ShopifyCli::TOOL_NAME)
       end
 
       class Feature < ShopifyCli::SubCommand
         def self.help
-          ShopifyCli::Context.message('core.config.feature.help', ShopifyCli::TOOL_NAME)
+          ShopifyCli::Context.message("core.config.feature.help", ShopifyCli::TOOL_NAME)
         end
 
         options do |parser, flags|
-          parser.on('--enable') { flags[:action] = 'enable' }
-          parser.on('--disable') { flags[:action] = 'disable' }
-          parser.on('--status') { flags[:action] = 'status' }
+          parser.on("--enable") { flags[:action] = "enable" }
+          parser.on("--disable") { flags[:action] = "disable" }
+          parser.on("--status") { flags[:action] = "status" }
         end
 
         def call(args, _name)
           feature_name = args.shift
-          return @ctx.puts(@ctx.message('core.config.help', ShopifyCli::TOOL_NAME)) if feature_name.nil?
+          return @ctx.puts(@ctx.message("core.config.help", ShopifyCli::TOOL_NAME)) if feature_name.nil?
           is_enabled = ShopifyCli::Feature.enabled?(feature_name)
-          if options.flags[:action] == 'disable' && is_enabled
+          if options.flags[:action] == "disable" && is_enabled
             ShopifyCli::Feature.disable(feature_name)
-            @ctx.puts(@ctx.message('core.config.feature.disabled', feature_name))
-          elsif options.flags[:action] == 'enable' && !is_enabled
+            @ctx.puts(@ctx.message("core.config.feature.disabled", feature_name))
+          elsif options.flags[:action] == "enable" && !is_enabled
             ShopifyCli::Feature.enable(feature_name)
-            @ctx.puts(@ctx.message('core.config.feature.enabled', feature_name))
+            @ctx.puts(@ctx.message("core.config.feature.enabled", feature_name))
           elsif is_enabled
-            @ctx.puts(@ctx.message('core.config.feature.is_enabled', feature_name))
+            @ctx.puts(@ctx.message("core.config.feature.is_enabled", feature_name))
           else
-            @ctx.puts(@ctx.message('core.config.feature.is_disabled', feature_name))
+            @ctx.puts(@ctx.message("core.config.feature.is_disabled", feature_name))
           end
         end
       end
 
       class Analytics < ShopifyCli::SubCommand
         def self.help
-          ShopifyCli::Context.message('core.config.analytics.help', ShopifyCli::TOOL_NAME)
+          ShopifyCli::Context.message("core.config.analytics.help", ShopifyCli::TOOL_NAME)
         end
 
         options do |parser, flags|
-          parser.on('--enable') { flags[:action] = 'enable' }
-          parser.on('--disable') { flags[:action] = 'disable' }
-          parser.on('--status') { flags[:action] = 'status' }
+          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('analytics', 'enabled')
-          if options.flags[:action] == 'disable' && is_enabled
-            ShopifyCli::Config.set('analytics', 'enabled', false)
-            @ctx.puts(@ctx.message('core.config.analytics.disabled'))
-          elsif options.flags[:action] == 'enable' && !is_enabled
-            ShopifyCli::Config.set('analytics', 'enabled', true)
-            @ctx.puts(@ctx.message('core.config.analytics.enabled'))
+          is_enabled = ShopifyCli::Config.get_bool("analytics", "enabled")
+          if options.flags[:action] == "disable" && is_enabled
+            ShopifyCli::Config.set("analytics", "enabled", false)
+            @ctx.puts(@ctx.message("core.config.analytics.disabled"))
+          elsif options.flags[:action] == "enable" && !is_enabled
+            ShopifyCli::Config.set("analytics", "enabled", true)
+            @ctx.puts(@ctx.message("core.config.analytics.enabled"))
           elsif is_enabled
-            @ctx.puts(@ctx.message('core.config.analytics.is_enabled'))
+            @ctx.puts(@ctx.message("core.config.analytics.is_enabled"))
           else
-            @ctx.puts(@ctx.message('core.config.analytics.is_disabled'))
+            @ctx.puts(@ctx.message("core.config.analytics.is_disabled"))
           end
         end
       end

data/lib/shopify-cli/commands/connect.rb

@@ -1,46 +1,63 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   module Commands
     class Connect < ShopifyCli::Command
-      def call(*)
-        project_type = ask_project_type unless Project.has_current?
-
-        if Project.has_current? && Project.current && Project.current.env
-          @ctx.puts @ctx.message('core.connect.already_connected_warning')
-          prod_warning = @ctx.message('core.connect.production_warning')
-          @ctx.puts prod_warning if [:rails, :node].include?(Project.current_project_type)
+      class << self
+        def call(args, command_name)
+          ProjectType.load_type(args[0]) unless args.empty?
+          super
         end
 
-        org = ShopifyCli::Tasks::EnsureEnv.call(@ctx, regenerate: true)
-        write_cli_yml(project_type, org['id']) unless Project.has_current?
-        api_key = Project.current(force_reload: true).env['api_key']
-        @ctx.puts(@ctx.message('core.connect.connected', get_app(org['apps'], api_key).first["title"]))
+        def help
+          ShopifyCli::Context.message("core.connect.help", ShopifyCli::TOOL_NAME)
+        end
       end
 
-      def get_app(apps, api_key)
-        apps.select { |app| app["apiKey"] == api_key }
+      def call(args, command_name)
+        if Project.current&.env
+          @ctx.puts(@ctx.message("core.connect.already_connected_warning"))
+        end
+
+        project_type = ask_project_type
+
+        klass = ProjectType.load_type(project_type)&.connect_command
+
+        if klass
+          klass.ctx = @ctx
+          klass.call(args, command_name, "connect")
+        else
+          app = default_connect(project_type)
+          @ctx.done(@ctx.message("core.connect.connected", app))
+        end
       end
 
       def ask_project_type
-        CLI::UI::Prompt.ask(@ctx.message('core.connect.project_type_select')) do |handler|
+        CLI::UI::Prompt.ask(@ctx.message("core.connect.project_type_select")) do |handler|
           ShopifyCli::Commands::Create.all_visible_type.each do |type|
             handler.option(type.project_name) { type.project_type }
           end
         end
       end
 
+      def default_connect(project_type)
+        org = ShopifyCli::Tasks::EnsureEnv.call(@ctx, regenerate: true)
+        write_cli_yml(project_type, org["id"]) unless Project.has_current?
+        api_key = Project.current(force_reload: true).env["api_key"]
+        get_app(org["apps"], api_key).first["title"]
+      end
+
       def write_cli_yml(project_type, org_id)
         ShopifyCli::Project.write(
           @ctx,
           project_type: project_type,
           organization_id: org_id,
         )
-        @ctx.done(@ctx.message('core.connect.cli_yml_saved'))
+        @ctx.done(@ctx.message("core.connect.cli_yml_saved"))
       end
 
-      def self.help
-        ShopifyCli::Context.message('core.connect.help', ShopifyCli::TOOL_NAME)
+      def get_app(apps, api_key)
+        apps.select { |app| app["apiKey"] == api_key }
       end
     end
   end