diff --git a/src/platform/auth/session/useSessionCookie.test.ts b/src/platform/auth/session/useSessionCookie.test.ts index 0d70fc61e18..43e9ea2a512 100644 --- a/src/platform/auth/session/useSessionCookie.test.ts +++ b/src/platform/auth/session/useSessionCookie.test.ts @@ -366,6 +366,49 @@ describe('useSessionCookie', () => { } ) + it.for([ + { + name: 'a 401 SESSION_REVOKED', + status: 401, + code: 'SESSION_REVOKED', + revoked: true + }, + { + name: 'a 401 UNAUTHORIZED', + status: 401, + code: 'UNAUTHORIZED', + revoked: false + }, + { + name: 'a 403 SESSION_REVOKED', + status: 403, + code: 'SESSION_REVOKED', + revoked: false + } + ])( + 'ensureSessionCookie rejects with SessionRevokedError: $revoked for $name', + async ({ status, code, revoked }) => { + vi.mocked(useAuthStore().getIdToken).mockResolvedValue( + 'firebase-id-token' + ) + vi.mocked(globalThis.fetch).mockImplementation(async () => + Response.json( + { code, message: 'This session was signed out; sign in again' }, + { status } + ) + ) + const { useSessionCookie, SessionRevokedError } = + await loadUseSessionCookie() + + const failure = await useSessionCookie() + .ensureSessionCookie() + .catch((error: unknown) => error) + + expect(failure).toBeInstanceOf(Error) + expect(failure instanceof SessionRevokedError).toBe(revoked) + } + ) + it('sessionRequiresSso is false once the session is created', async () => { vi.mocked(useAuthStore().getIdToken).mockResolvedValue('firebase-id-token') vi.mocked(globalThis.fetch).mockResolvedValue( diff --git a/src/platform/auth/session/useSessionCookie.ts b/src/platform/auth/session/useSessionCookie.ts index 4b1289347a3..8893151bd4c 100644 --- a/src/platform/auth/session/useSessionCookie.ts +++ b/src/platform/auth/session/useSessionCookie.ts @@ -1,4 +1,5 @@ import { isSsoRequiredRefusal } from '@comfyorg/account-core/sso' +import { zErrorResponse } from '@comfyorg/ingest-types/zod' import { useCurrentUser } from '@/composables/auth/useCurrentUser' import { useFeatureFlags } from '@/composables/useFeatureFlags' @@ -17,6 +18,9 @@ class SsoRequiredSessionError extends Error { readonly code = 'SSO_REQUIRED' } +/** Ingest refused the session because the sign-in predates a sign-out. */ +export class SessionRevokedError extends Error {} + let inFlightCreateSession: InFlightCreateSession | null = null let confirmedSessionOwnerUid: string | null = null let sessionMutationTail = Promise.resolve() @@ -42,10 +46,13 @@ export const useSessionCookie = () => { const readSessionError = async (response: Response): Promise => { const errorData: unknown = await response.json().catch(() => null) - const message = (errorData as { message?: unknown } | null)?.message - const text = typeof message === 'string' ? message : response.statusText - return isSsoRequiredRefusal(response.status, errorData) - ? new SsoRequiredSessionError(text) + const refusal = zErrorResponse.partial().safeParse(errorData).data + const text = refusal?.message ?? response.statusText + if (isSsoRequiredRefusal(response.status, errorData)) { + return new SsoRequiredSessionError(text) + } + return response.status === 401 && refusal?.code === 'SESSION_REVOKED' + ? new SessionRevokedError(text) : new Error(text) } diff --git a/src/platform/workspace/auth/WorkspaceAuthGate.test.ts b/src/platform/workspace/auth/WorkspaceAuthGate.test.ts index fe11e5bc261..fecf64ea00e 100644 --- a/src/platform/workspace/auth/WorkspaceAuthGate.test.ts +++ b/src/platform/workspace/auth/WorkspaceAuthGate.test.ts @@ -7,6 +7,7 @@ import type { } from '@/platform/auth/session/webSessionFetch' import { provideWebSessionRequests } from '@/platform/auth/session/webSessionFetch' import { useCloudWebSessionStore } from '@/platform/auth/session/cloudWebSessionStore' +import { SessionRevokedError } from '@/platform/auth/session/useSessionCookie' import { useApiKeyAuthStore } from '@/stores/apiKeyAuthStore' import { useAuthStore } from '@/stores/authStore' import { NoWorkspaceAccessError } from '@/platform/workspace/api/workspaceApiError' @@ -666,6 +667,24 @@ describe('WorkspaceAuthGate', () => { error: new Error('Workspace init failed'), heading: "Couldn't load your workspace", retry: true + }, + { + name: 'sso off, session revoked', + sso: false, + error: new SessionRevokedError( + 'This session was signed out; sign in again' + ), + heading: "Couldn't load your workspace", + retry: false + }, + { + name: 'sso on, session revoked', + sso: true, + error: new SessionRevokedError( + 'This session was signed out; sign in again' + ), + heading: "Couldn't load your workspace", + retry: false } ])( '$name: shows "$heading" with sign-out', diff --git a/src/platform/workspace/auth/WorkspaceAuthGate.vue b/src/platform/workspace/auth/WorkspaceAuthGate.vue index 6af36533f7c..d2ed98b8e66 100644 --- a/src/platform/workspace/auth/WorkspaceAuthGate.vue +++ b/src/platform/workspace/auth/WorkspaceAuthGate.vue @@ -96,6 +96,7 @@ import { import Button from '@/components/ui/button/Button.vue' import { useAuthActions } from '@/composables/auth/useAuthActions' import { useFeatureFlags } from '@/composables/useFeatureFlags' +import { SessionRevokedError } from '@/platform/auth/session/useSessionCookie' import { signedInOnWebSession } from '@/platform/auth/session/webSessionFetch' import { isCloud } from '@/platform/distribution/types' import { @@ -245,6 +246,7 @@ function isRetryableInitializationError(error: unknown): boolean { ) { return false } + if (error instanceof SessionRevokedError) return false return !( error instanceof Error && error.message === 'No workspaces available' )