diff --git a/apps/frontend/app/auth/login/page.tsx b/apps/frontend/app/auth/login/page.tsx index 296f9e5..8d87c12 100644 --- a/apps/frontend/app/auth/login/page.tsx +++ b/apps/frontend/app/auth/login/page.tsx @@ -4,7 +4,7 @@ import Link from 'next/link'; -import { FormEvent, Suspense, useCallback, useEffect, useState } from 'react'; +import { FormEvent, Suspense, useCallback, useEffect, useRef, useState } from 'react'; import { useRouter, useSearchParams } from 'next/navigation'; @@ -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, fetchFedcmSessionStatus, pollQrLoginSession } from '@/lib/api'; +import { AUTH_TOKEN_KEY, claimQrLoginSession, createQrLoginSession, fetchCurrentUser, fetchFedcmSessionStatus, pollQrLoginSession } from '@/lib/api'; import { isFedcmLoginPopup, finalizeFedcmLogin } from '@/lib/fedcm-login-bridge'; @@ -175,6 +175,7 @@ function LoginPageContent() { const [qrSecondsLeft, setQrSecondsLeft] = useState(null); const [qrLoading, setQrLoading] = useState(false); + const qrAuthStartedRef = useRef(false); const [lastOtpChannel, setLastOtpChannel] = useState(); const [otpResendAvailableAt, setOtpResendAvailableAt] = useState(null); const otpResendSecondsLeft = useOtpResendCooldown(otpResendAvailableAt); @@ -220,10 +221,16 @@ function LoginPageContent() { - function finishQrAuth(auth: AuthTokens) { + function finishQrAuth(auth: Omit & { user?: AuthTokens['user'] }) { void (async () => { - const resolved = await applyLoginAuth(auth); - finishAuth(resolved.pinVerified, resolved.sessionId); + try { + const user = auth.user ?? await fetchCurrentUser(auth.accessToken); + const resolved = await applyLoginAuth({ ...auth, user }); + finishAuth(resolved.pinVerified, resolved.sessionId); + } catch (error) { + qrAuthStartedRef.current = false; + showToast(error instanceof Error ? error.message : 'Не удалось завершить вход по QR-коду'); + } })(); } @@ -343,6 +350,7 @@ function LoginPageContent() { const startQrLogin = useCallback(async () => { setQrLoading(true); + qrAuthStartedRef.current = false; try { @@ -402,7 +410,8 @@ function LoginPageContent() { } - if (session.status === 'APPROVED' && session.auth?.user) { + if (session.status === 'APPROVED' && session.auth && !qrAuthStartedRef.current) { + qrAuthStartedRef.current = true; finishQrAuth({ diff --git a/apps/frontend/lib/api.ts b/apps/frontend/lib/api.ts index 3df00d0..ce54906 100644 --- a/apps/frontend/lib/api.ts +++ b/apps/frontend/lib/api.ts @@ -238,7 +238,7 @@ export interface QrLoginSession { qrPayload?: string; claimed?: boolean; claimedDeviceName?: string; - auth?: AuthTokens & { user?: PublicUser }; + auth?: Omit & { user?: PublicUser }; } export async function createQrLoginSession(deviceName?: string) { @@ -257,6 +257,11 @@ export async function pollQrLoginSession(sessionId: string) { return apiFetch(`/auth/advanced/qr/session/${sessionId}`); } +export async function fetchCurrentUser(token: string) { + const session = await apiFetch('/auth/session', {}, token, true, { critical: true }); + return session.user; +} + export async function createDeviceLinkQrSession(userId: string, token: string) { return apiFetch(`/security/users/${userId}/device-link/session`, { method: 'POST' }, token); }