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
81 changes: 77 additions & 4 deletions src/services/customerEventsService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ const mockAxiosInstance = vi.hoisted(() => ({
}))

const mockAuthStore = vi.hoisted(() => ({
getFirebaseAuthHeader: vi.fn()
getUserAuthHeader: vi.fn(),
currentUserIdentity: vi.fn()
}))

const mockI18n = vi.hoisted(() => ({
Expand Down Expand Up @@ -80,7 +81,8 @@ describe('useCustomerEventsService', () => {
}

beforeEach(() => {
mockAuthStore.getFirebaseAuthHeader.mockResolvedValue(mockAuthHeaders)
mockAuthStore.getUserAuthHeader.mockResolvedValue(mockAuthHeaders)
mockAuthStore.currentUserIdentity.mockReturnValue('api-key-a')
mockI18n.d.mockImplementation((date, options) => {
// Mock i18n date formatting
if (options?.month === 'short') {
Expand Down Expand Up @@ -117,7 +119,7 @@ describe('useCustomerEventsService', () => {
limit: 10
})

expect(mockAuthStore.getFirebaseAuthHeader).toHaveBeenCalled()
expect(mockAuthStore.getUserAuthHeader).toHaveBeenCalled()
expect(mockAxiosInstance.get).toHaveBeenCalledWith('/customers/events', {
params: { page: 1, limit: 10 },
headers: mockAuthHeaders
Expand All @@ -140,7 +142,7 @@ describe('useCustomerEventsService', () => {
})

it('should return null when auth headers are missing', async () => {
mockAuthStore.getFirebaseAuthHeader.mockResolvedValue(null)
mockAuthStore.getUserAuthHeader.mockResolvedValue(null)

const result = await service.getMyEvents()

Expand All @@ -149,6 +151,77 @@ describe('useCustomerEventsService', () => {
expect(mockAxiosInstance.get).not.toHaveBeenCalled()
})

it('discards events that resolve after an A->B API key switch', async () => {
let resolveEvents!: (value: unknown) => void
const eventsRequestStarted = new Promise<void>((requestStarted) => {
mockAxiosInstance.get.mockImplementation(() => {
requestStarted()
return new Promise((resolve) => {
resolveEvents = resolve
})
})
})

const request = service.getMyEvents()
await eventsRequestStarted
mockAuthStore.currentUserIdentity.mockReturnValue('api-key-b')
resolveEvents({ data: mockEventsResponse })

await expect(request).resolves.toBeNull()
})

it('never exposes a stale error after an A->B API key switch', async () => {
let rejectEvents!: (reason: unknown) => void
const eventsRequestStarted = new Promise<void>((requestStarted) => {
mockAxiosInstance.get.mockImplementation(() => {
requestStarted()
return new Promise((_resolve, reject) => {
rejectEvents = reject
})
})
})
vi.mocked(axios.isAxiosError).mockReturnValue(true)

const request = service.getMyEvents()
await eventsRequestStarted
mockAuthStore.currentUserIdentity.mockReturnValue('api-key-b')
rejectEvents({
response: { status: 400, data: { message: 'account A backend error' } }
})

await expect(request).resolves.toBeNull()
expect(service.error.value).toBeNull()
expect(service.isLoading.value).toBe(false)
})

it('ignores a stale auth preflight once a newer request begins', async () => {
let resolveStaleHeader!: (value: unknown) => void
mockAuthStore.getUserAuthHeader.mockImplementationOnce(
() =>
new Promise((resolve) => {
resolveStaleHeader = resolve
})
)
const staleRequest = service.getMyEvents()

mockAuthStore.currentUserIdentity.mockReturnValue('api-key-b')
const activeRequestStarted = new Promise<void>((requestStarted) => {
mockAxiosInstance.get.mockImplementation(() => {
requestStarted()
return new Promise(() => {})
})
})
const activeRequest = service.getMyEvents()
await activeRequestStarted

resolveStaleHeader(null)
await expect(staleRequest).resolves.toBeNull()

expect(service.error.value).toBeNull()
expect(service.isLoading.value).toBe(true)
void activeRequest
})

it('should handle 400 errors', async () => {
const errorResponse = {
response: {
Expand Down
78 changes: 49 additions & 29 deletions src/services/customerEventsService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ attachUnifiedRemintInterceptor(customerApiClient)
export const useCustomerEventsService = () => {
const isLoading = ref(false)
const error = ref<string | null>(null)
let latestRequestId = 0

watch(
() => getComfyApiBaseUrl(),
Expand All @@ -44,30 +45,26 @@ export const useCustomerEventsService = () => {
}
)

const handleRequestError = (
const describeRequestError = (
err: unknown,
context: string,
routeSpecificErrors?: Record<number, string>
) => {
): string | null => {
// Don't treat cancellation as an error
if (isAbortError(err)) return
if (isAbortError(err)) return null

let message: string
if (!axios.isAxiosError(err)) {
message = `${context} failed: ${err instanceof Error ? err.message : String(err)}`
} else {
const axiosError = err as AxiosError<{ message: string }>
const status = axiosError.response?.status
if (status && routeSpecificErrors?.[status]) {
message = routeSpecificErrors[status]
} else {
message =
axiosError.response?.data?.message ??
`${context} failed with status ${status}`
}
return `${context} failed: ${err instanceof Error ? err.message : String(err)}`
}

error.value = message
const axiosError = err as AxiosError<{ message: string }>
const status = axiosError.response?.status
if (status && routeSpecificErrors?.[status]) {
return routeSpecificErrors[status]
}
return (
axiosError.response?.data?.message ??
`${context} failed with status ${status}`
)
}

const executeRequest = async <T>(
Expand All @@ -76,20 +73,21 @@ export const useCustomerEventsService = () => {
errorContext: string
routeSpecificErrors?: Record<number, string>
}
): Promise<T | null> => {
): Promise<{ data: T | null; errorMessage: string | null }> => {
const { errorContext, routeSpecificErrors } = options

isLoading.value = true
error.value = null

try {
const response = await requestCall()
return response.data
return { data: response.data, errorMessage: null }
} catch (err) {
handleRequestError(err, errorContext, routeSpecificErrors)
return null
} finally {
isLoading.value = false
return {
data: null,
errorMessage: describeRequestError(
err,
errorContext,
routeSpecificErrors
)
}
}
}

Expand Down Expand Up @@ -190,13 +188,27 @@ export const useCustomerEventsService = () => {
404: 'Not found'
}

const authHeaders = await useAuthStore().getFirebaseAuthHeader()
const authStore = useAuthStore()
const requestOwner = authStore.currentUserIdentity()
const requestId = ++latestRequestId
isLoading.value = true
error.value = null

const authHeaders = await authStore.getUserAuthHeader()
if (requestId !== latestRequestId) {
return null
}
if (authStore.currentUserIdentity() !== requestOwner) {
isLoading.value = false
return null
}
if (!authHeaders) {
isLoading.value = false
error.value = 'Authentication header is missing'
return null
}

const result = await executeRequest<CustomerEventsResponse>(
const { data, errorMessage } = await executeRequest<CustomerEventsResponse>(
() =>
customerApiClient.get('/customers/events', {
params: { page, limit },
Expand All @@ -205,7 +217,15 @@ export const useCustomerEventsService = () => {
{ errorContext, routeSpecificErrors }
)

return result
if (requestId !== latestRequestId) {
return null
}
isLoading.value = false
if (authStore.currentUserIdentity() !== requestOwner) {
return null
}
error.value = errorMessage
return data
}

return {
Expand Down
Loading
Loading