shopify-cli 2.27.0 → 2.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07ad4ab4b77c8edc5d1ff4bbbc980abcd625e00081c00aa986de0aef8251db43
-  data.tar.gz: 774eecdb92623ac595ce3cdcf44b6cf1247b882004833a545756eb7b7dd070db
+  metadata.gz: 5f07c45a6fc9d6b93d9f2826a7ad9eb139842d8b7f35717ca5fb17291285c330
+  data.tar.gz: 774e222e76f9a8d30b68e8b0756ed4cecbc8281d302d94c131d072c123b19f8c
 SHA512:
-  metadata.gz: 32548f2bf7b53d4e3d74a7b100f7f3b89f79438141932fdb876aba9f37a9eeeeb4fd66ed05fef2dbb80abcd05044ca398a30107cbf2277558cd5104f7123ff3a
-  data.tar.gz: 9075eca951bae25caaaac87774aee024ccaff98391c23d16d9e525f419461ce9cb978a60b640e49c34dd8d30e41b6d33e18050d3c9fbdba586adb70e7b66dcf2
+  metadata.gz: eab29689be4de3a23b0b9dd14401a130d6f37cc1064c02f16bbce0656d378d487666bd964dfa673b8fcc48344b01acf8d10899e4fb3755c7f5f46c5dd8c46385
+  data.tar.gz: 01d9830606768a70de1de312527875d997dce26f1913c44fd6ffd82407afc7962931fe38dd7568e49c899438e33bf3f1b465b6b5d73bb0585d25643c0d26d5a2

data/CHANGELOG.md

@@ -2,6 +2,19 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.29.0 - 2022-10-19
+
+### Added
+* [#2664](https://github.com/Shopify/shopify-cli/pull/2664): Enable Theme Kit Access passwords
+
+## Version 2.28.0 - 2022-10-17
+
+### Fixed
+* [#2646](https://github.com/Shopify/shopify-cli/pull/2646): Demo themes shouldn't appear in the `shopify theme pull/push/list/open` commands
+
+### Changed
+* [#2648](https://github.com/Shopify/shopify-cli/pull/2648): Do not warn users when the CLI 2.x is running as a subprocess
+
 ## Version 2.27.0 - 2022-10-10
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.27.0)
+    shopify-cli (2.29.0)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.11.0)

data/lib/project_types/extension/messages/message_loading.rb

@@ -8,7 +8,7 @@ module Extension
         return Messages::MESSAGES if type_specific_messages.nil?
 
         if type_specific_messages.key?(:overrides)
-          deep_merge(Messages::MESSAGES, type_specific_messages[:overrides])
+          ShopifyCLI::Utilities.deep_merge(Messages::MESSAGES, type_specific_messages[:overrides])
         else
           Messages::MESSAGES
         end
@@ -29,11 +29,6 @@ module Extension
 
         TYPES[type_identifier_symbol]
       end
-
-      def self.deep_merge(first, second)
-        merger = proc { |_key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
-        first.merge(second, &merger)
-      end
     end
   end
 end

data/lib/project_types/theme/cli.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 module Theme
   class Project < ShopifyCLI::ProjectType
     require Project.project_filepath("messages/messages")
-    register_messages(Theme::Messages::MESSAGES)
+    register_messages(Theme::Messages.all)
   end
 
   class Command < ShopifyCLI::Command::ProjectCommand

data/lib/project_types/theme/commands/common/shop_helper.rb

@@ -5,7 +5,7 @@ module Theme
     module Common
       module ShopHelper
         def shop
-          ShopifyCLI::AdminAPI.get_shop_or_abort(@ctx)
+          ShopifyCLI::Theme::ThemeAdminAPI.new(@ctx).get_shop_or_abort
         end
       end
     end

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

@@ -145,7 +145,7 @@ module Theme
               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.
+              Run {{command:%s logout}} and {{command:%s login --password "" --store STORE}} to authenticate again.
             HELP_MESSAGE
           },
           operation: {
@@ -390,5 +390,31 @@ module Theme
         },
       },
     }.freeze
+
+    def self.all
+      # In order to support theme development inside CLI3, we spawn CLI2 as a
+      # subprocess. Whenever an error happens, we want to show the updated
+      # version of the commands for the user to try.
+      if ShopifyCLI::Environment.run_as_subprocess?
+        ShopifyCLI::Utilities.deep_merge(MESSAGES, {
+          theme: {
+            serve: {
+              auth: {
+                error_message: <<~ERROR_MESSAGE,
+                  It looks like you are using credentials that do not work with {{command:%s theme dev}}.
+                ERROR_MESSAGE
+                help_message: <<~HELP_MESSAGE,
+                  Run {{command:%s auth logout}} and {{command:%s theme dev --store STORE}} to authenticate again.
+                HELP_MESSAGE
+              },
+              binding_error: "Couldn't bind to localhost." \
+                " To serve your theme, set a different address with {{command:%s theme dev --host=<address>}}",
+            },
+          },
+        })
+      else
+        MESSAGES
+      end
+    end
   end
 end

data/lib/project_types/theme/presenters/themes_presenter.rb

@@ -5,7 +5,7 @@ require_relative "theme_presenter"
 module Theme
   module Presenters
     class ThemesPresenter
-      ORDER_BY_ROLE = %w(live unpublished development)
+      SUPPORTED_ROLES = %w(live unpublished development)
 
       def initialize(ctx, root)
         @ctx = ctx
@@ -14,16 +14,13 @@ module Theme
 
       def all
         all_themes
-          .sort_by { |theme| order_by_role(theme) }
+          .select { |theme| SUPPORTED_ROLES.include?(theme.role) }
+          .sort_by { |theme| SUPPORTED_ROLES.index(theme.role) }
           .map { |theme| ThemePresenter.new(theme) }
       end
 
       private
 
-      def order_by_role(theme)
-        ORDER_BY_ROLE.index(theme.role) || ORDER_BY_ROLE.size
-      end
-
       def all_themes
         ShopifyCLI::Theme::Theme.all(@ctx, root: @root)
       end

data/lib/shopify_cli/command.rb

@@ -117,7 +117,7 @@ module ShopifyCLI
       end
 
       def check_version(version, range:, runtime:, context: Context.new)
-        return if Environment.test?
+        return if Environment.test? || Environment.run_as_subprocess?
         return if range.nil?
 
         version_without_pre_nor_build = Utilities.version_dropping_pre_and_build(version)

data/lib/shopify_cli/constants.rb

@@ -59,7 +59,8 @@ module ShopifyCLI
 
       # Monorail
       MONORAIL_REAL_EVENTS = "MONORAIL_REAL_EVENTS"
-      STORE = "SHOPIFY_CLI_STORE"
+
+      STORE = "SHOPIFY_SHOP"
     end
 
     module SupportedVersions

data/lib/shopify_cli/environment.rb

@@ -10,6 +10,8 @@ module ShopifyCLI
       Constants::EnvironmentVariables::SPIN_NAMESPACE,
       Constants::EnvironmentVariables::SPIN_HOST,
     ]
+    # https://github.com/Shopify/themekit-access/blob/4c3c917d78443160dcf24376a8b5ac6b9bef0bcd/app/models/password_token.rb#L8
+    THEME_ACCESS_PASSWORD_PREFIX = "shptka_"
 
     def self.ruby_version(context: Context.new)
       output, status = context.capture2e("ruby", "--version")
@@ -188,5 +190,9 @@ module ShopifyCLI
         env_variables: env_variables
       )
     end
+
+    def self.theme_access_password?
+      admin_auth_token&.start_with?(THEME_ACCESS_PASSWORD_PREFIX)
+    end
   end
 end

data/lib/shopify_cli/messages/messages.rb

@@ -498,7 +498,7 @@ module ShopifyCLI
             "{{i}} Authentication required. Login to the URL below with your %s credentials to continue.",
 
           servlet: {
-            success_response: "You've successfuly logged into the Shopify CLI!",
+            success_response: "You've successfully logged into the Shopify CLI!",
             invalid_request_response: "Invalid request: %s",
             invalid_state_response: "The anti-forgery state token does not match the initial request.",
           },
@@ -541,6 +541,9 @@ module ShopifyCLI
             forbidden: <<~FORBIDDEN,
               Command not allowed with current login. Please check your login details with {{command:%s whoami}}. You may need to request additional permissions for this action.
             FORBIDDEN
+            theme_access_invalid_password: "Invalid password. Please check that it was generated from Theme Access app"\
+              " for the current store.",
+            theme_access_no_store: "No store found. Please pass it through the environment variable SHOPIFY_SHOP",
             internal_server_error: "{{red:{{x}} An unexpected error occurred on Shopify.}}",
             internal_server_error_debug: "\n{{red:Response details:}}\n%s\n\n",
             invalid_url: "Invalid URL: %s",

data/lib/shopify_cli/theme/syncer.rb

@@ -69,11 +69,15 @@ module ShopifyCLI
         # Checksums of assets with errors.
         @error_checksums = []
 
+        # Do not use the throttler when --stable is passed or a Theme Access password is set
+        # (Theme Access API is not compatible yet with bulks)
+        throttler_enabled = !stable && !Environment.theme_access_password?
+
         # Initialize `api_client` on main thread
         @api_client = ThemeAdminAPIThrottler.new(
           @ctx,
           ThemeAdminAPI.new(@ctx, @theme.shop),
-          !stable
+          throttler_enabled
         )
       end
 

data/lib/shopify_cli/theme/theme_access_api.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require "shopify_cli"
+
+module ShopifyCLI
+  module Theme
+    ##
+    # ShopifyCLI::ThemeAccessAPI is a wrapper to use Shopify Theme Access API, which allows using passwords
+    # generated from Shopify Theme Access app to access the Shopify Admin API (for theme operations)
+    #
+    class ThemeAccessAPI < API
+      BASE_URL = "theme-kit-access.shopifyapps.com"
+
+      class << self
+        ##
+        # #### Parameters
+        # - `ctx`: running context from your command
+        # - `shop`: shop domain string for shop whose admin you are calling
+        # - `path`: path string (excluding prefixes and API version) for specific JSON that you are requesting
+        #     ex. "data.json" instead of "/admin/api/unstable/data.json"
+        # - `body`: data string for corresponding REST request types
+        # - `method`: REST request string for the type of request; if nil, will perform GET request
+        # - `api_version`: an api version string to specify version. Default value: unstable
+        #
+        # #### Raises
+        #
+        # * http 404 will raise a ShopifyCLI::API::APIRequestNotFoundError
+        # * http 400..499 will raise a ShopifyCLI::API::APIRequestClientError
+        # * http 500..599 will raise a ShopifyCLI::API::APIRequestServerError
+        # * All other codes will raise ShopifyCLI::API::APIRequestUnexpectedError
+        #
+        # #### Returns
+        #
+        # * `resp` - JSON response array
+        #
+        # #### Example
+        #
+        #   ThemeAccessAPI.rest_request(@ctx, shop: 'shop.myshopify.com', path: 'data.json')
+        #
+        def rest_request(ctx, shop:, path:, query: nil, body: nil, method: "GET", api_version: "unstable")
+          client = api_client(ctx, api_version, shop, path: path)
+          url = build_url(api_version, path, query)
+          client.request(url: url, body: body, headers: headers(shop), method: method)
+        rescue ShopifyCLI::API::APIRequestForbiddenError,
+               ShopifyCLI::API::APIRequestUnauthorizedError
+          ctx.abort(ctx.message("core.api.error.theme_access_invalid_password"))
+        end
+
+        def get_shop_or_abort(ctx)
+          env_store = Environment.store
+          return env_store unless env_store.nil?
+          ctx.abort(
+            ctx.message("core.api.error.theme_access_no_store")
+          )
+        end
+
+        private
+
+        def build_url(api_version, path, query = nil)
+          URI::HTTPS.build(
+            host: BASE_URL,
+            path: "/cli/admin/api/#{api_version}/#{path}",
+            query: query
+          ).to_s
+        end
+
+        def api_client(ctx, api_version, _shop, path: "graphql.json")
+          new(
+            ctx: ctx,
+            token: Environment.admin_auth_token,
+            url: build_url(api_version, path),
+          )
+        end
+
+        def headers(shop)
+          {
+            "X-Shopify-Shop" => shop,
+          }
+        end
+      end
+
+      def auth_headers(token)
+        {
+          "X-Shopify-Access-Token" => token,
+        }
+      end
+    end
+  end
+end

data/lib/shopify_cli/theme/theme_admin_api.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "theme_access_api"
+
 module ShopifyCLI
   module Theme
     class ThemeAdminAPI
@@ -29,11 +31,11 @@ module ShopifyCLI
       end
 
       def get_shop_or_abort # rubocop:disable Naming/AccessorMethodName
-        ShopifyCLI::AdminAPI.get_shop_or_abort(@ctx)
+        api_client.get_shop_or_abort(@ctx)
       end
 
       def rest_request(**args)
-        status, body, response = ShopifyCLI::AdminAPI.rest_request(
+        status, body, response = api_client.rest_request(
           @ctx,
           shop: @shop,
           api_version: API_VERSION,
@@ -67,6 +69,10 @@ module ShopifyCLI
 
       private
 
+      def api_client
+        @api_client ||= Environment.theme_access_password? ? ThemeAccessAPI : ShopifyCLI::AdminAPI
+      end
+
       def permission_error
         ensure_user_error = @ctx.message("theme.ensure_user_error", shop)
         ensure_user_try_this = @ctx.message("theme.ensure_user_try_this")

data/lib/shopify_cli/utilities.rb

@@ -12,5 +12,10 @@ module ShopifyCLI
         curr = File.dirname(curr)
       end
     end
+
+    def self.deep_merge(first, second)
+      merger = proc { |_key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+      first.merge(second, &merger)
+    end
   end
 end

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.27.0"
+  VERSION = "2.29.0"
 end

data/lib/shopify_cli.rb

@@ -97,18 +97,18 @@ module ShopifyCLI
     )
   end
 
-  autoload :AppTypeDetector, "shopify_cli/app_type_detector"
-  autoload :Constants, "shopify_cli/constants"
-  autoload :Environment, "shopify_cli/environment"
   autoload :AdminAPI, "shopify_cli/admin_api"
   autoload :API, "shopify_cli/api"
+  autoload :AppTypeDetector, "shopify_cli/app_type_detector"
   autoload :Command, "shopify_cli/command"
   autoload :CommandOptions, "shopify_cli/command_options"
   autoload :Commands, "shopify_cli/commands"
   autoload :Connect, "shopify_cli/connect"
+  autoload :Constants, "shopify_cli/constants"
   autoload :Context, "shopify_cli/context"
   autoload :Core, "shopify_cli/core"
   autoload :DB, "shopify_cli/db"
+  autoload :Environment, "shopify_cli/environment"
   autoload :Feature, "shopify_cli/feature"
   autoload :Form, "shopify_cli/form"
   autoload :Git, "shopify_cli/git"
@@ -118,11 +118,11 @@ module ShopifyCLI
   autoload :IdentityAuth, "shopify_cli/identity_auth"
   autoload :JsDeps, "shopify_cli/js_deps"
   autoload :JsSystem, "shopify_cli/js_system"
-  autoload :PHPDeps, "shopify_cli/php_deps"
   autoload :LazyDelegator, "shopify_cli/lazy_delegator"
   autoload :MethodObject, "shopify_cli/method_object"
   autoload :Options, "shopify_cli/options"
   autoload :PartnersAPI, "shopify_cli/partners_api"
+  autoload :PHPDeps, "shopify_cli/php_deps"
   autoload :ProcessSupervision, "shopify_cli/process_supervision"
   autoload :Project, "shopify_cli/project"
   autoload :ProjectType, "shopify_cli/project_type"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.27.0
+  version: 2.29.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -517,6 +517,7 @@ files:
 - lib/shopify_cli/theme/syncer/standard_reporter.rb
 - lib/shopify_cli/theme/syncer/unsupported_script_warning.rb
 - lib/shopify_cli/theme/theme.rb
+- lib/shopify_cli/theme/theme_access_api.rb
 - lib/shopify_cli/theme/theme_admin_api.rb
 - lib/shopify_cli/theme/theme_admin_api_throttler.rb
 - lib/shopify_cli/theme/theme_admin_api_throttler/bulk.rb