diff --git a/packages/cli/src/cli/services/store/admin-graphql-context.test.ts b/packages/cli/src/cli/services/store/admin-graphql-context.test.ts index 47cb4f1540f..fb7288e3ac2 100644 --- a/packages/cli/src/cli/services/store/admin-graphql-context.test.ts +++ b/packages/cli/src/cli/services/store/admin-graphql-context.test.ts @@ -8,6 +8,7 @@ import { isSessionExpired, setStoredStoreAppSession, } from './session.js' +import {STORE_AUTH_APP_CLIENT_ID} from './auth-config.js' import {prepareAdminStoreGraphQLContext} from './admin-graphql-context.js' vi.mock('./session.js') @@ -24,7 +25,7 @@ describe('prepareAdminStoreGraphQLContext', () => { const store = 'shop.myshopify.com' const storedSession = { store, - clientId: 'b16de5d7ba3e2e22279a38c22ef025a0', + clientId: STORE_AUTH_APP_CLIENT_ID, userId: '42', accessToken: 'token', refreshToken: 'refresh-token', diff --git a/packages/cli/src/cli/services/store/auth-config.ts b/packages/cli/src/cli/services/store/auth-config.ts index 843c5ed5a9d..94ce1f1ea5f 100644 --- a/packages/cli/src/cli/services/store/auth-config.ts +++ b/packages/cli/src/cli/services/store/auth-config.ts @@ -1,4 +1,4 @@ -export const STORE_AUTH_APP_CLIENT_ID = 'b16de5d7ba3e2e22279a38c22ef025a0' +export const STORE_AUTH_APP_CLIENT_ID = '7e9cb568cfd431c538f36d1ad3f2b4f6' export const DEFAULT_STORE_AUTH_PORT = 13387 export const STORE_AUTH_CALLBACK_PATH = '/auth/callback' diff --git a/packages/cli/src/cli/services/store/execute.test.ts b/packages/cli/src/cli/services/store/execute.test.ts index 647c9975b2d..e9ab1276937 100644 --- a/packages/cli/src/cli/services/store/execute.test.ts +++ b/packages/cli/src/cli/services/store/execute.test.ts @@ -1,6 +1,7 @@ import {describe, test, expect, vi, beforeEach, afterEach} from 'vitest' import {executeStoreOperation} from './execute.js' import {getStoredStoreAppSession} from './session.js' +import {STORE_AUTH_APP_CLIENT_ID} from './auth-config.js' import {fetchApiVersions, adminUrl} from '@shopify/cli-kit/node/api/admin' import {graphqlRequest} from '@shopify/cli-kit/node/api/graphql' import {renderSingleTask, renderSuccess} from '@shopify/cli-kit/node/ui' @@ -25,7 +26,7 @@ describe('executeStoreOperation', () => { const session = {token: 'token', storeFqdn: store} const storedSession = { store, - clientId: 'b16de5d7ba3e2e22279a38c22ef025a0', + clientId: STORE_AUTH_APP_CLIENT_ID, userId: '42', accessToken: 'token', scopes: ['read_products'], diff --git a/packages/cli/src/cli/services/store/session.test.ts b/packages/cli/src/cli/services/store/session.test.ts index 3fc567e56ea..373fb0d4286 100644 --- a/packages/cli/src/cli/services/store/session.test.ts +++ b/packages/cli/src/cli/services/store/session.test.ts @@ -1,5 +1,6 @@ import {describe, test, expect} from 'vitest' import {LocalStorage} from '@shopify/cli-kit/node/local-storage' +import {STORE_AUTH_APP_CLIENT_ID, storeAuthSessionKey} from './auth-config.js' import { clearStoredStoreAppSession, getStoredStoreAppSession, @@ -27,7 +28,7 @@ function inMemoryStorage() { function buildSession(overrides: Partial = {}): StoredStoreAppSession { return { store: 'shop.myshopify.com', - clientId: 'b16de5d7ba3e2e22279a38c22ef025a0', + clientId: STORE_AUTH_APP_CLIENT_ID, userId: '42', accessToken: 'token-1', scopes: ['read_products'], @@ -79,7 +80,7 @@ describe('store session storage', () => { test('returns undefined and clears the bucket when the current user session is missing', () => { const storage = inMemoryStorage() - storage.set('b16de5d7ba3e2e22279a38c22ef025a0::shop.myshopify.com', { + storage.set(storeAuthSessionKey('shop.myshopify.com'), { currentUserId: '999', sessionsByUserId: { '42': buildSession(), @@ -87,18 +88,18 @@ describe('store session storage', () => { }) expect(getStoredStoreAppSession('shop.myshopify.com', storage as any)).toBeUndefined() - expect(storage.get('b16de5d7ba3e2e22279a38c22ef025a0::shop.myshopify.com')).toBeUndefined() + expect(storage.get(storeAuthSessionKey('shop.myshopify.com'))).toBeUndefined() }) test('returns undefined and clears corrupted stored buckets', () => { const storage = inMemoryStorage() - storage.set('b16de5d7ba3e2e22279a38c22ef025a0::shop.myshopify.com', { + storage.set(storeAuthSessionKey('shop.myshopify.com'), { currentUserId: 42, sessionsByUserId: null, }) expect(getStoredStoreAppSession('shop.myshopify.com', storage as any)).toBeUndefined() - expect(storage.get('b16de5d7ba3e2e22279a38c22ef025a0::shop.myshopify.com')).toBeUndefined() + expect(storage.get(storeAuthSessionKey('shop.myshopify.com'))).toBeUndefined() }) })