Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/cli-kit/src/private/node/session/exchange.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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': {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
])
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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, [
Expand Down
2 changes: 1 addition & 1 deletion packages/store/src/cli/commands/store/create/dev.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/store/src/cli/commands/store/delete.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading