RubyGems - shopify-cli - Versions diffs - 1.14.0 → 2.0.0 - Mend

shopify-cli 1.14.0 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (179) hide show

checksums.yaml +4 -4
data/.github/CODEOWNERS +1 -1
data/.github/CONTRIBUTING.md +7 -7
data/.github/DESIGN.md +3 -3
data/.github/workflows/build.yml +1 -1
data/.gitignore +3 -0
data/.rubocop.yml +3 -1
data/.ruby-version +1 -1
data/CHANGELOG.md +35 -29
data/Gemfile +4 -0
data/Gemfile.lock +32 -0
data/LICENSE +4 -1
data/README.md +92 -26
data/RELEASING.md +29 -7
data/Rakefile +2 -2
data/SECURITY.md +1 -1
data/bin/load_shopify.rb +1 -1
data/bin/shopify +3 -3
data/dev.yml +1 -1
data/docs/app/node/index.md +1 -1
data/docs/app/rails/index.md +1 -1
data/docs/core/index.md +1 -1
data/docs/getting-started/index.md +1 -1
data/docs/getting-started/install/index.md +1 -1
data/docs/getting-started/migrate/index.md +1 -1
data/docs/getting-started/uninstall/index.md +1 -1
data/docs/getting-started/upgrade/index.md +1 -1
data/docs/help/start-app/index.md +1 -1
data/docs/index.md +1 -1
data/ext/shopify-cli/extconf.rb +17 -5
data/install.sh +1 -1
data/lib/docgen/index_template.md.erb +2 -2
data/lib/graphql/all_orgs_with_extensions.graphql +37 -0
data/lib/graphql/find_organization.graphql +2 -1
data/lib/project_types/extension/cli.rb +18 -15
data/lib/project_types/extension/commands/build.rb +4 -5
data/lib/project_types/extension/commands/connect.rb +35 -0
data/lib/project_types/extension/commands/create.rb +12 -16
data/lib/project_types/extension/commands/extension_command.rb +2 -2
data/lib/project_types/extension/commands/info.rb +86 -0
data/lib/project_types/extension/commands/push.rb +8 -7
data/lib/project_types/extension/commands/register.rb +4 -5
data/lib/project_types/extension/commands/serve.rb +5 -8
data/lib/project_types/extension/commands/tunnel.rb +3 -1
data/lib/project_types/extension/errors.rb +9 -0
data/lib/project_types/extension/extension_project.rb +5 -0
data/lib/project_types/extension/features/argo.rb +6 -6
data/lib/project_types/extension/features/argo_runtime.rb +22 -66
data/lib/project_types/extension/features/argo_serve.rb +25 -18
data/lib/project_types/extension/forms/connect.rb +42 -0
data/lib/project_types/extension/forms/questions/ask_name.rb +14 -6
data/lib/project_types/extension/forms/questions/ask_registration.rb +51 -0
data/lib/project_types/extension/messages/messages.rb +75 -11
data/lib/project_types/extension/models/specification.rb +1 -0
data/lib/project_types/extension/models/specification_handlers/{checkout_argo_extension.rb → checkout_ui_extension.rb} +3 -1
data/lib/project_types/extension/models/specification_handlers/default.rb +13 -3
data/lib/project_types/extension/models/specification_handlers/theme_app_extension.rb +86 -0
data/lib/project_types/extension/models/specifications.rb +1 -0
data/lib/project_types/extension/tasks/configure_features.rb +6 -7
data/lib/project_types/extension/tasks/configure_options.rb +20 -0
data/lib/project_types/extension/tasks/get_extensions.rb +32 -0
data/lib/project_types/node/cli.rb +9 -21
data/lib/project_types/node/commands/connect.rb +8 -2
data/lib/project_types/node/commands/create.rb +9 -5
data/lib/project_types/node/commands/deploy.rb +15 -5
data/lib/project_types/node/commands/deploy/heroku.rb +29 -29
data/lib/project_types/node/commands/generate.rb +4 -2
data/lib/project_types/node/commands/open.rb +4 -2
data/lib/project_types/node/commands/serve.rb +3 -2
data/lib/project_types/node/commands/tunnel.rb +4 -2
data/lib/project_types/node/messages/messages.rb +46 -89
data/lib/project_types/rails/cli.rb +9 -21
data/lib/project_types/rails/commands/connect.rb +8 -2
data/lib/project_types/rails/commands/create.rb +10 -6
data/lib/project_types/rails/commands/deploy.rb +15 -5
data/lib/project_types/rails/commands/deploy/heroku.rb +84 -82
data/lib/project_types/rails/commands/generate.rb +15 -5
data/lib/project_types/rails/commands/generate/webhook.rb +28 -26
data/lib/project_types/rails/commands/open.rb +4 -2
data/lib/project_types/rails/commands/serve.rb +3 -2
data/lib/project_types/rails/commands/tunnel.rb +4 -2
data/lib/project_types/rails/messages/messages.rb +54 -101
data/lib/project_types/script/cli.rb +5 -7
data/lib/project_types/script/commands/create.rb +3 -1
data/lib/project_types/script/commands/push.rb +4 -2
data/lib/project_types/script/messages/messages.rb +52 -45
data/lib/project_types/script/ui/error_handler.rb +2 -2
data/lib/project_types/theme/cli.rb +15 -27
data/lib/project_types/theme/commands/check.rb +33 -0
data/lib/project_types/theme/commands/delete.rb +64 -0
data/lib/project_types/theme/commands/language_server.rb +16 -0
data/lib/project_types/theme/commands/package.rb +55 -0
data/lib/project_types/theme/commands/publish.rb +43 -0
data/lib/project_types/theme/commands/pull.rb +51 -0
data/lib/project_types/theme/commands/push.rb +58 -32
data/lib/project_types/theme/commands/serve.rb +7 -17
data/lib/project_types/theme/forms/confirm_store.rb +15 -0
data/lib/project_types/theme/forms/select.rb +59 -0
data/lib/project_types/theme/messages/messages.rb +110 -106
data/lib/project_types/theme/ui/sync_progress_bar.rb +20 -0
data/lib/shopify-cli/admin_api.rb +53 -38
data/lib/shopify-cli/admin_api/populate_resource_command.rb +6 -14
data/lib/shopify-cli/admin_api/schema.rb +1 -10
data/lib/shopify-cli/api.rb +29 -14
data/lib/shopify-cli/command.rb +15 -3
data/lib/shopify-cli/commands.rb +7 -2
data/lib/shopify-cli/commands/help.rb +2 -29
data/lib/shopify-cli/commands/login.rb +95 -0
data/lib/shopify-cli/commands/logout.rb +24 -8
data/lib/shopify-cli/commands/populate.rb +23 -0
data/lib/{project_types/node → shopify-cli}/commands/populate/customer.rb +2 -8
data/lib/{project_types/node → shopify-cli}/commands/populate/draft_order.rb +2 -2
data/lib/{project_types/node → shopify-cli}/commands/populate/product.rb +2 -8
data/lib/shopify-cli/commands/store.rb +15 -0
data/lib/shopify-cli/commands/switch.rb +39 -0
data/lib/shopify-cli/commands/system.rb +12 -0
data/lib/shopify-cli/commands/whoami.rb +28 -0
data/lib/shopify-cli/connect.rb +32 -0
data/lib/shopify-cli/context.rb +52 -4
data/lib/shopify-cli/core/entry_point.rb +3 -22
data/lib/shopify-cli/db.rb +4 -4
data/lib/shopify-cli/http_request.rb +10 -0
data/lib/shopify-cli/identity_auth.rb +282 -0
data/lib/shopify-cli/{oauth → identity_auth}/servlet.rb +11 -12
data/lib/shopify-cli/messages/messages.rb +132 -39
data/lib/shopify-cli/partners_api.rb +21 -44
data/lib/shopify-cli/partners_api/organizations.rb +8 -0
data/lib/shopify-cli/project_commands.rb +16 -0
data/lib/shopify-cli/project_type.rb +0 -31
data/lib/shopify-cli/shopifolk.rb +8 -11
data/lib/shopify-cli/sub_command.rb +1 -0
data/lib/shopify-cli/tasks.rb +3 -0
data/lib/shopify-cli/tasks/confirm_store.rb +18 -0
data/lib/shopify-cli/tasks/create_api_client.rb +2 -2
data/lib/shopify-cli/tasks/ensure_authenticated.rb +13 -0
data/lib/shopify-cli/tasks/ensure_loopback_url.rb +1 -1
data/lib/shopify-cli/tasks/ensure_project_type.rb +12 -0
data/lib/shopify-cli/tasks/select_org_and_shop.rb +0 -3
data/lib/shopify-cli/theme/dev_server.rb +98 -0
data/lib/shopify-cli/theme/dev_server/certificate_manager.rb +79 -0
data/lib/shopify-cli/theme/dev_server/header_hash.rb +94 -0
data/lib/shopify-cli/theme/dev_server/hot-reload.js +93 -0
data/lib/shopify-cli/theme/dev_server/hot_reload.rb +76 -0
data/lib/shopify-cli/theme/dev_server/local_assets.rb +87 -0
data/lib/shopify-cli/theme/dev_server/proxy.rb +205 -0
data/lib/shopify-cli/theme/dev_server/sse.rb +75 -0
data/lib/shopify-cli/theme/dev_server/watcher.rb +59 -0
data/lib/shopify-cli/theme/dev_server/web_server.rb +140 -0
data/lib/shopify-cli/theme/development_theme.rb +69 -0
data/lib/shopify-cli/theme/file.rb +112 -0
data/lib/shopify-cli/theme/ignore_filter.rb +109 -0
data/lib/shopify-cli/theme/mime_type.rb +34 -0
data/lib/shopify-cli/theme/syncer.rb +328 -0
data/lib/shopify-cli/theme/theme.rb +204 -0
data/lib/shopify-cli/version.rb +1 -1
data/lib/shopify_cli.rb +18 -11
data/shopify-cli.gemspec +12 -5
data/shopify.fish +1 -1
data/shopify.sh +1 -1
metadata +88 -34
data/.github/workflows/release.yml +0 -59
data/lib/project_types/extension/features/argo_serve_options.rb +0 -42
data/lib/project_types/node/commands/populate.rb +0 -23
data/lib/project_types/rails/commands/populate.rb +0 -23
data/lib/project_types/rails/commands/populate/customer.rb +0 -31
data/lib/project_types/rails/commands/populate/draft_order.rb +0 -28
data/lib/project_types/rails/commands/populate/product.rb +0 -30
data/lib/project_types/theme/commands/connect.rb +0 -54
data/lib/project_types/theme/commands/create.rb +0 -48
data/lib/project_types/theme/commands/deploy.rb +0 -38
data/lib/project_types/theme/commands/generate.rb +0 -20
data/lib/project_types/theme/commands/generate/env.rb +0 -79
data/lib/project_types/theme/forms/connect.rb +0 -34
data/lib/project_types/theme/forms/create.rb +0 -22
data/lib/project_types/theme/tasks/ensure_themekit_installed.rb +0 -78
data/lib/project_types/theme/themekit.rb +0 -113
data/lib/shopify-cli/commands/connect.rb +0 -64
data/lib/shopify-cli/commands/create.rb +0 -50
data/lib/shopify-cli/oauth.rb +0 -198

data/lib/shopify-cli/{oauth → identity_auth}/servlet.rb RENAMED Viewed

@@ -1,5 +1,5 @@
 module ShopifyCli
-  class OAuth
+  class IdentityAuth
     class Servlet < WEBrick::HTTPServlet::AbstractServlet
       TEMPLATE = %{<!DOCTYPE html>
         <html>
@@ -13,15 +13,13 @@ module ShopifyCli
         </html>
       }
       AUTOCLOSE_TEMPLATE = %{
-        <script>
-          setTimeout(function() { window.close(); }, 3000)
-        </script>
+        <script>window.close();</script>
       }
-      def initialize(server, oauth, token)
+      def initialize(server, identity_auth, token)
         super
         @server = server
-        @oauth = oauth
+        @identity_auth = identity_auth
         @state_token = token
       end
@@ -30,16 +28,16 @@ module ShopifyCli
           respond_with(
             res,
             400,
-            Context.message("core.oauth.servlet.invalid_request_response", req.query["error_description"])
+            Context.message("core.identity_auth.servlet.invalid_request_response", req.query["error_description"])
           )
         elsif req.query["state"] != @state_token
-          response_message = Context.message("core.oauth.servlet.invalid_state_response")
+          response_message = Context.message("core.identity_auth.servlet.invalid_state_response")
           req.query.merge!("error" => "invalid_state", "error_description" => response_message)
           respond_with(res, 403, response_message)
         else
-          respond_with(res, 200, Context.message("core.oauth.servlet.success_response"))
+          respond_with(res, 200, Context.message("core.identity_auth.servlet.success_response"))
         end
-        @oauth.response_query = req.query
+        @identity_auth.response_query = req.query
         @server.shutdown
       end
@@ -49,8 +47,9 @@ module ShopifyCli
           status: status,
           message: message,
           color: successful ? "black" : "red",
-          title:
-            Context.message(successful ? "core.oauth.servlet.authenticated" : "core.oauth.servlet.not_authenticated"),
+          title: Context.message(
+            successful ? "core.identity_auth.servlet.authenticated" : "core.identity_auth.servlet.not_authenticated"
+          ),
           autoclose: successful ? AUTOCLOSE_TEMPLATE : "",
         }
         response.status = status

data/lib/shopify-cli/messages/messages.rb CHANGED Viewed

@@ -7,19 +7,14 @@ module ShopifyCli
         create: {
           info: {
             created: "{{v}} {{green:%s}} was created in the organization's Partner Dashboard {{underline:%s}}",
-            serve: "{{*}} Change directories to your new project folder {{green:%s}} and run {{command:%s serve}} " \
-            "to start a local server",
+            serve: "{{*}} Change directories to your new project folder {{green:%s}} and run "\
+            "{{command:%s %s serve}} to start a local server",
             install: "{{*}} Then, visit {{underline:%s/test}} to install {{green:%s}} on your Dev Store",
           },
         },
       },
       core: {
         connect: {
-          help: <<~HELP,
-            Connect (or re-connect) an existing project to a Shopify partner organization and/or a store. Creates or updates the {{green:.env}} file, and creates the {{green:.shopify-cli.yml}} file.
-              Usage: {{command:%s connect}}
-          HELP
           already_connected_warning: "{{yellow:! This app appears to be already connected}}",
           project_type_select: "What type of project would you like to connect?",
           cli_yml_saved: ".shopify-cli.yml saved to project root",
@@ -32,19 +27,6 @@ module ShopifyCli
           OPEN
         },
-        create: {
-          help: <<~HELP,
-            Create a new project.
-              Usage: {{command:%s create [ %s ]}}
-          HELP
-          error: {
-            invalid_app_type: "{{red:Error}}: invalid app type {{bold:%s}}",
-          },
-          project_type_select: "What type of project would you like to create?",
-        },
         env_file: {
           saving_header: "writing %s file...",
           saving: "writing %s file",
@@ -99,8 +81,6 @@ module ShopifyCli
           preamble: <<~MESSAGE,
             Use {{command:%s help <command>}} to display detailed information about a specific command.
-            {{bold:Available core commands:}}
           MESSAGE
         },
@@ -129,13 +109,35 @@ module ShopifyCli
           npm_installed_deps: "%d npm dependencies installed",
         },
+        login: {
+          help: <<~HELP,
+            Log in to the Shopify CLI by authenticating with a store or partner organization
+              Usage: {{command:%s login [--store=STORE]}}
+          HELP
+          invalid_shop: <<~MESSAGE,
+            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://)
+          PROMPT
+        },
         logout: {
           help: <<~HELP,
-            Log out of a currently authenticated partner organization and store, or clear invalid credentials
+            Log out of an authenticated partner organization and store, or clear invalid credentials
               Usage: {{command:%s logout}}
           HELP
-          success: "Logged out of partner organization and store",
+          success: "Successfully logged out of your account",
+        },
+        switch: {
+          help: <<~HELP,
+            Switch between development stores in your partner organization
+              Usage: {{command:%s switch [--store=STORE]}}
+          HELP
+          disabled_as_shopify_org: "Can't switch development stores logged in as {{green:Shopify partners org}}",
+          success: "Switched development store to {{green:%s}}",
         },
         monorail: {
@@ -146,9 +148,12 @@ module ShopifyCli
           MSG
         },
-        oauth: {
+        identity_auth: {
           error: {
             timeout: "Timed out while waiting for response from Shopify",
+            local_identity_not_running: "Identity needs to be running locally in order to proceed.",
+            reauthenticate: "Please login again with {{command:shopify login}}",
+            invalid_destination: "The store %s doesn't exist. Please log out and try again.",
           },
           location: {
@@ -166,6 +171,7 @@ module ShopifyCli
             authenticated: "Authenticated successfully",
             not_authenticated: "Failed to authenticate",
           },
+          login_prompt: "Please ensure you've logged in with {{command:%s login}} and try again",
         },
         options: {
@@ -185,6 +191,10 @@ module ShopifyCli
         api: {
           error: {
             failed_auth: "Failed to authenticate with Shopify. Please try again later.",
+            failed_auth_debugging: "{{red:Please provide this information with your report:}}\n%s\n\n",
+            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
             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",
@@ -192,22 +202,78 @@ module ShopifyCli
         },
         populate: {
+          help: <<~HELP,
+            Populate a Shopify store with example customers, orders, or products.
+              Usage: {{command:%s populate [ customers | draftorders | products ]}}
+          HELP
+          extended_help: <<~HELP,
+            {{bold:Subcommands:}}
+              {{cyan:customers [options]}}: Add dummy customers to the specified store.
+                Usage: {{command:%1$s populate customers}}
+              {{cyan:draftorders [options]}}: Add dummy orders to the specified store.
+                Usage: {{command:%1$s populate draftorders}}
+              {{cyan:products [options]}}: Add dummy products to the specified store.
+                Usage: {{command:%1$s populate products}}
+            {{bold:Options:}}
+              {{cyan:--count [integer]}}: The number of dummy items to populate. Defaults to 5.
+              {{cyan:--silent}}: Silence the populate output.
+              {{cyan:--help}}: Display more options specific to each subcommand.
+            {{bold:Examples:}}
+              {{command:%1$s populate products}}
+                Populate your store with 5 additional products.
+              {{command:%1$s populate customers --count 30}}
+                Populate your store with 30 additional customers.
+              {{command:%1$s populate draftorders}}
+                Populate your store with 5 additional orders.
+              {{command:%1$s populate products --help}}
+                Display the list of options available to customize the {{command:%1$s populate products}} command.
+          HELP
+          error: {
+            no_shop: "No store found. Please run {{command:%s login --store=STORE}} to login to a specific store",
+          },
+          customer: {
+            added: "%s added to {{green:%s}} at {{underline:%scustomers/%d}}",
+          },
+          draft_order: {
+            added: "DraftOrder added to {{green:%s}} at {{underline:%sdraft_orders/%d}}",
+          },
           options: {
             header: "{{bold:{{cyan:%s}} options:}}",
             count_help: "Number of resources to generate",
           },
           populating: "Populating %d %ss...",
           completion_message: <<~COMPLETION_MESSAGE,
             Successfully added %d %s to {{green:%s}}
             {{*}} View all %ss at {{underline:%s%ss}}
           COMPLETION_MESSAGE
+          product: {
+            added: "%s added to {{green:%s}} at {{underline:%sproducts/%d}}",
+          },
         },
         project: {
           error: {
             not_in_project: <<~MESSAGE,
               {{x}} You are not in a Shopify app project
-              {{yellow:{{*}}}}{{reset: Run}}{{cyan: shopify create}}{{reset: to create your app}}
+              {{yellow:{{*}}}}{{reset: Run}}{{cyan: shopify rails create}}{{reset: or}}{{cyan: shopify node create}}{{reset: to create your app}}
             MESSAGE
           },
         },
@@ -239,7 +305,8 @@ module ShopifyCli
             unknown_option: "{{x}} {{red:unknown option '%s'}}",
           },
-          header: "{{bold:Shopify App CLI}}",
+          header: "{{bold:Shopify CLI}}",
+          shop_header: "{{bold:Current Shop}}",
           const: "%17s = %s",
           ruby_header: <<~RUBY_MESSAGE,
             {{bold:Ruby (via RbConfig)}}
@@ -266,7 +333,20 @@ module ShopifyCli
           identity_is_shopifolk: "{{v}} Checked user settings: you’re Shopify staff!",
         },
+        store: {
+          help: <<~HELP,
+            Display current store.
+              Usage: {{command:%s store}}
+          HELP
+          shop: "You're currently logged into {{green:%s}}",
+        },
         tasks: {
+          confirm_store: {
+            prompt: "You are currently logged into {{green:%s}}. Do you want to proceed using this store?",
+            confirmation: "Proceeding using {{green:%s}}",
+            cancelling: "Cancelling ...",
+          },
           ensure_env: {
             organization_select: "To which partner organization does this project belong?",
             no_development_stores: <<~MESSAGE,
@@ -293,6 +373,9 @@ module ShopifyCli
               MESSAGE
             transfer_disabled: "{{v}} Transfer has been disabled on %s.",
           },
+          ensure_project_type: {
+            wrong_project_type: "This command can only be run within %s projects.",
+          },
           update_dashboard_urls: {
             updated: "{{v}} Whitelist URLS updated in Partners Dashboard}}",
             update_error:
@@ -310,10 +393,11 @@ module ShopifyCli
               organization_not_found: "Cannot find a partner organization with that ID",
               shopifolk_notice: <<~MESSAGE,
                 {{i}} As a {{green:Shopify}} employee, the authentication should take you to the Shopify Okta login,
-                NOT the Partner account login. Please run {{command:%s logout}} and try again.
+                NOT the partner account login. Please run {{command:%s logout}} and try again.
               MESSAGE
             },
-            first_party: "Are you working on a 1P (1st Party) app?",
+            first_party: "Are you working on a {{green:Shopify project}} on behalf of the"\
+              " {{green:Shopify partners org}}?",
             identified_as_shopify: "We've identified you as a {{green:Shopify}} employee.",
             organization: "Partner organization {{green:%s (%s)}}",
             organization_select: "Select partner organization",
@@ -334,7 +418,7 @@ module ShopifyCli
           signup_suggestion: <<~MESSAGE,
             {{*}} To avoid tunnels that timeout, it is recommended to signup for a free ngrok
             account at {{underline:https://ngrok.com/signup}}. After you signup, install your
-            personalized authorization token using {{command:%s tunnel auth <token>}}.
+            personalized authorization token using {{command:%s [ node | rails ] tunnel auth <token>}}.
           MESSAGE
           start: "{{v}} ngrok tunnel running at {{underline:%s}}",
           start_with_account: "{{v}} ngrok tunnel running at {{underline:%s}}, with account %s",
@@ -358,21 +442,30 @@ module ShopifyCli
           DEVELOPMENT
-          shell_shim: <<~MESSAGE,
-            {{x}} This version of Shopify App CLI is no longer supported. You’ll need to migrate to the new CLI version to continue.
+          new_version: <<~MESSAGE,
+            {{*}} {{yellow:A new version of Shopify CLI is available! You have version %s and the latest version is %s.
-              Please visit this page for complete instructions:
-              {{underline:https://shopify.dev/tools/cli/troubleshooting#migrate-from-a-legacy-version}}
+              To upgrade, follow the instructions for the package manager you’re using:
+              {{underline:https://shopify.dev/tools/cli/troubleshooting#upgrade-shopify-cli}}}}
           MESSAGE
+        },
-          new_version: <<~MESSAGE,
-            {{*}} {{yellow:A new version of Shopify App CLI is available! You have version %s and the latest version is %s.
-              To upgrade, follow the instructions for the package manager you’re using:
-              {{underline:https://shopify.dev/tools/cli/troubleshooting#upgrade-shopify-app-cli}}}}
+        whoami: {
+          help: <<~HELP,
+            Identifies which partner organization or store you are currently logged into.
+              Usage: {{command:%s whoami}}
+          HELP
+          not_logged_in: <<~MESSAGE,
+            It doesn't appear that you're logged in. You must log into a partner organization or a store staff account.
+            If trying to log into a store staff account, please use {{command:%s login --store=STORE}} to log in.
+          MESSAGE
+          logged_in_shop_only: <<~MESSAGE,
+            Logged into store {{green:%s}} as staff (no partner organizations available for this login)
           MESSAGE
+          logged_in_partner_only: "Logged into partner organization {{green:%s}}",
+          logged_in_partner_and_shop: "Logged into store {{green:%s}} in partner organization {{green:%s}}",
         },
       },
     }.freeze

data/lib/shopify-cli/partners_api.rb CHANGED Viewed

@@ -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