Merge pull request #7187 from Shopify/dlm-store-auth-restructure

Store auth restructure

Author: dmerand

packages/cli/src/cli/commands/store/auth.test.ts

@@ -1,8 +1,8 @@
 import {describe, test, expect, vi, beforeEach} from 'vitest'
 import StoreAuth from './auth.js'
-import {authenticateStoreWithApp} from '../../services/store/auth.js'
+import {authenticateStoreWithApp} from '../../services/store/auth/index.js'
 
-vi.mock('../../services/store/auth.js')
+vi.mock('../../services/store/auth/index.js')
 
 describe('store auth command', () => {
   beforeEach(() => {

packages/cli/src/cli/commands/store/auth.ts

@@ -2,7 +2,7 @@ import Command from '@shopify/cli-kit/node/base-command'
 import {globalFlags} from '@shopify/cli-kit/node/cli'
 import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn'
 import {Flags} from '@oclif/core'
-import {authenticateStoreWithApp} from '../../services/store/auth.js'
+import {authenticateStoreWithApp} from '../../services/store/auth/index.js'
 
 export default class StoreAuth extends Command {
   static summary = 'Authenticate an app against a store for store commands.'

packages/cli/src/cli/services/store/admin-graphql-context.test.ts

@@ -4,14 +4,13 @@ import {AbortError} from '@shopify/cli-kit/node/error'
 import {fetch} from '@shopify/cli-kit/node/http'
 import {
   clearStoredStoreAppSession,
-  getStoredStoreAppSession,
-  isSessionExpired,
+  getCurrentStoredStoreAppSession,
   setStoredStoreAppSession,
-} from './session.js'
-import {STORE_AUTH_APP_CLIENT_ID} from './auth-config.js'
+} from './auth/session-store.js'
+import {STORE_AUTH_APP_CLIENT_ID} from './auth/config.js'
 import {prepareAdminStoreGraphQLContext} from './admin-graphql-context.js'
 
-vi.mock('./session.js')
+vi.mock('./auth/session-store.js')
 vi.mock('@shopify/cli-kit/node/http')
 vi.mock('@shopify/cli-kit/node/api/admin', async () => {
   const actual = await vi.importActual<typeof import('@shopify/cli-kit/node/api/admin')>('@shopify/cli-kit/node/api/admin')
@@ -23,6 +22,9 @@ vi.mock('@shopify/cli-kit/node/api/admin', async () => {
 
 describe('prepareAdminStoreGraphQLContext', () => {
   const store = 'shop.myshopify.com'
+  const futureExpiry = new Date(Date.now() + 60 * 60 * 1000).toISOString()
+  const expiredAt = new Date(Date.now() - 60 * 1000).toISOString()
+
   const storedSession = {
     store,
     clientId: STORE_AUTH_APP_CLIENT_ID,
@@ -31,13 +33,12 @@ describe('prepareAdminStoreGraphQLContext', () => {
     refreshToken: 'refresh-token',
     scopes: ['read_products'],
     acquiredAt: '2026-03-27T00:00:00.000Z',
-    expiresAt: '2026-03-27T01:00:00.000Z',
+    expiresAt: futureExpiry,
   }
 
   beforeEach(() => {
     vi.clearAllMocks()
-    vi.mocked(getStoredStoreAppSession).mockReturnValue(storedSession)
-    vi.mocked(isSessionExpired).mockReturnValue(false)
+    vi.mocked(getCurrentStoredStoreAppSession).mockReturnValue(storedSession)
     vi.mocked(fetchApiVersions).mockResolvedValue([
       {handle: '2025-10', supported: true},
       {handle: '2025-07', supported: true},
@@ -59,7 +60,7 @@ describe('prepareAdminStoreGraphQLContext', () => {
   })
 
   test('refreshes expired sessions before resolving the API version', async () => {
-    vi.mocked(isSessionExpired).mockReturnValue(true)
+    vi.mocked(getCurrentStoredStoreAppSession).mockReturnValue({...storedSession, expiresAt: expiredAt})
     vi.mocked(fetch).mockResolvedValue({
       ok: true,
       text: vi.fn().mockResolvedValue(
@@ -98,7 +99,7 @@ describe('prepareAdminStoreGraphQLContext', () => {
   })
 
   test('throws when no stored auth exists', async () => {
-    vi.mocked(getStoredStoreAppSession).mockReturnValue(undefined)
+    vi.mocked(getCurrentStoredStoreAppSession).mockReturnValue(undefined)
 
     await expect(prepareAdminStoreGraphQLContext({store})).rejects.toMatchObject({
       message: `No stored app authentication found for ${store}.`,
@@ -108,7 +109,7 @@ describe('prepareAdminStoreGraphQLContext', () => {
   })
 
   test('clears stored auth when token refresh fails', async () => {
-    vi.mocked(isSessionExpired).mockReturnValue(true)
+    vi.mocked(getCurrentStoredStoreAppSession).mockReturnValue({...storedSession, expiresAt: expiredAt})
     vi.mocked(fetch).mockResolvedValue({
       ok: false,
       status: 401,
@@ -124,8 +125,7 @@ describe('prepareAdminStoreGraphQLContext', () => {
   })
 
   test('throws when an expired session cannot be refreshed because no refresh token is stored', async () => {
-    vi.mocked(isSessionExpired).mockReturnValue(true)
-    vi.mocked(getStoredStoreAppSession).mockReturnValue({...storedSession, refreshToken: undefined})
+    vi.mocked(getCurrentStoredStoreAppSession).mockReturnValue({...storedSession, refreshToken: undefined, expiresAt: expiredAt})
 
     await expect(prepareAdminStoreGraphQLContext({store})).rejects.toMatchObject({
       message: `No refresh token stored for ${store}.`,
@@ -136,7 +136,7 @@ describe('prepareAdminStoreGraphQLContext', () => {
   })
 
   test('clears only the current stored auth when token refresh returns an invalid response body', async () => {
-    vi.mocked(isSessionExpired).mockReturnValue(true)
+    vi.mocked(getCurrentStoredStoreAppSession).mockReturnValue({...storedSession, expiresAt: expiredAt})
     vi.mocked(fetch).mockResolvedValue({
       ok: true,
       text: vi.fn().mockResolvedValue(JSON.stringify({refresh_token: 'fresh-refresh-token'})),
@@ -151,7 +151,7 @@ describe('prepareAdminStoreGraphQLContext', () => {
   })
 
   test('clears only the current stored auth when token refresh returns malformed JSON', async () => {
-    vi.mocked(isSessionExpired).mockReturnValue(true)
+    vi.mocked(getCurrentStoredStoreAppSession).mockReturnValue({...storedSession, expiresAt: expiredAt})
     vi.mocked(fetch).mockResolvedValue({
       ok: true,
       text: vi.fn().mockResolvedValue('not-json'),

packages/cli/src/cli/services/store/admin-graphql-context.ts

@@ -2,10 +2,10 @@ import {fetchApiVersions} from '@shopify/cli-kit/node/api/admin'
 import {AbortError} from '@shopify/cli-kit/node/error'
 import {outputContent, outputDebug, outputToken} from '@shopify/cli-kit/node/output'
 import {AdminSession} from '@shopify/cli-kit/node/session'
-import {reauthenticateStoreAuthError} from './auth-recovery.js'
-import {clearStoredStoreAppSession} from './session.js'
-import type {StoredStoreAppSession} from './session.js'
-import {loadStoredStoreSession} from './stored-session.js'
+import {reauthenticateStoreAuthError} from './auth/recovery.js'
+import {clearStoredStoreAppSession} from './auth/session-store.js'
+import type {StoredStoreAppSession} from './auth/session-store.js'
+import {loadStoredStoreSession} from './auth/session-lifecycle.js'
 
 export interface AdminStoreGraphQLContext {
   adminSession: AdminSession

packages/cli/src/cli/services/store/admin-graphql-transport.test.ts

@@ -2,11 +2,11 @@ import {beforeEach, describe, expect, test, vi} from 'vitest'
 import {adminUrl} from '@shopify/cli-kit/node/api/admin'
 import {graphqlRequest} from '@shopify/cli-kit/node/api/graphql'
 import {renderSingleTask} from '@shopify/cli-kit/node/ui'
-import {clearStoredStoreAppSession} from './session.js'
+import {clearStoredStoreAppSession} from './auth/session-store.js'
 import {prepareStoreExecuteRequest} from './execute-request.js'
 import {runAdminStoreGraphQLOperation} from './admin-graphql-transport.js'
 
-vi.mock('./session.js')
+vi.mock('./auth/session-store.js')
 vi.mock('@shopify/cli-kit/node/api/graphql')
 vi.mock('@shopify/cli-kit/node/ui')
 vi.mock('@shopify/cli-kit/node/api/admin', async () => {

packages/cli/src/cli/services/store/admin-graphql-transport.ts

@@ -4,9 +4,9 @@ import {AbortError} from '@shopify/cli-kit/node/error'
 import {outputContent} from '@shopify/cli-kit/node/output'
 import {AdminSession} from '@shopify/cli-kit/node/session'
 import {renderSingleTask} from '@shopify/cli-kit/node/ui'
-import {reauthenticateStoreAuthError} from './auth-recovery.js'
+import {reauthenticateStoreAuthError} from './auth/recovery.js'
 import {PreparedStoreExecuteRequest} from './execute-request.js'
-import {clearStoredStoreAppSession} from './session.js'
+import {clearStoredStoreAppSession} from './auth/session-store.js'
 
 function isGraphQLClientError(error: unknown): error is {response: {errors?: unknown; status?: number}} {
   if (!error || typeof error !== 'object' || !('response' in error)) return false