Merge pull request #6659 from Shopify/improve-wrong-account-errors

gonzaloriestra · web-flow · commit 48a844be8725 · 2025-11-25T10:08:31.000Z
Suggest `auth login` to change the account
diff --git a/packages/app/src/cli/services/context.test.ts b/packages/app/src/cli/services/context.test.ts
@@ -716,7 +716,7 @@ const renderTryMessage = (isOrg: boolean, identifier: string) => [
         'Check that your account has permission to develop apps for this organization or contact the owner of the organization to grant you permission',
         [
           'Run',
-          {command: 'shopify auth logout'},
+          {command: 'shopify auth login'},
           'to log into a different',
           isOrg ? 'organization' : 'account',
           'than',
diff --git a/packages/app/src/cli/services/context.ts b/packages/app/src/cli/services/context.ts
@@ -53,7 +53,7 @@ const appNotFoundHelpMessage = (accountIdentifier: string, isOrg = false) => [
         'Check that your account has permission to develop apps for this organization or contact the owner of the organization to grant you permission',
         [
           'Run',
-          {command: 'shopify auth logout'},
+          {command: 'shopify auth login'},
           'to log into a different',
           isOrg ? 'organization' : 'account',
           'than',
diff --git a/packages/app/src/cli/services/dev/fetch.test.ts b/packages/app/src/cli/services/dev/fetch.test.ts
@@ -143,7 +143,7 @@ describe('NoOrgError', () => {
       │  Next steps                                                                  │
       │    • Your current active session is associated with the partner@shopify.com  │
       │      user account. To start a new session with a different account, run      │
-      │      \`shopify auth logout\`                                                   │
+      │      \`shopify auth login\`                                                    │
       │    • Have you created a Shopify Partners organization [1]?                   │
       │    • Does your account include Manage app permissions?, please contact the   │
       │      owner of the organization to grant you access.                          │
@@ -177,7 +177,7 @@ describe('NoOrgError', () => {
       │  Next steps                                                                  │
       │    • Your current active session is associated with the organization         │
       │      organization account. To start a new session with a different account,  │
-      │      run \`shopify auth logout\`                                               │
+      │      run \`shopify auth login\`                                                │
       │    • Have you created a Shopify Partners organization [1]?                   │
       │    • Does your account include Manage app permissions?, please contact the   │
       │      owner of the organization to grant you access.                          │
@@ -210,8 +210,7 @@ describe('NoOrgError', () => {
       │                                                                              │
       │  Next steps                                                                  │
       │    • Your current active session is associated with an unknown account. To   │
-      │      start a new session with a different account, run \`shopify auth         │
-      │      logout\`                                                                 │
+      │      start a new session with a different account, run \`shopify auth login\`  │
       │    • Have you created a Shopify Partners organization [1]?                   │
       │    • Does your account include Manage app permissions?, please contact the   │
       │      owner of the organization to grant you access.                          │
diff --git a/packages/app/src/cli/services/dev/fetch.ts b/packages/app/src/cli/services/dev/fetch.ts
@@ -29,7 +29,7 @@ export class NoOrgError extends AbortError {
         `Your current active session is associated with ${identifierMessage(
           formattedIdentifier,
         )} account. To start a new session with a different account, run`,
-        {command: 'shopify auth logout'},
+        {command: 'shopify auth login'},
       ],
       [
         'Have you',

Original file line number	Diff line number	Diff line change
`@@ -716,7 +716,7 @@ const renderTryMessage = (isOrg: boolean, identifier: string) => [`
`716`	`716`	`'Check that your account has permission to develop apps for this organization or contact the owner of the organization to grant you permission',`
`717`	`717`	`[`
`718`	`718`	`'Run',`
`719`		`- {command: 'shopify auth logout'},`
	`719`	`+ {command: 'shopify auth login'},`
`720`	`720`	`'to log into a different',`
`721`	`721`	`isOrg ? 'organization' : 'account',`
`722`	`722`	`'than',`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ const appNotFoundHelpMessage = (accountIdentifier: string, isOrg = false) => [`
`53`	`53`	`'Check that your account has permission to develop apps for this organization or contact the owner of the organization to grant you permission',`
`54`	`54`	`[`
`55`	`55`	`'Run',`
`56`		`- {command: 'shopify auth logout'},`
	`56`	`+ {command: 'shopify auth login'},`
`57`	`57`	`'to log into a different',`
`58`	`58`	`isOrg ? 'organization' : 'account',`
`59`	`59`	`'than',`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export class NoOrgError extends AbortError {`
`29`	`29`	`Your current active session is associated with ${identifierMessage(
`30`	`30`	`formattedIdentifier,`
`31`	`31`	)} account. To start a new session with a different account, run`,
`32`		`- {command: 'shopify auth logout'},`
	`32`	`+ {command: 'shopify auth login'},`
`33`	`33`	`],`
`34`	`34`	`[`
`35`	`35`	`'Have you',`