shopify-cli 2.15.6 → 2.17.0

data/lib/project_types/extension/tasks/execute_commands/outdated_extension_detection.rb

@@ -0,0 +1,53 @@
+module Extension
+  module Tasks
+    module ExecuteCommands
+      module OutdatedExtensionDetection
+        class OutdatedCheck
+          include ShopifyCLI::MethodObject
+
+          property! :type, accepts: Models::DevelopmentServerRequirements.method(:type_supported?)
+          property! :context, accepts: ShopifyCLI::Context
+          property! :project, accepts: ShopifyCLI::Project, default: -> { ShopifyCLI::Project.current }
+
+          def call
+            return false if valid?(parse_package)
+            context.abort(upgrade_instructions)
+          end
+
+          private
+
+          def upgrade_instructions
+            case type
+            when "checkout_ui_extension"
+              context.message("errors.outdated_extensions.checkout_ui_extension")
+            else
+              context.message("errors.outdated_extensions.unknown")
+            end
+          end
+
+          def parse_package
+            File.open(Pathname(project.directory).join("package.json")) do |file|
+              Models::NpmPackage.parse(file)
+            end
+          end
+
+          def valid?(package)
+            case type
+            when "checkout_ui_extension"
+              package.dev_dependency?("@shopify/shopify-cli-extensions") &&
+                package.script?("build") &&
+                package.script?("develop")
+            else
+              true
+            end
+          end
+        end
+
+        def call(*)
+          return super unless Models::DevelopmentServerRequirements.supported?(type)
+          OutdatedCheck.call(type: type, context: context).then { super }
+        end
+      end
+    end
+  end
+end

data/lib/project_types/extension/tasks/execute_commands/serve.rb

@@ -5,7 +5,8 @@ module Extension
   module Tasks
     module ExecuteCommands
       class Serve < Base
-        property! :context, accepts: ShopifyCLI::Context
+        prepend OutdatedExtensionDetection
+
         property! :config_file_path, accepts: String
         property  :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
         property  :resource_url, accepts: String

data/lib/project_types/extension/tasks/get_apps.rb

@@ -5,20 +5,17 @@ module Extension
   module Tasks
     class GetApps < ShopifyCLI::Task
       def call(context:)
-        organizations = ShopifyCLI::PartnersAPI::Organizations.fetch_with_app(context)
-        apps_from_organizations(organizations)
+        org_id = ShopifyCLI::DB.get(:organization_id)
+        return [] unless org_id
+
+        organization = ShopifyCLI::PartnersAPI::Organizations.fetch_with_apps(context, id: org_id)
+        apps_owned_by_organization(organization)
       end
 
       private
 
-      def apps_from_organizations(organizations)
-        organizations.flat_map do |organization|
-          apps_owned_by_organization(organization)
-        end
-      end
-
       def apps_owned_by_organization(organization)
-        return [] unless organization.key?("apps") && organization["apps"].any?
+        return [] unless organization&.dig("apps")
 
         organization["apps"].map do |app|
           Converters::AppConverter.from_hash(app, organization)

data/lib/project_types/extension/tasks/get_extensions.rb

@@ -5,28 +5,29 @@ module Extension
   module Tasks
     class GetExtensions < ShopifyCLI::Task
       def call(context:, type:)
-        organizations = ShopifyCLI::PartnersAPI::Organizations.fetch_with_extensions(context, type)
-        extensions_from_organizations(organizations, context: context)
+        org_id = ShopifyCLI::DB.get(:organization_id)
+        return [] unless org_id
+
+        organization = ShopifyCLI::PartnersAPI::Organizations.fetch_with_extensions(context, type, id: org_id)
+        return [] unless organization_with_apps?(organization)
+        extensions_owned_by_organization(organization, context: context)
       end
 
       private
 
-      def extensions_from_organizations(organizations, context:)
-        organizations.flat_map do |organization|
-          extensions_owned_by_organization(organization, context: context)
-        end
-      end
-
       def extensions_owned_by_organization(organization, context:)
-        return [] unless organization.key?("apps") && organization["apps"].any?
-
         organization["apps"].flat_map do |app|
-          app["extensionRegistrations"].map do |registration|
+          registrations = app["extensionRegistrations"] || []
+          registrations.map do |registration|
             [Converters::AppConverter.from_hash(app, organization),
              Converters::RegistrationConverter.from_hash(context, registration)]
           end
         end
       end
+
+      def organization_with_apps?(organization)
+        organization&.key?("apps") && organization["apps"].any?
+      end
     end
   end
 end

data/lib/project_types/extension/tasks/merge_server_config.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "shopify_cli"
-require "yaml"
 require "pathname"
 
 module Extension
@@ -10,7 +9,7 @@ module Extension
 
       property! :context, accepts: ShopifyCLI::Context
       property! :file_path, accepts: ->(path) { Pathname(path).yield_self(&:absolute?) }
-      property  :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
+      property! :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
       property  :resource_url, accepts: String
       property  :tunnel_url, accepts: String
       property! :type, accepts: Models::DevelopmentServerRequirements::SUPPORTED_EXTENSION_TYPES
@@ -33,7 +32,9 @@ module Extension
           store: project.env.shop || "",
           title: project.title,
           tunnel_url: tunnel_url,
-          type: type
+          type: type,
+          port: port,
+          metafields: config["metafields"]
         )
       rescue Psych::SyntaxError => e
         raise(

data/lib/project_types/script/cli.rb

@@ -50,6 +50,7 @@ module Script
       autoload :ExtensionPoint, Project.project_filepath("layers/domain/extension_point")
       autoload :ScriptConfig, Project.project_filepath("layers/domain/script_config")
       autoload :ScriptProject, Project.project_filepath("layers/domain/script_project")
+      autoload :AppBridge, Project.project_filepath("layers/domain/app_bridge")
     end
 
     module Infrastructure

data/lib/project_types/script/config/extension_points.yml

@@ -7,6 +7,8 @@ payment_methods:
       repo: "https://github.com/Shopify/scripts-apis-examples"
     wasm:
       repo: "https://github.com/Shopify/scripts-apis-examples"
+    rust:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
 shipping_methods:
   domain: 'checkout'
   libraries:
@@ -36,21 +38,33 @@ delivery_discount_types:
       repo: "https://github.com/Shopify/scripts-apis-examples"
     wasm:
       repo: "https://github.com/Shopify/scripts-apis-examples"
-product_discount_type:
+product_discounts:
   beta: true
   domain: 'discounts'
   libraries:
     wasm:
       repo: "https://github.com/Shopify/scripts-apis-examples"
-order_discount_type:
+    rust:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+order_discounts:
   beta: true
   domain: 'discounts'
   libraries:
     wasm:
       repo: "https://github.com/Shopify/scripts-apis-examples"
-shipping_discount_type:
+    rust:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+shipping_discounts:
   beta: true
   domain: 'discounts'
   libraries:
     wasm:
       repo: "https://github.com/Shopify/scripts-apis-examples"
+    rust:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+shipping_rates_consolidation:
+  beta: true
+  domain: 'checkout'
+  libraries:
+    wasm:
+      repo: "https://github.com/Shopify/scripts-apis-examples"

data/lib/project_types/script/graphql/app_script_set.graphql

@@ -12,6 +12,7 @@ mutation AppScriptSet(
   $moduleUploadUrl: String!,
   $library: LibraryInput,
   $inputQuery: String,
+  $appBridge: AppBridgeInput!,
 ) {
   appScriptSet(
     uuid: $uuid
@@ -27,6 +28,7 @@ mutation AppScriptSet(
     moduleUploadUrl: $moduleUploadUrl,
     library: $library,
     inputQuery: $inputQuery,
+    appBridge: $appBridge
 ) {
     userErrors {
       field

data/lib/project_types/script/layers/application/connect_app.rb

@@ -21,7 +21,7 @@ module Script
               if partner_proxy_bypass
                 stubbed_org
               else
-                orgs = ShopifyCLI::PartnersAPI::Organizations.fetch_with_app(ctx)
+                orgs = ShopifyCLI::PartnersAPI::Organizations.fetch_all_with_apps(ctx)
                 Forms::AskOrg.ask(ctx, orgs, nil).org
               end
 

data/lib/project_types/script/layers/application/push_script.rb

@@ -55,6 +55,7 @@ module Script
                   force: force,
                   metadata: package.metadata,
                   script_config: package.script_config,
+                  app_bridge: script_project.app_bridge,
                   module_upload_url: module_upload_url,
                   library: package.library,
                   input_query: script_project.input_query,

data/lib/project_types/script/layers/domain/app_bridge.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Domain
+      class AppBridge
+        attr_reader :create_path, :details_path
+
+        def initialize(create_path:, details_path:)
+          @create_path = create_path
+          @details_path = details_path
+        end
+      end
+    end
+  end
+end

data/lib/project_types/script/layers/domain/script_project.rb

@@ -17,6 +17,7 @@ module Script
         property! :language, accepts: String
 
         property :script_config, accepts: ScriptConfig
+        property :app_bridge, accepts: AppBridge
         property :input_query, accepts: String
 
         def initialize(*)

data/lib/project_types/script/layers/infrastructure/errors.rb

@@ -137,8 +137,6 @@ module Script
           end
         end
 
-        class ProjectCreatorNotFoundError < ScriptProjectError; end
-
         class SystemCallFailureError < ScriptProjectError
           attr_reader :out, :cmd
           def initialize(out:, cmd:)
@@ -157,7 +155,6 @@ module Script
         end
 
         class ScriptProjectAlreadyExistsError < ScriptProjectError; end
-        class TaskRunnerNotFoundError < ScriptProjectError; end
         class BuildScriptNotFoundError < ScriptProjectError; end
 
         class WebAssemblyBinaryNotFoundError < ScriptProjectError

data/lib/project_types/script/layers/infrastructure/languages/project_creator.rb

@@ -26,8 +26,9 @@ module Script
               "wasm" => WasmProjectCreator,
             }
 
-            raise Errors::ProjectCreatorNotFoundError unless project_creators[language]
-            project_creators[language].new(
+            project_creator = project_creators[language] || WasmProjectCreator
+
+            project_creator.new(
               ctx: ctx,
               type: type,
               project_name: project_name,

data/lib/project_types/script/layers/infrastructure/languages/task_runner.rb

@@ -13,8 +13,8 @@ module Script
               "wasm" => WasmTaskRunner,
             }
 
-            raise Errors::TaskRunnerNotFoundError unless task_runners[language]
-            task_runners[language].new(ctx)
+            task_runner = task_runners[language] || WasmTaskRunner
+            task_runner.new(ctx)
           end
 
           def initialize(ctx)

data/lib/project_types/script/layers/infrastructure/script_project_repository.rb

@@ -54,6 +54,7 @@ module Script
             extension_point_type: extension_point_type,
             language: language,
             script_config: script_config_repository.get!,
+            app_bridge: app_bridge,
             input_query: read_input_query,
           )
         end
@@ -94,6 +95,7 @@ module Script
             extension_point_type: extension_point_type,
             language: language,
             script_config: script_config,
+            app_bridge: app_bridge,
           )
         end
 
@@ -121,6 +123,16 @@ module Script
           project_config_value("language")&.downcase || default_language
         end
 
+        def app_bridge
+          create_path = project_config_value("app_bridge_create_path") || "/"
+          details_path = project_config_value("app_bridge_details_path") || "/"
+
+          Domain::AppBridge.new(
+            create_path: create_path,
+            details_path: details_path,
+          )
+        end
+
         def project_config_value(key)
           return nil unless project.config.key?(key)
           project.config[key]

data/lib/project_types/script/layers/infrastructure/script_service.rb

@@ -20,6 +20,7 @@ module Script
           force: false,
           metadata:,
           script_config:,
+          app_bridge:,
           module_upload_url:,
           library:,
           input_query: nil
@@ -36,6 +37,10 @@ module Script
             scriptConfigVersion: script_config.version,
             configurationUi: script_config.configuration_ui,
             configurationDefinition: script_config.configuration&.to_json,
+            appBridge: {
+              createPath: app_bridge.create_path,
+              detailsPath: app_bridge.details_path,
+            },
             moduleUploadUrl: module_upload_url,
             inputQuery: input_query,
           }

data/lib/project_types/theme/commands/serve.rb

@@ -20,9 +20,12 @@ module Theme
       end
 
       def call(_args, name)
+        valid_authentication_method!
+
         root = root_value(options, name)
         flags = options.flags.dup
         host = flags[:host] || DEFAULT_HTTP_HOST
+
         ShopifyCLI::Theme::DevServer.start(@ctx, root, host: host, **flags) do |syncer|
           UI::SyncProgressBar.new(syncer).progress(:upload_theme!, delay_low_priority_files: true)
         end
@@ -38,6 +41,30 @@ module Theme
       def self.help
         ShopifyCLI::Context.message("theme.serve.help", ShopifyCLI::TOOL_NAME)
       end
+
+      private
+
+      def valid_authentication_method!
+        if exchange_token && !storefront_renderer_token
+          ShopifyCLI::Context.abort(error_message, help_message)
+        end
+      end
+
+      def error_message
+        ShopifyCLI::Context.message("theme.serve.auth.error_message", ShopifyCLI::TOOL_NAME)
+      end
+
+      def help_message
+        ShopifyCLI::Context.message("theme.serve.auth.help_message", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
+      end
+
+      def exchange_token
+        ShopifyCLI::DB.get(:shopify_exchange_token)
+      end
+
+      def storefront_renderer_token
+        ShopifyCLI::DB.get(:storefront_renderer_production_exchange_token)
+      end
     end
   end
 end

data/lib/project_types/theme/messages/messages.rb

@@ -8,6 +8,11 @@ module Theme
             Usage: {{command:%1$s theme [ %2$s ]}}
         HELP
         ensure_user_error: "You are not authorized to edit themes on %s.",
+        unauthorized_error: <<~EOD,
+          You can't use Shopify CLI with development stores if you only have Partner staff member access. If you want to use Shopify CLI to work on a development store, then you should be the store owner or create a staff account on the store.
+
+          If you're the store owner, then you need to log in to the store directly using the store URL at least once (for example, using %s.myshopify.com/admin) before you log in using Shopify CLI. Logging in to the Shopify admin directly connects the development store with your Shopify login.
+        EOD
         ensure_user_try_this: <<~ENSURE_USER,
           Check if your user is activated, has permission to edit themes at the store, and try to re-login.
         ENSURE_USER
@@ -116,6 +121,14 @@ module Theme
           viewing_theme: "Viewing theme…",
           syncing_theme: "Syncing theme #%s on %s",
           open_fail: "Couldn't open the theme",
+          auth: {
+            error_message: <<~ERROR_MESSAGE,
+              It looks like you are using credentials that do not work with {{command:%s theme serve}}.
+            ERROR_MESSAGE
+            help_message: <<~HELP_MESSAGE,
+              Run {{command:%s logout}} and {{command:%s login --password "" --store STORE}} to force the authentication thought your browser.
+            HELP_MESSAGE
+          },
           operation: {
             status: {
               error: "ERROR",

data/lib/shopify_cli/admin_api.rb

@@ -98,6 +98,8 @@ module ShopifyCLI
       end
 
       def get_shop_or_abort(ctx)
+        env_store = Environment.store
+        return env_store unless env_store.nil?
         ctx.abort(
           ctx.message("core.populate.error.no_shop", ShopifyCLI::TOOL_NAME)
         ) unless ShopifyCLI::DB.exists?(:shop)
@@ -119,7 +121,8 @@ module ShopifyCLI
       end
 
       def access_token(ctx, shop)
-        ShopifyCLI::DB.get(:shopify_exchange_token) do
+        env_token = Environment.admin_auth_token
+        env_token || ShopifyCLI::DB.get(:shopify_exchange_token) do
           authenticate(ctx, shop)
           ShopifyCLI::DB.get(:shopify_exchange_token)
         end
@@ -153,7 +156,7 @@ module ShopifyCLI
     def auth_headers(token)
       {
         Authorization: "Bearer #{token}",
-        "X-Shopify-Access-Token" => token, # TODO: Remove when we no longer need private apps
+        "X-Shopify-Access-Token" => token,
       }
     end
   end

data/lib/shopify_cli/commands/login.rb

@@ -26,8 +26,8 @@ module ShopifyCLI
           end
         end
 
-        # As password auth will soon be deprecated, we enable only in CI
-        if @ctx.ci? && (password = options.flags[:password] || @ctx.getenv("SHOPIFY_PASSWORD"))
+        password = options.flags[:password] || @ctx.getenv("SHOPIFY_PASSWORD")
+        if !password.nil? && !password.empty?
           ShopifyCLI::DB.set(shopify_exchange_token: password)
         else
           IdentityAuth.new(ctx: @ctx).authenticate(spinner: true)

data/lib/shopify_cli/commands/logout.rb

@@ -31,7 +31,7 @@ module ShopifyCLI
         return unless has_shop?
 
         ShopifyCLI::Theme::DevelopmentTheme.delete(@ctx)
-      rescue ShopifyCLI::API::APIRequestError
+      rescue ShopifyCLI::API::APIRequestError, ShopifyCLI::Abort, ShopifyCLI::AbortSilent
         # Ignore since we can't delete it
       end
     end

data/lib/shopify_cli/constants.rb

@@ -53,9 +53,11 @@ module ShopifyCLI
 
       # Authentication
       AUTH_TOKEN = "SHOPIFY_CLI_AUTH_TOKEN"
+      ADMIN_AUTH_TOKEN = "SHOPIFY_CLI_ADMIN_AUTH_TOKEN"
 
       # Monorail
       MONORAIL_REAL_EVENTS = "MONORAIL_REAL_EVENTS"
+      STORE = "SHOPIFY_CLI_STORE"
     end
 
     module SupportedVersions

data/lib/shopify_cli/context.rb

@@ -17,6 +17,7 @@ module ShopifyCLI
     GEM_LATEST_URI = URI.parse("https://rubygems.org/api/v1/versions/shopify-cli/latest.json")
     VERSION_CHECK_SECTION = "versioncheck"
     LAST_CHECKED_AT_FIELD = "last_checked_at"
+    LATEST_VERSION_FIELD = "latest_version"
     VERSION_CHECK_INTERVAL = 86400
 
     class << self
@@ -619,11 +620,17 @@ module ShopifyCLI
     #            : nil otherwise
     #
     def new_version
-      if (time_of_last_check + VERSION_CHECK_INTERVAL) < (now = Time.now.to_i)
-        update_time_of_last_check(now)
-        latest_version = retrieve_latest_gem_version
-        latest_version unless latest_version == ShopifyCLI::VERSION
+      if (time_of_last_check + VERSION_CHECK_INTERVAL) < (Time.now.to_i)
+        # Fork is not supported in Windows
+        if Process.respond_to?(:fork)
+          fork { retrieve_latest_gem_version }
+        else
+          thread = Thread.new { retrieve_latest_gem_version }
+          at_exit { thread.join }
+        end
       end
+      latest_version = ShopifyCLI::Config.get(VERSION_CHECK_SECTION, LATEST_VERSION_FIELD, default: ShopifyCLI::VERSION)
+      latest_version if ::Semantic::Version.new(latest_version) > ::Semantic::Version.new(ShopifyCLI::VERSION)
     end
 
     # Returns file extension depending on OS
@@ -669,17 +676,15 @@ module ShopifyCLI
     def retrieve_latest_gem_version
       response = Net::HTTP.get_response(GEM_LATEST_URI)
       latest = JSON.parse(response.body)
-      latest["version"]
+      ShopifyCLI::Config.set(VERSION_CHECK_SECTION, LATEST_VERSION_FIELD, latest["version"])
     rescue
       nil
+    ensure
+      ShopifyCLI::Config.set(VERSION_CHECK_SECTION, LAST_CHECKED_AT_FIELD, Time.now.to_i)
     end
 
     def time_of_last_check
       (val = ShopifyCLI::Config.get(VERSION_CHECK_SECTION, LAST_CHECKED_AT_FIELD)) ? val.to_i : 0
     end
-
-    def update_time_of_last_check(time)
-      ShopifyCLI::Config.set(VERSION_CHECK_SECTION, LAST_CHECKED_AT_FIELD, time)
-    end
   end
 end

data/lib/shopify_cli/environment.rb

@@ -166,6 +166,14 @@ module ShopifyCLI
       env_variables[Constants::EnvironmentVariables::AUTH_TOKEN]
     end
 
+    def self.admin_auth_token(env_variables: ENV)
+      env_variables[Constants::EnvironmentVariables::ADMIN_AUTH_TOKEN]
+    end
+
+    def self.store(env_variables: ENV)
+      env_variables[Constants::EnvironmentVariables::STORE]
+    end
+
     def self.env_variable_truthy?(variable_name, env_variables: ENV)
       TRUTHY_ENV_VARIABLE_VALUES.include?(env_variables[variable_name.to_s])
     end

data/lib/shopify_cli/partners_api/app_extensions.rb

@@ -8,23 +8,23 @@ module ShopifyCLI
   class PartnersAPI
     class AppExtensions
       class << self
-        def fetch_apps_extensions(ctx, orgs, type)
-          jobs = apps(orgs).map { |app| AppExtensions::Job.new(ctx, app, type) }
+        def fetch_apps_extensions(ctx, org, type)
+          jobs = apps(org).map { |app| AppExtensions::Job.new(ctx, app, type) }
 
           consume_jobs!(jobs)
           patch_apps_with_extensions!(jobs)
 
-          orgs
+          org
         end
 
         private
 
-        def apps(orgs)
-          orgs.flat_map { |org| org["apps"] }
+        def apps(org)
+          (org && org["apps"]) || []
         end
 
         def consume_jobs!(jobs)
-          thread_pool = ShopifyCLI::ThreadPool.new
+          thread_pool = ShopifyCLI::ThreadPool.new(pool_size: 1)
           jobs.each do |job|
             thread_pool.schedule(job)
           end

data/lib/shopify_cli/partners_api/organizations.rb

@@ -18,7 +18,7 @@ module ShopifyCLI
           org
         end
 
-        def fetch_with_app(ctx)
+        def fetch_all_with_apps(ctx)
           resp = PartnersAPI.query(ctx, "all_orgs_with_apps")
           (resp&.dig("data", "organizations", "nodes") || []).map do |org|
             org["stores"] = (org.dig("stores", "nodes") || [])
@@ -27,9 +27,17 @@ module ShopifyCLI
           end
         end
 
-        def fetch_with_extensions(ctx, type)
-          orgs = fetch_with_app(ctx)
-          AppExtensions.fetch_apps_extensions(ctx, orgs, type)
+        def fetch_with_apps(ctx, id:)
+          resp = PartnersAPI.query(ctx, "find_organization_with_apps", id: id)
+          organization = resp&.dig("data", "organizations", "nodes")&.first
+          return unless organization
+
+          organization.tap { organization["apps"] = (organization.dig("apps", "nodes") || []) }
+        end
+
+        def fetch_with_extensions(ctx, type, id:)
+          organization = fetch_with_apps(ctx, id: id)
+          AppExtensions.fetch_apps_extensions(ctx, organization, type)
         end
       end
     end

data/lib/shopify_cli/services/app/create/rails_service.rb

@@ -184,7 +184,7 @@ module ShopifyCLI
 
             context.puts(context.message("core.app.create.rails.adding_shopify_gem"))
             File.open(File.join(context.root, "Gemfile"), "a") do |f|
-              f.puts "\ngem 'shopify_app', '>=18.1.0'"
+              f.puts "\ngem 'shopify_app', '~>19.0.1'"
             end
             CLI::UI::Frame.open(context.message("core.app.create.rails.running_bundle_install")) do
               syscall(%w(bundle install))

data/lib/shopify_cli/tasks/ensure_env.rb

@@ -25,7 +25,7 @@ module ShopifyCLI
         if Shopifolk.check && wants_to_run_against_shopify_org?
           Shopifolk.act_as_shopify_organization
         end
-        orgs = PartnersAPI::Organizations.fetch_with_app(@ctx)
+        orgs = PartnersAPI::Organizations.fetch_all_with_apps(@ctx)
         org_id = if orgs.count == 1
           orgs.first["id"]
         else