From 5424967e4de33bf52faf3f90414db5c8213c9b37 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 31 Aug 2026 12:10:12 +0300 Subject: [PATCH] fix qr auth --- .../controllers/advanced-auth.controller.ts | 55 ++++++++++++++++++- apps/frontend/app/auth/login/page.tsx | 22 ++++---- apps/frontend/components/id/auth-provider.tsx | 21 +++++-- apps/frontend/lib/api.ts | 4 ++ .../src/domain/advanced-auth.service.ts | 24 +++++--- shared/proto/identity.proto | 4 ++ 6 files changed, 102 insertions(+), 28 deletions(-) diff --git a/apps/api-gateway/src/controllers/advanced-auth.controller.ts b/apps/api-gateway/src/controllers/advanced-auth.controller.ts index f82d3a8..1ab6eb8 100644 --- a/apps/api-gateway/src/controllers/advanced-auth.controller.ts +++ b/apps/api-gateway/src/controllers/advanced-auth.controller.ts @@ -51,8 +51,9 @@ export class AdvancedAuthController { @ApiOperation({ summary: 'Проверить QR-сессию', description: 'Возвращает текущий статус QR-сессии: PENDING/APPROVED/EXPIRED.' }) @ApiParam({ name: 'sessionId', description: 'ID QR-сессии' }) @ApiResponse({ status: 200, description: 'Статус QR-сессии получен' }) - pollQr(@Param('sessionId') sessionId: string) { - return this.core.advancedAuth.PollQrSession({ sessionId }); + async pollQr(@Param('sessionId') sessionId: string) { + const response = await firstValueFrom(this.core.advancedAuth.PollQrSession({ sessionId })); + return this.normalizeQrResponse(response); } @Post('qr/session/:sessionId/claim') @@ -86,6 +87,54 @@ export class AdvancedAuthController { @ApiResponse({ status: 201, description: 'QR-сессия подтверждена' }) async approveQr(@Param('sessionId') sessionId: string, @Headers('authorization') authorization?: string) { const payload = await resolveAuthorizedPayload(this.jwt, this.core, authorization); - return this.core.advancedAuth.ApproveQrSession({ sessionId, userId: payload.sub }); + const response = await firstValueFrom(this.core.advancedAuth.ApproveQrSession({ sessionId, userId: payload.sub })); + return this.normalizeQrResponse(response); + } + + private normalizeQrResponse(response: unknown) { + const value = response as { + sessionId?: string; + status?: string; + expiresAt?: string; + qrPayload?: string; + claimed?: boolean; + claimedDeviceName?: string; + accessToken?: string; + refreshToken?: string; + authSessionId?: string; + pinVerified?: boolean; + auth?: { + accessToken?: string; + refreshToken?: string; + sessionId?: string; + pinVerified?: boolean; + expiresAt?: string; + user?: unknown; + }; + }; + const auth = value.auth; + + return { + sessionId: value.sessionId, + status: value.status, + expiresAt: value.expiresAt, + qrPayload: value.qrPayload, + claimed: value.claimed, + claimedDeviceName: value.claimedDeviceName, + accessToken: value.accessToken ?? auth?.accessToken, + refreshToken: value.refreshToken ?? auth?.refreshToken, + authSessionId: value.authSessionId ?? auth?.sessionId, + pinVerified: value.pinVerified ?? auth?.pinVerified, + auth: auth + ? { + accessToken: auth.accessToken, + refreshToken: auth.refreshToken, + sessionId: auth.sessionId, + pinVerified: auth.pinVerified, + expiresAt: auth.expiresAt, + user: auth.user + } + : undefined + }; } } diff --git a/apps/frontend/app/auth/login/page.tsx b/apps/frontend/app/auth/login/page.tsx index 8d87c12..a36264a 100644 --- a/apps/frontend/app/auth/login/page.tsx +++ b/apps/frontend/app/auth/login/page.tsx @@ -33,7 +33,7 @@ import { PhoneInput, phoneCountries, toE164 } from '@/components/ui/phone-input' import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'; import type { AuthTokens, LoginMethod, OtpChannel, OtpSendResponse } from '@/lib/api'; -import { AUTH_TOKEN_KEY, claimQrLoginSession, createQrLoginSession, fetchCurrentUser, fetchFedcmSessionStatus, pollQrLoginSession } from '@/lib/api'; +import { AUTH_TOKEN_KEY, claimQrLoginSession, createQrLoginSession, fetchFedcmSessionStatus, pollQrLoginSession } from '@/lib/api'; import { isFedcmLoginPopup, finalizeFedcmLogin } from '@/lib/fedcm-login-bridge'; @@ -224,8 +224,7 @@ function LoginPageContent() { function finishQrAuth(auth: Omit & { user?: AuthTokens['user'] }) { void (async () => { try { - const user = auth.user ?? await fetchCurrentUser(auth.accessToken); - const resolved = await applyLoginAuth({ ...auth, user }); + const resolved = await applyLoginAuth(auth); finishAuth(resolved.pinVerified, resolved.sessionId); } catch (error) { qrAuthStartedRef.current = false; @@ -410,22 +409,25 @@ function LoginPageContent() { } - if (session.status === 'APPROVED' && session.auth && !qrAuthStartedRef.current) { + const qrAuth = session.auth; + const accessToken = session.accessToken ?? qrAuth?.accessToken; + + if (session.status === 'APPROVED' && accessToken && !qrAuthStartedRef.current) { qrAuthStartedRef.current = true; finishQrAuth({ - accessToken: session.auth.accessToken, + accessToken, - refreshToken: session.auth.refreshToken, + refreshToken: session.refreshToken ?? qrAuth?.refreshToken ?? '', - sessionId: session.auth.sessionId, + sessionId: session.authSessionId ?? qrAuth?.sessionId ?? session.sessionId, - pinVerified: session.auth.pinVerified, + pinVerified: session.pinVerified ?? qrAuth?.pinVerified ?? false, - expiresAt: session.auth.expiresAt, + expiresAt: qrAuth?.expiresAt ?? session.expiresAt, - user: session.auth.user + user: qrAuth?.user }); diff --git a/apps/frontend/components/id/auth-provider.tsx b/apps/frontend/components/id/auth-provider.tsx index 4b970ea..0487e13 100644 --- a/apps/frontend/components/id/auth-provider.tsx +++ b/apps/frontend/components/id/auth-provider.tsx @@ -65,7 +65,7 @@ interface AuthContextValue { beginTotpLogin: (recipient: string) => Promise; verifyTotpLogin: (totpChallengeToken: string, code: string) => Promise; completePin: (sessionId: string, pin: string) => Promise; - applyLoginAuth: (auth: AuthTokens) => Promise; + applyLoginAuth: (auth: Omit & { user?: PublicUser }) => Promise & { user?: PublicUser }>; applyUserPatch: (patch: Partial) => void; register: (data: { displayName: string; login: string; password: string }) => Promise; refreshProfile: () => Promise; @@ -88,10 +88,12 @@ function readCachedUserProfile(): PublicUser | null { } } -function persistPartialAuth(auth: AuthTokens) { +function persistPartialAuth(auth: Omit & { user?: PublicUser }) { window.localStorage.setItem(AUTH_REFRESH_KEY, auth.refreshToken); window.localStorage.setItem(AUTH_SESSION_KEY, auth.sessionId); - cacheUserProfile(auth.user); + if (auth.user) { + cacheUserProfile(auth.user); + } } function applySessionState( @@ -625,13 +627,20 @@ export function AuthProvider({ children }: { children: React.ReactNode }) { ); const applyLoginAuth = React.useCallback( - async (auth: AuthTokens) => { + async (auth: Omit & { user?: PublicUser }) => { if (auth.pinVerified) { - await establishSession(auth); + if (!auth.user) { + const user = await fetchAuthSession(auth.accessToken).then((session) => session.user); + await establishSession({ ...auth, user }); + } else { + await establishSession(auth); + } } else { persistPartialAuth(auth); + if (auth.user) { + setUser(auth.user); + } setHasStoredSession(true); - activatePinLock(auth.sessionId); } return auth; }, diff --git a/apps/frontend/lib/api.ts b/apps/frontend/lib/api.ts index ce54906..bae8e5f 100644 --- a/apps/frontend/lib/api.ts +++ b/apps/frontend/lib/api.ts @@ -238,6 +238,10 @@ export interface QrLoginSession { qrPayload?: string; claimed?: boolean; claimedDeviceName?: string; + accessToken?: string; + refreshToken?: string; + authSessionId?: string; + pinVerified?: boolean; auth?: Omit & { user?: PublicUser }; } diff --git a/apps/sso-core/src/domain/advanced-auth.service.ts b/apps/sso-core/src/domain/advanced-auth.service.ts index 64f6bf0..ffaea72 100644 --- a/apps/sso-core/src/domain/advanced-auth.service.ts +++ b/apps/sso-core/src/domain/advanced-auth.service.ts @@ -201,6 +201,8 @@ export class AdvancedAuthService { } private buildQrSessionResponse(sessionId: string, data: StoredQrSession, qrPayload?: string) { + const auth = data.auth + return { sessionId, status: data.status, @@ -208,16 +210,20 @@ export class AdvancedAuthService { qrPayload, claimed: Boolean(data.claimed && data.fingerprint), claimedDeviceName: data.claimed && data.deviceName ? data.deviceName : undefined, - auth: data.auth + accessToken: auth?.accessToken, + refreshToken: auth?.refreshToken, + authSessionId: auth?.sessionId, + pinVerified: auth?.pinVerified, + auth: auth ? { - accessToken: data.auth.accessToken, - refreshToken: data.auth.refreshToken, - sessionId: data.auth.sessionId, - pinVerified: data.auth.pinVerified, - expiresAt: data.auth.expiresAt, - requiresTotp: data.auth.requiresTotp, - totpChallengeToken: data.auth.totpChallengeToken, - user: data.auth.user + accessToken: auth.accessToken, + refreshToken: auth.refreshToken, + sessionId: auth.sessionId, + pinVerified: auth.pinVerified, + expiresAt: auth.expiresAt, + requiresTotp: auth.requiresTotp, + totpChallengeToken: auth.totpChallengeToken, + user: auth.user } : undefined }; diff --git a/shared/proto/identity.proto b/shared/proto/identity.proto index 6e2388f..ef4c1d6 100644 --- a/shared/proto/identity.proto +++ b/shared/proto/identity.proto @@ -249,6 +249,10 @@ message QrSessionResponse { optional QrAuthPayload auth = 5; optional bool claimed = 6; optional string claimedDeviceName = 7; + optional string accessToken = 8; + optional string refreshToken = 9; + optional string authSessionId = 10; + optional bool pinVerified = 11; } message CreateDeviceLinkSessionRequest {