shopify-cli 1.13.1 → 2.1.0

data/lib/shopify-cli/packager.rb

@@ -16,7 +16,7 @@ module ShopifyCli
 
       puts "\nBuilding Debian package"
 
-      puts "Generating metadata files..."
+      puts "Generating metadata files…"
       Dir.glob("#{debian_dir}/*").each { |file| File.delete(file) }
 
       metadata_files = %w(control preinst prerm)
@@ -28,7 +28,7 @@ module ShopifyCli
         File.open(file_path, "w", 0775) { |f| f.write(file_contents) }
       end
 
-      puts "Building package..."
+      puts "Building package…"
       Dir.chdir(root_dir)
       raise "Failed to build package" unless system("dpkg-deb", "-b", "shopify-cli")
 
@@ -49,14 +49,14 @@ module ShopifyCli
       spec_path = File.join(root_dir, "shopify-cli.spec")
       puts "\nBuilding RPM package"
 
-      puts "Generating spec file..."
+      puts "Generating spec file…"
       File.delete(spec_path) if File.exist?(spec_path)
 
       spec_contents = File.read(File.join(root_dir, "shopify-cli.spec.base"))
       spec_contents = spec_contents.gsub("SHOPIFY_CLI_VERSION", ShopifyCli::VERSION)
       File.write(spec_path, spec_contents)
 
-      puts "Building package..."
+      puts "Building package…"
       Dir.chdir(root_dir)
       system("rpmbuild", "-bb", File.basename(spec_path))
 
@@ -72,7 +72,7 @@ module ShopifyCli
       build_path = File.join(BUILDS_DIR, "shopify-cli.rb")
       puts "\nBuilding Homebrew package"
 
-      puts "Generating formula..."
+      puts "Generating formula…"
       File.delete(build_path) if File.exist?(build_path)
 
       spec_contents = File.read(File.join(root_dir, "shopify-cli.base.rb"))

data/lib/shopify-cli/partners_api.rb

@@ -45,9 +45,18 @@ module ShopifyCli
       #   ShopifyCli::PartnersAPI.query(@ctx, 'all_organizations')
       #
       def query(ctx, query_name, **variables)
-        authenticated_req(ctx) do
+        CLI::Kit::Util.begin do
           api_client(ctx).query(query_name, variables: variables)
+        end.retry_after(API::APIRequestUnauthorizedError, retries: 1) do
+          ShopifyCli::IdentityAuth.new(ctx: ctx).reauthenticate
         end
+      rescue API::APIRequestUnauthorizedError => e
+        if (request_info = auth_failure_info(ctx, e))
+          ctx.puts(ctx.message("core.api.error.failed_auth_debugging", request_info))
+        end
+        ctx.abort(ctx.message("core.api.error.failed_auth"))
+      rescue API::APIRequestNotFoundError
+        ctx.puts(ctx.message("core.partners_api.error.account_not_found", ShopifyCli::TOOL_NAME))
       end
 
       def partners_url_for(organization_id, api_client_id, local_debug)
@@ -59,18 +68,6 @@ module ShopifyCli
 
       private
 
-      def authenticated_req(ctx, &block)
-        CLI::Kit::Util
-          .begin(&block)
-          .retry_after(API::APIRequestUnauthorizedError, retries: 1) do
-            authenticate(ctx)
-          end
-      rescue API::APIRequestUnauthorizedError
-        ctx.abort(ctx.message("core.api.error.failed_auth"))
-      rescue API::APIRequestNotFoundError
-        ctx.puts(ctx.message("core.partners_api.error.account_not_found", ShopifyCli::TOOL_NAME))
-      end
-
       def api_client(ctx)
         new(
           ctx: ctx,
@@ -80,37 +77,12 @@ module ShopifyCli
       end
 
       def access_token(ctx)
-        ShopifyCli::DB.get(:identity_exchange_token) do
-          authenticate(ctx)
-          ShopifyCli::DB.get(:identity_exchange_token)
+        ShopifyCli::DB.get(:partners_exchange_token) do
+          IdentityAuth.new(ctx: ctx).authenticate
+          ShopifyCli::DB.get(:partners_exchange_token)
         end
       end
 
-      def authenticate(ctx)
-        OAuth.new(
-          ctx: ctx,
-          service: "identity",
-          client_id: cli_id,
-          scopes: scopes.join(" "),
-          request_exchange: partners_id,
-        ).authenticate("#{auth_endpoint}/oauth")
-      end
-
-      def partners_id
-        return "271e16d403dfa18082ffb3d197bd2b5f4479c3fc32736d69296829cbb28d41a6" if ENV[LOCAL_DEBUG].nil?
-        "df89d73339ac3c6c5f0a98d9ca93260763e384d51d6038da129889c308973978"
-      end
-
-      def cli_id
-        return "fbdb2649-e327-4907-8f67-908d24cfd7e3" if ENV[LOCAL_DEBUG].nil?
-        "e5380e02-312a-7408-5718-e07017e9cf52"
-      end
-
-      def auth_endpoint
-        return "https://accounts.shopify.com" if ENV[LOCAL_DEBUG].nil?
-        "https://identity.myshopify.io"
-      end
-
       def endpoint
         return "https://partners.shopify.com" if ENV[LOCAL_DEBUG].nil?
         "https://partners.myshopify.io/"
@@ -125,10 +97,15 @@ module ShopifyCli
         "https://#{domain}"
       end
 
-      def scopes
-        %w[openid https://api.shopify.com/auth/partners.app.cli.access].tap do |result|
-          result << "employee" if ShopifyCli::Shopifolk.acting_as_shopify_organization?
+      def auth_failure_info(ctx, error)
+        if error.response
+          headers = %w(www-authenticate x-request-id)
+          request_info = headers.map { |h| "#{h}: #{error.response[h]}" if error.response.key?(h) }.join("\n")
+          ctx.debug("Full headers: #{error.response.each_header.to_h}")
+          request_info
         end
+      rescue => e
+        ctx.debug("Couldn't fetch auth failure information from #{error}: #{e}")
       end
     end
 

data/lib/shopify-cli/partners_api/organizations.rb

@@ -26,6 +26,14 @@ module ShopifyCli
             org
           end
         end
+
+        def fetch_with_extensions(ctx, type)
+          resp = PartnersAPI.query(ctx, "all_orgs_with_extensions", type: type)
+          (resp&.dig("data", "organizations", "nodes") || []).map do |org|
+            org["apps"] = (org.dig("apps", "nodes") || [])
+            org
+          end
+        end
       end
     end
   end

data/lib/shopify-cli/project_commands.rb

@@ -0,0 +1,16 @@
+module ShopifyCli
+  class ProjectCommands < Command
+    def call(*)
+      @ctx.puts(self.class.help)
+    end
+
+    def self.help
+      project_type = name.split("::")[0].downcase
+      ShopifyCli::Context.message(
+        "#{project_type}.help",
+        ShopifyCli::TOOL_NAME,
+        subcommand_registry.command_names.join(" | ")
+      )
+    end
+  end
+end

data/lib/shopify-cli/project_type.rb

@@ -5,7 +5,6 @@ module ShopifyCli
     class << self
       attr_accessor :project_type,
         :project_name,
-        :project_creator_command_class,
         :project_load_shallow
 
       def repository
@@ -49,36 +48,6 @@ module ShopifyCli
         @project_name = name
       end
 
-      def creator(command_const)
-        @project_creator_command_class = command_const
-        ShopifyCli::Commands::Create.subcommand(command_const, @project_type)
-      end
-
-      def create_command
-        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(
-          Context.message("core.project_type.error.cannot_override_core", cmd, const)
-        ) if Commands.core_command?(cmd)
-        Commands.register(const, cmd)
-      end
-
       def register_task(task, name)
         return if project_load_shallow
         ShopifyCli::Tasks.register(task, name)

data/lib/shopify-cli/shopifolk.rb

@@ -11,8 +11,6 @@ module ShopifyCli
     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
       #
@@ -29,15 +27,16 @@ module ShopifyCli
       end
 
       def act_as_shopify_organization
-        @acting_as_shopify_organization = true
+        DB.set(acting_as_shopify_organization: true)
       end
 
       def acting_as_shopify_organization?
-        !!(@acting_as_shopify_organization || (Project.has_current? && Project.current.config["shopify_organization"]))
+        !!(DB.get(:acting_as_shopify_organization) ||
+        (Project.has_current? && Project.current.config["shopify_organization"]))
       end
 
       def reset
-        @acting_as_shopify_organization = nil
+        DB.del(:acting_as_shopify_organization)
       end
     end
 
@@ -72,12 +71,10 @@ module ShopifyCli
     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
+      @ini ||= 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

data/lib/shopify-cli/sub_command.rb

@@ -9,6 +9,7 @@ module ShopifyCli
         args = cmd.options.parse(@_options, args[1..-1] || [])
         return call_help(parent_command, command_name) if cmd.options.help
         run_prerequisites
+
         cmd.call(args, command_name)
       end
     end

data/lib/shopify-cli/tasks.rb

@@ -30,9 +30,12 @@ module ShopifyCli
       Registry.add(-> () { const_get(task) }, name)
     end
 
+    register :ConfirmStore, :confirm_store, "shopify-cli/tasks/confirm_store"
     register :CreateApiClient, :create_api_client, "shopify-cli/tasks/create_api_client"
+    register :EnsureAuthenticated, :ensure_authenticated, "shopify-cli/tasks/ensure_authenticated"
     register :EnsureEnv, :ensure_env, "shopify-cli/tasks/ensure_env"
     register :EnsureLoopbackURL, :ensure_loopback_url, "shopify-cli/tasks/ensure_loopback_url"
+    register :EnsureProjectType, :ensure_project_type, "shopify-cli/tasks/ensure_project_type"
     register :EnsureDevStore, :ensure_dev_store, "shopify-cli/tasks/ensure_dev_store"
     register :SelectOrgAndShop, :select_org_and_shop, "shopify-cli/tasks/select_org_and_shop"
     register :UpdateDashboardURLS, :update_dashboard_urls, "shopify-cli/tasks/update_dashboard_urls"

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

@@ -0,0 +1,18 @@
+require "shopify_cli"
+
+module ShopifyCli
+  module Tasks
+    class ConfirmStore < ShopifyCli::Task
+      def call(ctx)
+        @ctx = ctx
+        store = ShopifyCli::AdminAPI.get_shop_or_abort(ctx)
+        if CLI::UI::Prompt.confirm(ctx.message("core.tasks.confirm_store.prompt", store), default: false)
+          ctx.puts(ctx.message("core.tasks.confirm_store.confirmation", store))
+        else
+          ctx.puts(ctx.message("core.tasks.confirm_store.cancelling"))
+          raise AbortSilent
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module ShopifyCli
   module Tasks
     class CreateApiClient < ShopifyCli::Task
       VALID_APP_TYPES = %w(public custom)
-      DEFAULT_APP_URL = "https://shopify.github.io/shopify-app-cli/help/start-app/"
+      DEFAULT_APP_URL = "https://shopify.github.io/shopify-cli/help/start-app/"
 
       def call(ctx, org_id:, title:, type:)
         resp = ShopifyCli::PartnersAPI.query(
@@ -14,7 +14,7 @@ module ShopifyCli
           title: title,
           type: type,
           app_url: DEFAULT_APP_URL,
-          redir: [OAuth::REDIRECT_HOST]
+          redir: [IdentityAuth::REDIRECT_HOST]
         )
 
         unless resp

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

@@ -0,0 +1,13 @@
+require "shopify_cli"
+
+module ShopifyCli
+  module Tasks
+    class EnsureAuthenticated < ShopifyCli::Task
+      def call(ctx)
+        ctx.abort(
+          ctx.message("core.identity_auth.login_prompt", ShopifyCli::TOOL_NAME)
+        ) unless ShopifyCli::IdentityAuth::IDENTITY_ACCESS_TOKENS.all? { |key| ShopifyCli::DB.exists?(key) }
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module ShopifyCli
         @ctx = ctx
         api_key = Project.current.env.api_key
         result = ShopifyCli::PartnersAPI.query(ctx, "get_app_urls", apiKey: api_key)
-        loopback = OAuth::REDIRECT_HOST
+        loopback = IdentityAuth::REDIRECT_HOST
         app = result["data"]["app"]
         urls = app["redirectUrlWhitelist"]
         if urls.grep(/#{loopback}/).empty?

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

@@ -0,0 +1,12 @@
+require "shopify_cli"
+
+module ShopifyCli
+  module Tasks
+    class EnsureProjectType < ShopifyCli::Task
+      def call(ctx, project_type)
+        return true if project_type.to_sym == ShopifyCli::Project.current_project_type
+        ctx.abort(ctx.message("core.tasks.ensure_project_type.wrong_project_type", project_type))
+      end
+    end
+  end
+end

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

@@ -8,9 +8,6 @@ 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)
         unless Shopifolk.acting_as_shopify_organization?
           shop_domain ||= get_shop_domain(org)

data/lib/shopify-cli/theme/dev_server.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+require_relative "development_theme"
+require_relative "ignore_filter"
+require_relative "syncer"
+
+require_relative "dev_server/hot_reload"
+require_relative "dev_server/header_hash"
+require_relative "dev_server/local_assets"
+require_relative "dev_server/proxy"
+require_relative "dev_server/sse"
+require_relative "dev_server/watcher"
+require_relative "dev_server/web_server"
+require_relative "dev_server/certificate_manager"
+
+require "pathname"
+
+module ShopifyCli
+  module Theme
+    module DevServer
+      class << self
+        attr_accessor :ctx
+
+        def start(ctx, root, port: 9292)
+          @ctx = ctx
+          theme = DevelopmentTheme.new(ctx, root: root)
+          ignore_filter = IgnoreFilter.from_path(root)
+          @syncer = Syncer.new(ctx, theme: theme, ignore_filter: ignore_filter)
+          watcher = Watcher.new(ctx, theme: theme, syncer: @syncer, ignore_filter: ignore_filter)
+
+          # Setup the middleware stack. Mimics Rack::Builder / config.ru, but in reverse order
+          @app = Proxy.new(ctx, theme: theme, syncer: @syncer)
+          @app = LocalAssets.new(ctx, @app, theme: theme)
+          @app = HotReload.new(ctx, @app, theme: theme, watcher: watcher, ignore_filter: ignore_filter)
+          stopped = false
+
+          theme.ensure_exists!
+
+          trap("INT") do
+            stopped = true
+            stop
+          end
+
+          CLI::UI::Frame.open(@ctx.message("theme.serve.serve")) do
+            ctx.print_task("Syncing theme ##{theme.id} on #{theme.shop}")
+            @syncer.start_threads
+            if block_given?
+              yield @syncer
+            else
+              @syncer.upload_theme!(delay_low_priority_files: true)
+            end
+
+            return if stopped
+
+            ctx.puts("")
+            ctx.puts("Serving #{theme.root}")
+            ctx.puts("")
+            ctx.open_url!("http://127.0.0.1:#{port}")
+            ctx.puts("")
+            ctx.puts("Customize this theme in the Online Store Editor:")
+            ctx.puts("{{green:#{theme.editor_url}}}")
+            ctx.puts("")
+            ctx.puts("Share this theme preview:")
+            ctx.puts("{{green:#{theme.preview_url}}}")
+            ctx.puts("")
+            ctx.puts("(Use Ctrl-C to stop)")
+          end
+
+          logger = if ctx.debug?
+            WEBrick::Log.new(nil, WEBrick::BasicLog::INFO)
+          else
+            WEBrick::Log.new(nil, WEBrick::BasicLog::FATAL)
+          end
+
+          watcher.start
+          WebServer.run(
+            @app,
+            Port: port,
+            Logger: logger,
+            AccessLog: [],
+          )
+          watcher.stop
+
+        rescue ShopifyCli::API::APIRequestForbiddenError,
+               ShopifyCli::API::APIRequestUnauthorizedError
+          @ctx.abort("You are not authorized to edit themes on #{theme.shop}.\n" \
+                     "Make sure you are a user of that store, and allowed to edit themes.")
+        end
+
+        def stop
+          @ctx.puts("Stopping…")
+          @app.close
+          @syncer.shutdown
+          WebServer.shutdown
+        end
+      end
+    end
+  end
+end