diff --git a/packages/cli-kit/src/private/node/session/exchange.ts b/packages/cli-kit/src/private/node/session/exchange.ts index 12e3f8fbe32..ea2c559b1e9 100644 --- a/packages/cli-kit/src/private/node/session/exchange.ts +++ b/packages/cli-kit/src/private/node/session/exchange.ts @@ -78,7 +78,8 @@ function automationTokenExchangeMessages( ): {message: string; tryMessage: TokenItem} { const prettyName = apiName.replace(/-/g, ' ').replace(/\b\w/g, (char) => char.toUpperCase()) const variable = automationTokenVariable() ?? environmentVariables.serviceAccountToken - const admin: TokenItem = ['in the Shopify admin under', {subdued: 'Settings > Users > Security'}] + // Named loosely on purpose: the admin page that manages service accounts has moved before and can move again. + const admin: TokenItem = ["in your organization's settings in the Shopify admin"] switch (automationTokenExchangeFailure(cause)) { case 'missing_access': { diff --git a/packages/organizations/src/cli/services/business-platform.test.ts b/packages/organizations/src/cli/services/business-platform.test.ts index b5f3e5795e5..5ef5f38e454 100644 --- a/packages/organizations/src/cli/services/business-platform.test.ts +++ b/packages/organizations/src/cli/services/business-platform.test.ts @@ -61,7 +61,7 @@ describe('OrganizationStoreAccessError', () => { // The guidance lives in nextSteps, the field the store commands' --json output carries. expect(error.tryMessage).toBeNull() expect(error.nextSteps).toEqual([ - 'Give the service account Dev store management access in the Shopify admin under Settings > Users > Security.', + "Give the service account Dev store management access in your organization's settings in the Shopify admin.", 'Or use a token from a service account that has that access.', ]) }) diff --git a/packages/organizations/src/cli/services/business-platform.ts b/packages/organizations/src/cli/services/business-platform.ts index 763cc1c1a42..d918919f021 100644 --- a/packages/organizations/src/cli/services/business-platform.ts +++ b/packages/organizations/src/cli/services/business-platform.ts @@ -57,7 +57,8 @@ export function isOrganizationAccessError(error: unknown): boolean { export class OrganizationStoreAccessError extends AbortError { constructor(organization: OrganizationReference) { const name = organization.businessName ?? `organization ${organization.id}` - const where = 'in the Shopify admin under Settings > Users > Security' + // Named loosely on purpose: the admin page that manages service accounts has moved before and can move again. + const where = "in your organization's settings in the Shopify admin" if (isServiceAccountTokenSet()) { super(`This service account can't manage dev stores in ${name}.`, null, [ diff --git a/packages/store/src/cli/commands/store/create/dev.test.ts b/packages/store/src/cli/commands/store/create/dev.test.ts index 8969905c170..462a4b02b7f 100644 --- a/packages/store/src/cli/commands/store/create/dev.test.ts +++ b/packages/store/src/cli/commands/store/create/dev.test.ts @@ -295,7 +295,7 @@ describe('store create dev command', () => { error: true, message: "This service account can't manage dev stores in Test Org.", nextSteps: [ - 'Give the service account Dev store management access in the Shopify admin under Settings > Users > Security.', + "Give the service account Dev store management access in your organization's settings in the Shopify admin.", 'Or use a token from a service account that has that access.', ], exitCode: 1, diff --git a/packages/store/src/cli/commands/store/delete.test.ts b/packages/store/src/cli/commands/store/delete.test.ts index 1c08bf0ffba..37952b8b7a0 100644 --- a/packages/store/src/cli/commands/store/delete.test.ts +++ b/packages/store/src/cli/commands/store/delete.test.ts @@ -190,7 +190,7 @@ describe('store delete command', () => { error: true, message: "This service account can't manage dev stores in Test Org.", nextSteps: [ - 'Give the service account Dev store management access in the Shopify admin under Settings > Users > Security.', + "Give the service account Dev store management access in your organization's settings in the Shopify admin.", 'Or use a token from a service account that has that access.', ], exitCode: 1,