shopify-cli 2.9.0 → 2.11.0

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

@@ -2,11 +2,15 @@
 require "shopify_cli/theme/theme"
 require "shopify_cli/theme/development_theme"
 require "shopify_cli/theme/ignore_filter"
+require "shopify_cli/theme/include_filter"
 require "shopify_cli/theme/syncer"
 
 module Theme
   class Command
     class Push < ShopifyCLI::Command::SubCommand
+      recommend_default_node_range
+      recommend_default_ruby_range
+
       options do |parser, flags|
         parser.on("-n", "--nodelete") { flags[:nodelete] = true }
         parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }
@@ -17,6 +21,10 @@ module Theme
         parser.on("-j", "--json") { flags[:json] = true }
         parser.on("-a", "--allow-live") { flags[:allow_live] = true }
         parser.on("-p", "--publish") { flags[:publish] = true }
+        parser.on("-o", "--only=PATTERN") do |pattern|
+          flags[:includes] ||= []
+          flags[:includes] << pattern
+        end
         parser.on("-x", "--ignore=PATTERN") do |pattern|
           flags[:ignores] ||= []
           flags[:ignores] << pattern
@@ -35,10 +43,13 @@ module Theme
           return unless CLI::UI::Prompt.confirm(question)
         end
 
+        include_filter = ShopifyCLI::Theme::IncludeFilter.new(options.flags[:includes])
         ignore_filter = ShopifyCLI::Theme::IgnoreFilter.from_path(root)
         ignore_filter.add_patterns(options.flags[:ignores]) if options.flags[:ignores]
 
-        syncer = ShopifyCLI::Theme::Syncer.new(@ctx, theme: theme, ignore_filter: ignore_filter)
+        syncer = ShopifyCLI::Theme::Syncer.new(@ctx, theme: theme,
+                                               include_filter: include_filter,
+                                               ignore_filter: ignore_filter)
         begin
           syncer.start_threads
           if options.flags[:json]

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

@@ -4,6 +4,9 @@ require "shopify_cli/theme/dev_server"
 module Theme
   class Command
     class Serve < ShopifyCLI::Command::SubCommand
+      recommend_default_node_range
+      recommend_default_ruby_range
+
       DEFAULT_HTTP_HOST = "127.0.0.1"
 
       options do |parser, flags|

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

@@ -65,6 +65,8 @@ module Theme
                 {{command:-j, --json}}             Output JSON instead of a UI.
                 {{command:-a, --allow-live}}       Allow push to a live theme.
                 {{command:-p, --publish}}          Publish as the live theme after uploading.
+                {{command:-o, --only}}             Upload only the specified files.
+                {{command:-x, --ignore}}           Skip uploading the specified files.
 
               Run without options to select theme from a list.
           HELP
@@ -200,6 +202,8 @@ module Theme
               {{command:-l, --live}}             Pull theme files from your remote live theme.
               {{command:-d, --development}}      Pull theme files from your remote development theme.
               {{command:-n, --nodelete}}         Runs the pull command without deleting local files.
+              {{command:-o, --only}}             Download only the specified files.
+              {{command:-x, --ignore}}           Skip downloading the specified files.
 
             Run without options to select theme from a list.
           HELP

data/lib/shopify_cli/command/sub_command.rb

@@ -9,6 +9,8 @@ module ShopifyCLI
           cmd = new(@ctx)
           args = cmd.options.parse(@_options, args || [])
           return call_help(parent_command, command_name) if cmd.options.help
+          check_ruby_version
+          check_node_version
           run_prerequisites
 
           cmd.call(args, command_name)

data/lib/shopify_cli/command.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require "shopify_cli"
+require "semantic/semantic"
 
 module ShopifyCLI
   class Command < CLI::Kit::BaseCommand
@@ -7,6 +8,8 @@ module ShopifyCLI
     autoload :AppSubCommand,  "shopify_cli/command/app_sub_command"
     autoload :ProjectCommand, "shopify_cli/command/project_command"
 
+    VersionRange = Struct.new(:from, :to, keyword_init: true)
+
     extend Feature::Set
 
     attr_writer :ctx
@@ -26,6 +29,8 @@ module ShopifyCLI
           cmd = new(@ctx)
           cmd.options.parse(@_options, args)
           return call_help(command_name) if cmd.options.help
+          check_ruby_version
+          check_node_version
           run_prerequisites
           cmd.call(args, command_name)
         end
@@ -58,6 +63,67 @@ module ShopifyCLI
         )
       end
 
+      def recommend_ruby(from:, to:)
+        @compatible_ruby_range = VersionRange.new(
+          from: Semantic::Version.new(from),
+          to: Semantic::Version.new(to)
+        )
+      end
+
+      def recommend_default_ruby_range
+        recommend_ruby(
+          from: Constants::SupportedVersions::Ruby::FROM,
+          to: Constants::SupportedVersions::Ruby::TO
+        )
+      end
+
+      def check_ruby_version
+        check_version(
+          Environment.ruby_version,
+          range: @compatible_ruby_range,
+          runtime: "Ruby"
+        )
+      end
+
+      def recommend_node(from:, to:)
+        @compatible_node_range = VersionRange.new(
+          from: Semantic::Version.new(from),
+          to: Semantic::Version.new(to)
+        )
+      end
+
+      def recommend_default_node_range
+        recommend_node(
+          from: Constants::SupportedVersions::Node::FROM,
+          to: Constants::SupportedVersions::Node::TO
+        )
+      end
+
+      def check_node_version
+        check_version(
+          Environment.node_version,
+          range: @compatible_node_range,
+          runtime: "Node"
+        )
+      end
+
+      def check_version(version, range:, runtime:)
+        return if Environment.test?
+        return if range.nil?
+
+        version_without_pre_nor_build = Utilities.version_dropping_pre_and_build(version)
+        is_higher_than_bottom = version_without_pre_nor_build >= Utilities.version_dropping_pre_and_build(range.from)
+        is_lower_than_top = version_without_pre_nor_build < Utilities.version_dropping_pre_and_build(range.to)
+        return if is_higher_than_bottom && is_lower_than_top
+
+        Context.new.warn("Your environment #{runtime} version, #{version},"\
+          " is outside of the range supported by the CLI,"\
+          " #{range.from}..<#{range.to},"\
+          " and might cause incompatibility issues.")
+      rescue StandardError => error
+        ExceptionReporter.report_error_silently(error)
+      end
+
       def prerequisite_task(*tasks_without_args, **tasks_with_args)
         @prerequisite_tasks ||= []
         @prerequisite_tasks += tasks_without_args.map { |t| PrerequisiteTask.new(t) }

data/lib/shopify_cli/commands/app/create/node.rb

@@ -5,6 +5,9 @@ module ShopifyCLI
         class Node < ShopifyCLI::Command::AppSubCommand
           prerequisite_task :ensure_authenticated
 
+          recommend_default_node_range
+          recommend_default_ruby_range
+
           options do |parser, flags|
             parser.on("--name=NAME") { |t| flags[:name] = t }
             parser.on("--organization-id=ID") { |id| flags[:organization_id] = id }

data/lib/shopify_cli/commands/app/create/rails.rb

@@ -5,6 +5,9 @@ module ShopifyCLI
         class Rails < ShopifyCLI::Command::AppSubCommand
           prerequisite_task :ensure_authenticated
 
+          recommend_default_node_range
+          recommend_default_ruby_range
+
           options do |parser, flags|
             parser.on("--name=NAME") { |t| flags[:name] = t }
             parser.on("--organization-id=ID") { |id| flags[:organization_id] = id }

data/lib/shopify_cli/commands/app/create.rb

@@ -6,6 +6,9 @@ module ShopifyCLI
         subcommand :PHP, "php", "shopify_cli/commands/app/create/php"
         subcommand :Node, "node", "shopify_cli/commands/app/create/node"
 
+        recommend_default_node_range
+        recommend_default_ruby_range
+
         def call(_args, _command_name)
           @ctx.puts(self.class.help)
         end

data/lib/shopify_cli/commands/app/deploy.rb

@@ -4,6 +4,9 @@ module ShopifyCLI
       class Deploy < ShopifyCLI::Command::AppSubCommand
         subcommand :Heroku, "heroku", "shopify_cli/commands/app/deploy/heroku"
 
+        recommend_default_node_range
+        recommend_default_ruby_range
+
         def call(args, _name)
           platform = args.shift
           case platform

data/lib/shopify_cli/commands/app/serve.rb

@@ -6,6 +6,9 @@ module ShopifyCLI
 
         prerequisite_task :ensure_env, :ensure_dev_store
 
+        recommend_default_ruby_range
+        recommend_default_node_range
+
         options do |parser, flags|
           parser.on("--host=HOST") do |h|
             flags[:host] = h.gsub('"', "")

data/lib/shopify_cli/commands/login.rb

@@ -15,6 +15,8 @@ module ShopifyCLI
 
       def call(*)
         shop = (options.flags[:shop] || @ctx.getenv("SHOPIFY_SHOP" || nil))
+        ShopifyCLI::DB.set(shop: self.class.validate_shop(shop, context: @ctx)) unless shop.nil?
+
         if shop.nil? && Shopifolk.check
           Shopifolk.reset
           @ctx.puts(@ctx.message("core.tasks.select_org_and_shop.identified_as_shopify"))
@@ -31,25 +33,17 @@ module ShopifyCLI
           IdentityAuth.new(ctx: @ctx).authenticate
           org = select_organization
           ShopifyCLI::DB.set(organization_id: org["id"].to_i) unless org.nil?
-
+          Whoami.call([], "whoami")
         end
-        # validate that shop belongs to organization
-        ShopifyCLI::DB.set(shop: self.class.validate_shop(shop: shop, org: org, context: @ctx)) unless shop.nil?
-        Whoami.call([], "whoami")
       end
 
       def self.help
         ShopifyCLI::Context.message("core.login.help", ShopifyCLI::TOOL_NAME)
       end
 
-      def self.validate_shop(shop:, org:, context:)
+      def self.validate_shop(shop, context:)
         permanent_domain = shop_to_permanent_domain(shop)
         context.abort(context.message("core.login.invalid_shop", shop)) unless permanent_domain
-        if org
-          stores_owned = org["stores"]
-          is_verified = stores_owned.any? { |store| store["shopDomain"] == permanent_domain }
-          context.abort(context.message("core.login.invalid_shop", shop)) unless is_verified
-        end
         permanent_domain
       end
 

data/lib/shopify_cli/constants.rb

@@ -36,12 +36,16 @@ module ShopifyCLI
       # the partners dashboard and identity.
       LOCAL_PARTNERS = "SHOPIFY_APP_CLI_LOCAL_PARTNERS"
 
-      # When true the CLI points to a spin instance of spin
-      SPIN_PARTNERS = "SHOPIFY_APP_CLI_SPIN_PARTNERS"
+      # When true the CLI points to spin instances of services
+      SPIN = "SPIN"
+      INFER_SPIN = "INFER_SPIN"
       SPIN_WORKSPACE = "SPIN_WORKSPACE"
       SPIN_NAMESPACE = "SPIN_NAMESPACE"
       SPIN_HOST = "SPIN_HOST"
 
+      # Deprecated, equivalent to using SPIN=1
+      SPIN_PARTNERS = "SHOPIFY_APP_CLI_SPIN_PARTNERS"
+
       # Environments
       TEST = "SHOPIFY_CLI_TEST"
       ACCEPTANCE_TEST = "SHOPIFY_CLI_ACCEPTANCE_TEST"
@@ -54,6 +58,18 @@ module ShopifyCLI
       MONORAIL_REAL_EVENTS = "MONORAIL_REAL_EVENTS"
     end
 
+    module SupportedVersions
+      module Ruby
+        FROM = "2.6.6"
+        TO = "3.1.0"
+      end
+
+      module Node
+        FROM = "12.0.0"
+        TO = "17.0.0"
+      end
+    end
+
     module Identity
       CLIENT_ID_DEV = "e5380e02-312a-7408-5718-e07017e9cf52"
       CLIENT_ID = "fbdb2649-e327-4907-8f67-908d24cfd7e3"

data/lib/shopify_cli/core/executor.rb

@@ -3,10 +3,10 @@ require "shopify_cli"
 module ShopifyCLI
   module Core
     class Executor < CLI::Kit::Executor
-      def initialize(ctx, task_registry, *args, **kwargs)
-        @ctx = ctx || ShopifyCLI::Context.new
-        @task_registry = task_registry || ShopifyCLI::Tasks::TaskRegistry.new
-        super(*args, **kwargs)
+      ruby2_keywords def initialize(ctx, task_registry, *args)
+        @ctx = ctx || ShopifyCli::Context.new
+        @task_registry = task_registry || ShopifyCli::Tasks::TaskRegistry.new
+        super(*args)
       end
 
       def call(command, command_name, args)

data/lib/shopify_cli/environment.rb

@@ -1,9 +1,25 @@
+require "semantic/semantic"
+
 module ShopifyCLI
   # The environment module provides an interface to get information from
   # the environment in which the CLI runs
   module Environment
     TRUTHY_ENV_VARIABLE_VALUES = ["1", "true", "TRUE", "yes", "YES"]
 
+    def self.ruby_version(context: Context.new)
+      out, err, stat = context.capture3('ruby -e "puts RUBY_VERSION"')
+      raise ShopifyCLI::Abort, err unless stat.success?
+      out = out.gsub('"', "")
+      ::Semantic::Version.new(out.chomp)
+    end
+
+    def self.node_version(context: Context.new)
+      out, err, stat = context.capture3("node", "--version")
+      raise ShopifyCLI::Abort, err unless stat.success?
+      out = out.gsub("v", "")
+      ::Semantic::Version.new(out.chomp)
+    end
+
     def self.interactive=(interactive)
       @interactive = interactive
     end
@@ -61,17 +77,10 @@ module ShopifyCLI
       )
     end
 
-    def self.use_spin_partners_instance?(env_variables: ENV)
-      env_variable_truthy?(
-        Constants::EnvironmentVariables::SPIN_PARTNERS,
-        env_variables: env_variables
-      )
-    end
-
     def self.partners_domain(env_variables: ENV)
       if use_local_partners_instance?(env_variables: env_variables)
         "partners.myshopify.io"
-      elsif use_spin_partners_instance?(env_variables: env_variables)
+      elsif use_spin?(env_variables: env_variables)
         "partners.#{spin_url(env_variables: env_variables)}"
       else
         "partners.shopify.com"
@@ -79,15 +88,41 @@ module ShopifyCLI
     end
 
     def self.use_spin?(env_variables: ENV)
-      !env_variables[Constants::EnvironmentVariables::SPIN_WORKSPACE].nil? &&
-        !env_variables[Constants::EnvironmentVariables::SPIN_NAMESPACE].nil?
+      env_variable_truthy?(
+        Constants::EnvironmentVariables::SPIN,
+        env_variables: env_variables
+      ) || env_variable_truthy?(
+        Constants::EnvironmentVariables::SPIN_PARTNERS,
+        env_variables: env_variables
+      )
+    end
+
+    def self.infer_spin?(env_variables: ENV)
+      env_variable_truthy?(
+        Constants::EnvironmentVariables::INFER_SPIN,
+        env_variables: env_variables
+      )
     end
 
     def self.spin_url(env_variables: ENV)
-      spin_workspace = spin_workspace(env_variables: env_variables)
-      spin_namespace = spin_namespace(env_variables: env_variables)
-      spin_host = spin_host(env_variables: env_variables)
-      "#{spin_workspace}.#{spin_namespace}.#{spin_host}"
+      if infer_spin?(env_variables: env_variables)
+        # TODO: Remove version check and delete spin-legacy branch
+        #  once spin2 becomes the installed "spin" binary by default
+        spin_version = %x(spin version 2> /dev/null).strip
+        if spin_version.start_with?("spin-")
+          # spin2
+          raise ShopifyCLI:: Abort, "SPIN_INSTANCE must be specified" unless ENV.key?("SPIN_INSTANCE")
+          %x(spin show -o fqdn 2> /dev/null).strip
+        else
+          # spin-legacy
+          %x(spin info fqdn 2> /dev/null).strip
+        end
+      else
+        spin_workspace = spin_workspace(env_variables: env_variables)
+        spin_namespace = spin_namespace(env_variables: env_variables)
+        spin_host = spin_host(env_variables: env_variables)
+        "#{spin_workspace}.#{spin_namespace}.#{spin_host}"
+      end
     end
 
     def self.send_monorail_events?(env_variables: ENV)
@@ -106,11 +141,21 @@ module ShopifyCLI
     end
 
     def self.spin_workspace(env_variables: ENV)
-      env_variables[Constants::EnvironmentVariables::SPIN_WORKSPACE]
+      env_value = env_variables[Constants::EnvironmentVariables::SPIN_WORKSPACE]
+      return env_value unless env_value.nil?
+
+      if env_value.nil?
+        raise "No value set for #{Constants::EnvironmentVariables::SPIN_WORKSPACE}"
+      end
     end
 
     def self.spin_namespace(env_variables: ENV)
-      env_variables[Constants::EnvironmentVariables::SPIN_NAMESPACE]
+      env_value = env_variables[Constants::EnvironmentVariables::SPIN_NAMESPACE]
+      return env_value unless env_value.nil?
+
+      if env_value.nil?
+        raise "No value set for #{Constants::EnvironmentVariables::SPIN_NAMESPACE}"
+      end
     end
 
     def self.spin_host(env_variables: ENV)

data/lib/shopify_cli/exception_reporter.rb

@@ -1,5 +1,10 @@
 module ShopifyCLI
   module ExceptionReporter
+    def self.report_error_silently(error)
+      return unless ReportingConfigurationController.reporting_enabled?
+      report_to_bugsnag(error: error)
+    end
+
     def self.report(error, _logs = nil, _api_key = nil, custom_metadata = {})
       context = ShopifyCLI::Context.new
       unless ShopifyCLI::Environment.development?
@@ -19,6 +24,10 @@ module ShopifyCLI
       return unless reportable_error?(error)
 
       return unless report?(context: context)
+      report_to_bugsnag(error: error, custom_metadata: custom_metadata)
+    end
+
+    def self.report_to_bugsnag(error:, custom_metadata: {})
       ENV["BUGSNAG_DISABLE_AUTOCONFIGURE"] = "1"
       require "bugsnag"
 

data/lib/shopify_cli/github/issue_url_generator.rb

@@ -2,17 +2,28 @@ module ShopifyCLI
   module GitHub
     module IssueURLGenerator
       def self.error_url(error)
-        title = "#{error.class}: #{error.message}"
+        title = "[Bug]: #{error.class}: #{error.message}"
         labels = "type:bug"
-        content = File.read(File.join(ShopifyCLI::ROOT, ".github/ISSUE_TEMPLATE.md"))
 
         # take at most 5 lines from backtrace
-        stacktrace = error.backtrace.length < 5 ? error.backtrace : error.backtrace[0..4]
-        body = stacktrace.join("\n").to_s
-        output = content.gsub(/<!--Stacktrace(.|\n)*-->/, body)
-        query = URI.encode_www_form({ title: title, body: output, labels: labels })
-        url = "#{ShopifyCLI::Constants::Links::NEW_ISSUE}?#{query}"
-        url
+        stacktrace_text =
+          if error.backtrace # Sometimes errors seem to appear without backtrace, see https://github.com/Shopify/shopify-cli/issues/1972#issuecomment-1028013630
+            stacktrace = error.backtrace.length < 5 ? error.backtrace : error.backtrace[0..4]
+            stacktrace.join("\n").to_s
+          else
+            ""
+          end
+        query = URI.encode_www_form({
+          title: title,
+          labels: labels,
+          template: "bug_report.yaml",
+          stack_trace: stacktrace_text,
+          os: RUBY_PLATFORM,
+          cli_version: ShopifyCLI::VERSION,
+          ruby_version: "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}",
+          shell: ENV["SHELL"],
+        })
+        "#{ShopifyCLI::Constants::Links::NEW_ISSUE}?#{query}"
       end
     end
   end

data/lib/shopify_cli/identity_auth/env_auth_token.rb

@@ -0,0 +1,34 @@
+module ShopifyCLI
+  class IdentityAuth
+    class EnvAuthToken
+      Token = Struct.new(:token, :expires_at, keyword_init: true)
+
+      class << self
+        attr_accessor :exchanged_partners_token
+
+        def partners_token_present?
+          Environment.auth_token
+        end
+
+        def fetch_exchanged_partners_token
+          current_time = Time.now.to_i
+
+          # If we have an in-memory token that hasn't expired yet, we reuse it.
+          if exchanged_partners_token && current_time < exchanged_partners_token.expires_at.to_i
+            return exchanged_partners_token.token
+          end
+
+          new_exchanged_token = yield(Environment.auth_token)
+          token = new_exchanged_token["access_token"]
+          expires_in = new_exchanged_token["expires_in"].to_i
+          expires_at = Time.at(current_time + expires_in)
+
+          token = Token.new(token: token, expires_at: expires_at)
+
+          self.exchanged_partners_token = token
+          token.token
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/identity_auth.rb

@@ -13,6 +13,7 @@ module ShopifyCLI
     include SmartProperties
 
     autoload :Servlet, "shopify_cli/identity_auth/servlet"
+    autoload :EnvAuthToken, "shopify_cli/identity_auth/env_auth_token"
 
     class Error < StandardError; end
     class Timeout < StandardError; end
@@ -68,9 +69,12 @@ module ShopifyCLI
       request_exchange_tokens
     end
 
-    def self.fetch_or_auth_partners_token(ctx:)
-      env_var_auth_token = Environment.auth_token
-      return env_var_auth_token if env_var_auth_token
+    def fetch_or_auth_partners_token
+      if EnvAuthToken.partners_token_present?
+        return EnvAuthToken.fetch_exchanged_partners_token do |env_token|
+          exchange_partners_auth_token(env_token)
+        end
+      end
 
       ShopifyCLI::DB.get(:partners_exchange_token) do
         IdentityAuth.new(ctx: ctx).authenticate
@@ -78,6 +82,15 @@ module ShopifyCLI
       end
     end
 
+    def exchange_partners_auth_token(subject_token)
+      application = "partners"
+      request_exchange_token(
+        audience: client_id_for_application(application),
+        scopes: APPLICATION_SCOPES[application],
+        subject_token: subject_token,
+      )
+    end
+
     def self.environment_auth_token?
       !!Environment.auth_token
     end
@@ -195,30 +208,35 @@ module ShopifyCLI
 
     def request_exchange_tokens
       APPLICATION_SCOPES.each do |key, scopes|
-        request_exchange_token(key, client_id_for_application(key), scopes)
+        request_and_save_exchange_token(key, client_id_for_application(key), scopes)
       end
     end
 
-    def request_exchange_token(name, audience, additional_scopes)
+    def request_and_save_exchange_token(name, audience, additional_scopes)
       return if name == "shopify" && !store.exists?(:shop)
+      access_token = request_exchange_token(
+        audience: audience,
+        scopes: scopes(additional_scopes),
+        subject_token: store.get(:identity_access_token),
+        destination: name == "shopify" ? "https://#{store.get(:shop)}/admin" : nil
+      )["access_token"]
+      store.set("#{name}_exchange_token".to_sym => access_token)
+      ctx.debug("#{name}_exchange_token: " + access_token)
+    end
 
+    def request_exchange_token(audience:, scopes:, subject_token:, destination: nil)
       params = {
         grant_type: "urn:ietf:params:oauth:grant-type:token-exchange",
         requested_token_type: "urn:ietf:params:oauth:token-type:access_token",
         subject_token_type: "urn:ietf:params:oauth:token-type:access_token",
         client_id: client_id,
         audience: audience,
-        scope: scopes(additional_scopes),
-        subject_token: store.get(:identity_access_token),
-      }.tap do |result|
-        if name == "shopify"
-          result[:destination] = "https://#{store.get(:shop)}/admin"
-        end
-      end
+        scope: scopes,
+        subject_token: subject_token,
+        destination: destination,
+      }.compact
       # ctx.debug(params)
-      resp = post_token_request(params)
-      store.set("#{name}_exchange_token".to_sym => resp["access_token"])
-      ctx.debug("#{name}_exchange_token: " + resp["access_token"])
+      post_token_request(params)
     end
 
     def post_token_request(params)
@@ -256,7 +274,7 @@ module ShopifyCLI
     def auth_url
       if Environment.use_local_partners_instance?
         "https://identity.myshopify.io/oauth"
-      elsif Environment.use_spin_partners_instance?
+      elsif Environment.use_spin?
         "https://identity.#{Environment.spin_url}/oauth"
       else
         "https://accounts.shopify.com/oauth"
@@ -264,7 +282,7 @@ module ShopifyCLI
     end
 
     def client_id_for_application(application_name)
-      client_ids = if Environment.use_local_partners_instance? || Environment.use_spin_partners_instance?
+      client_ids = if Environment.use_local_partners_instance? || Environment.use_spin?
         DEV_APPLICATION_CLIENT_IDS
       else
         APPLICATION_CLIENT_IDS
@@ -280,7 +298,7 @@ module ShopifyCLI
     end
 
     def client_id
-      if Environment.use_local_partners_instance? || Environment.use_spin_partners_instance?
+      if Environment.use_local_partners_instance? || Environment.use_spin?
         Constants::Identity::CLIENT_ID_DEV
       else
         # In the future we might want to use Identity's dynamic

data/lib/shopify_cli/messages/messages.rb

@@ -53,7 +53,7 @@ module ShopifyCLI
                     {{command:--organization-id=ID}} Partner organization ID. Must be an existing organization.
                     {{command:--store-domain=MYSHOPIFYDOMAIN }} Development store URL. Must be an existing development store.
                     {{command:--db=DB}} Database type. Must be one of: mysql, postgresql, sqlite3, oracle, frontbase, ibm_db, sqlserver, jdbcmysql, jdbcsqlite3, jdbcpostgresql, jdbc.
-                    {{command:--rails-opts=RAILSOPTS}} Additional options. Must be string containing one or more valid Rails options, separated by spaces.
+                    {{command:--rails-opts=RAILSOPTS}} Additional options. Must be a string containing one or more valid Rails options, separated by spaces.
               HELP
 
               error: {
@@ -415,7 +415,7 @@ module ShopifyCLI
               Usage: {{command:%s login [--store=STORE]}}
           HELP
           invalid_shop: <<~MESSAGE,
-            Invalid store provided (%s). Please make sure that the store belongs to your partner organization, and provide the store in the following format: my-store.myshopify.com
+            Invalid store provided (%s). Please provide the store in the following format: my-store.myshopify.com
           MESSAGE
           shop_prompt: <<~PROMPT,
             What store are you connecting to? (e.g. my-store.myshopify.com; do {{bold:NOT}} include protocol part, e.g., https://)