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
43 changes: 43 additions & 0 deletions src/platform/auth/session/useSessionCookie.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
15 changes: 11 additions & 4 deletions src/platform/auth/session/useSessionCookie.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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()
Expand All @@ -42,10 +46,13 @@ export const useSessionCookie = () => {

const readSessionError = async (response: Response): Promise<Error> => {
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)
}

Expand Down
19 changes: 19 additions & 0 deletions src/platform/workspace/auth/WorkspaceAuthGate.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 2 additions & 0 deletions src/platform/workspace/auth/WorkspaceAuthGate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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'
)
Expand Down
Loading