fix qr auth
This commit is contained in:
@@ -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<AuthTokens, 'user'> & { 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
|
||||
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user