From 339f26567af36bf250b58dc15974aac5339a8996 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 1 May 2024 01:13:55 +0100 Subject: [PATCH] [Session] Consistently copy SessionAgent fields (#3779) Co-authored-by: Eric Bailey --- src/state/session/index.tsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx index 37b108766e..2eb389bd14 100644 --- a/src/state/session/index.tsx +++ b/src/state/session/index.tsx @@ -142,6 +142,7 @@ function createPersistSessionHandler( handle: session?.handle || account.handle, email: session?.email || account.email, emailConfirmed: session?.emailConfirmed || account.emailConfirmed, + emailAuthFactor: session?.emailAuthFactor || account.emailAuthFactor, deactivated: isSessionDeactivated(session?.accessJwt), pdsUrl: agent.pdsUrl?.toString(), @@ -271,8 +272,9 @@ export function Provider({children}: React.PropsWithChildren<{}>) { service: agent.service.toString(), did: agent.session.did, handle: agent.session.handle, - email: agent.session.email!, // TODO this is always defined? - emailConfirmed: false, + email: agent.session.email, + emailConfirmed: agent.session.emailConfirmed, + emailAuthFactor: agent.session.emailAuthFactor, refreshJwt: agent.session.refreshJwt, accessJwt: agent.session.accessJwt, deactivated, @@ -324,7 +326,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) { did: agent.session.did, handle: agent.session.handle, email: agent.session.email, - emailConfirmed: agent.session.emailConfirmed || false, + emailConfirmed: agent.session.emailConfirmed, emailAuthFactor: agent.session.emailAuthFactor, refreshJwt: agent.session.refreshJwt, accessJwt: agent.session.accessJwt, @@ -506,8 +508,8 @@ export function Provider({children}: React.PropsWithChildren<{}>) { did: agent.session.did, handle: agent.session.handle, email: agent.session.email, - emailConfirmed: agent.session.emailConfirmed || false, - emailAuthFactor: agent.session.emailAuthFactor || false, + emailConfirmed: agent.session.emailConfirmed, + emailAuthFactor: agent.session.emailAuthFactor, refreshJwt: agent.session.refreshJwt, accessJwt: agent.session.accessJwt, deactivated: isSessionDeactivated(agent.session.accessJwt),