@sanity/sdk 2.13.0 → 2.14.1

package/src/auth/refreshStampedToken.ts

@@ -14,6 +14,7 @@ import {
 
 import {type StoreContext} from '../store/defineStore'
 import {DEFAULT_API_VERSION, REQUEST_TAG_PREFIX} from './authConstants'
+import {getAuthLogger} from './authLogger'
 import {AuthStateType} from './authStateType'
 import {type AuthState, type AuthStoreState} from './authStore'
 
@@ -141,7 +142,12 @@ function shouldRefreshToken(lastRefresh: number | undefined): boolean {
 /**
  * @internal
  */
-export const refreshStampedToken = ({state}: StoreContext<AuthStoreState>): Subscription => {
+export const refreshStampedToken = ({
+  state,
+  instance,
+}: StoreContext<AuthStoreState>): Subscription => {
+  const logger = getAuthLogger(instance)
+
   const {clientFactory, apiHost, storageArea, storageKey} = state.get().options
 
   const refreshToken$ = state.observable.pipe(
@@ -171,14 +177,17 @@ export const refreshStampedToken = ({state}: StoreContext<AuthStoreState>): Subs
         // Read the latest token directly from state inside refresh
         const currentState = state.get()
         if (currentState.authState.type !== AuthStateType.LOGGED_IN) {
+          logger.debug('Token refresh aborted - user logged out')
           throw new Error('User logged out before refresh could complete') // Abort refresh
         }
         const currentToken = currentState.authState.token
 
+        logger.debug('Refreshing stamped token')
         const response = await firstValueFrom(
           createTokenRefreshStream(currentToken, clientFactory, apiHost),
         )
 
+        logger.info('Token refreshed successfully')
         state.set('setRefreshStampedToken', (prev) => ({
           authState:
             prev.authState.type === AuthStateType.LOGGED_IN
@@ -276,6 +285,7 @@ export const refreshStampedToken = ({state}: StoreContext<AuthStoreState>): Subs
 
   return refreshToken$.subscribe({
     next: (response: {token: string}) => {
+      logger.debug('Token refresh completed, updating state')
       state.set('setRefreshStampedToken', (prev) => ({
         authState:
           prev.authState.type === AuthStateType.LOGGED_IN
@@ -289,6 +299,7 @@ export const refreshStampedToken = ({state}: StoreContext<AuthStoreState>): Subs
       storageArea?.setItem(storageKey, JSON.stringify({token: response.token}))
     },
     error: (error) => {
+      logger.error('Token refresh failed', {error})
       state.set('setRefreshStampedTokenError', {authState: {type: AuthStateType.ERROR, error}})
     },
   })

package/src/auth/subscribeToStateAndFetchCurrentUser.test.ts

@@ -1,6 +1,6 @@
 import {type CurrentUser} from '@sanity/types'
 import {delay, of, throwError} from 'rxjs'
-import {beforeEach, describe, it} from 'vitest'
+import {beforeEach, describe, expect, it, vi} from 'vitest'
 
 import {createSanityInstance} from '../store/createSanityInstance'
 import {createStoreState} from '../store/createStoreState'
@@ -8,13 +8,28 @@ import {AuthStateType} from './authStateType'
 import {authStore} from './authStore'
 import {subscribeToStateAndFetchCurrentUser} from './subscribeToStateAndFetchCurrentUser'
 
+// Mock logger to prevent actual logging during tests
+vi.mock('../utils/logger', async (importOriginal) => {
+  const original = await importOriginal<typeof import('../utils/logger')>()
+  return {
+    ...original,
+    createLogger: vi.fn(() => ({
+      info: vi.fn(),
+      debug: vi.fn(),
+      warn: vi.fn(),
+      error: vi.fn(),
+      trace: vi.fn(),
+    })),
+  }
+})
+
 describe('subscribeToStateAndFetchCurrentUser', () => {
   beforeEach(() => {
     vi.clearAllMocks()
   })
 
   it('fetches the current user if the is logged in without a current user present', () => {
-    const mockUser = {id: 'example-user'} as CurrentUser
+    const mockUser = {id: 'example-user', email: 'user@example.com'} as CurrentUser
     const mockRequest = vi.fn().mockReturnValue(of(mockUser))
     const mockClient = {observable: {request: mockRequest}}
     const clientFactory = vi.fn().mockReturnValue(mockClient)

package/src/auth/subscribeToStateAndFetchCurrentUser.ts

@@ -11,6 +11,7 @@ import {
 
 import {type StoreContext} from '../store/defineStore'
 import {DEFAULT_API_VERSION, REQUEST_TAG_PREFIX} from './authConstants'
+import {getAuthLogger} from './authLogger'
 import {isStudioConfig} from './authMode'
 import {AuthStateType} from './authStateType'
 import {type AuthMethodOptions, type AuthState, type AuthStoreState} from './authStore'
@@ -30,6 +31,8 @@ export const subscribeToStateAndFetchCurrentUser = (
   {state, instance}: StoreContext<AuthStoreState>,
   fetchOptions?: {useProjectHostname?: boolean},
 ): Subscription => {
+  const logger = getAuthLogger(instance)
+
   const {clientFactory, apiHost} = state.get().options
   const useProjectHostname = fetchOptions?.useProjectHostname ?? isStudioConfig(instance.config)
   const projectId = instance.config.projectId
@@ -82,6 +85,7 @@ export const subscribeToStateAndFetchCurrentUser = (
              * @see SDK-1409
              */
             catchError((error) => {
+              logger.error('Failed to fetch current user', {error})
               state.set('setError', {authState: {type: AuthStateType.ERROR, error}})
               return EMPTY
             }),
@@ -91,6 +95,11 @@ export const subscribeToStateAndFetchCurrentUser = (
 
   return currentUser$.subscribe({
     next: (currentUser) => {
+      logger.info('Current user fetched successfully', {
+        hasEmail: !!currentUser.email,
+      })
+      // userId is PII, so only surface it at debug level
+      logger.debug('Current user details', {userId: currentUser.id})
       state.set('setCurrentUser', (prev) => ({
         authState:
           prev.authState.type === AuthStateType.LOGGED_IN