diff --git a/apps/billing-web/src/session/unifiedBillingSession.test.ts b/apps/billing-web/src/session/unifiedBillingSession.test.ts index 0d612985897..77738f92934 100644 --- a/apps/billing-web/src/session/unifiedBillingSession.test.ts +++ b/apps/billing-web/src/session/unifiedBillingSession.test.ts @@ -28,7 +28,8 @@ function firebaseUser(uid: string): User { return user as User } -function rememberedFirebase(remembered: User | null) { +function rememberedFirebase(initial: User | null) { + let remembered = initial const signOut = vi.fn(async () => undefined) const identity: Pick = { onUserChanged: (callback) => { @@ -39,10 +40,22 @@ function rememberedFirebase(remembered: User | null) { } return { signOut, + remember: (user: User) => { + remembered = user + }, loadFirebase: vi.fn(async () => identity as FirebaseIdentity) } } +function unsettledAfter(settling: Promise, ms: number) { + return Promise.race([ + settling, + new Promise<'unsettled'>((resolve) => + setTimeout(() => resolve('unsettled'), ms) + ) + ]) +} + function workspaceRoute(workspace: Response | (() => Response)) { return (): Response | Promise => typeof workspace === 'function' ? workspace() : workspace.clone() @@ -70,9 +83,11 @@ function setup({ state = LIVE, remembered = null as User | null, workspace = workspaceRoute(TEAM), - workspaceId = undefined as string | undefined + workspaceId = undefined as string | undefined, + creationOutages = 0 } = {}) { const endpoint = createFakeWebSessionEndpoint({ state }) + const outage = { remaining: creationOutages } const sent: SentRequest[] = [] const fetchImpl = vi.fn(async (input, init = {}) => { const url = new URL(String(input)) @@ -85,6 +100,16 @@ function setup({ ) }) if (url.pathname === '/api/workspaces/current') return workspace() + if ( + init.method === 'POST' && + url.pathname === '/api/auth/session' && + outage.remaining > 0 + ) { + outage.remaining -= 1 + return new Response(JSON.stringify({ code: 'unavailable' }), { + status: 503 + }) + } if (url.pathname.startsWith('/api/billing/')) { return new Response(JSON.stringify({})) } @@ -99,7 +124,7 @@ function setup({ workspaceId: () => entry.workspaceId }) const paths = () => sent.map((r) => `${r.method} ${r.path}`) - return { session, sent, firebase, paths, entry } + return { session, sent, firebase, paths, entry, outage } } describe('billing-web on the shared web session', () => { @@ -349,4 +374,62 @@ describe('billing-web on the shared web session', () => { expect(session.scopeSource.getScope()?.workspaceId).toBe(scope) } ) + + describe('when creating the shared session is unavailable', () => { + it('Try again creates it for the Firebase user who just signed in', async () => { + const { session, firebase, paths } = setup({ + state: { kind: 'dead', code: 'no_session' }, + creationOutages: 1 + }) + await expect(session.settledPhase()).resolves.toBe('signed-out') + await session.signInPort.loadIdentity() + const user = firebaseUser('user-1') + firebase.remember(user) + + await expect(session.signInPort.establish(user)).resolves.toEqual({ + status: 'error', + code: 'TOKEN_EXCHANGE_FAILED' + }) + await expect(session.signInPort.establish()).resolves.toEqual({ + status: 'ok' + }) + + expect( + paths().filter((path) => path === 'POST /api/auth/session') + ).toHaveLength(2) + expect(session.billedScope.value?.workspace.id).toBe('ws-team') + }) + + it('settles to sign-in for a remembered login, and Try again restores it once the endpoint answers', async () => { + const { session, outage } = setup({ + state: { kind: 'dead', code: 'no_session' }, + remembered: firebaseUser('user-1'), + creationOutages: Number.POSITIVE_INFINITY + }) + + await expect(unsettledAfter(session.settledPhase(), 100)).resolves.toBe( + 'signed-out' + ) + + outage.remaining = 0 + await expect(session.signInPort.establish()).resolves.toEqual({ + status: 'ok' + }) + expect(session.billedScope.value?.workspace.id).toBe('ws-team') + }) + + it('Try again without any Firebase user asks for sign-in without a request', async () => { + const { session, sent } = setup({ + state: { kind: 'dead', code: 'no_session' } + }) + await session.settledPhase() + const before = sent.length + + await expect(session.signInPort.establish()).resolves.toEqual({ + status: 'error', + code: 'NOT_AUTHENTICATED' + }) + expect(sent).toHaveLength(before) + }) + }) }) diff --git a/apps/billing-web/src/session/unifiedBillingSession.ts b/apps/billing-web/src/session/unifiedBillingSession.ts index edfdfa491b1..bb8d65ca4fa 100644 --- a/apps/billing-web/src/session/unifiedBillingSession.ts +++ b/apps/billing-web/src/session/unifiedBillingSession.ts @@ -180,7 +180,11 @@ export function createUnifiedBillingSession(deps: UnifiedBillingSessionDeps) { function settledOf(): BillingWebSessionPhase | undefined { const current = state.value - if (current.phase === 'signed_out' || current.phase === 'api_key') { + if ( + current.phase === 'signed_out' || + current.phase === 'api_key' || + current.phase === 'retry_wait' + ) { return 'signed-out' } if (current.phase !== 'signed_in' || workspace.value === undefined) { @@ -206,9 +210,16 @@ export function createUnifiedBillingSession(deps: UnifiedBillingSessionDeps) { }) } + /** Without a session to resolve against, a retry creates one for whoever Firebase holds. */ + async function sessionCreator(user?: User): Promise { + if (user !== undefined || state.value.phase === 'signed_in') return user + return (await firebaseUser()) ?? undefined + } + async function establish(user?: User): Promise { - if (user === undefined) return establishmentOf(await resolveWorkspace()) - const created = await createWebSession(session, () => user.getIdToken()) + const creator = await sessionCreator(user) + if (creator === undefined) return establishmentOf(await resolveWorkspace()) + const created = await createWebSession(session, () => creator.getIdToken()) if (created.status !== 'ok') { return { status: 'error', code: creationFailureCode(created) } }