about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authordan <dan.abramov@gmail.com>2024-05-01 01:13:55 +0100
committerGitHub <noreply@github.com>2024-05-01 01:13:55 +0100
commit339f26567af36bf250b58dc15974aac5339a8996 (patch)
tree7f0c47de890fdbabc39e821313d39b41fff5f75e /src
parent80bcf81dc502a5a8688a9801dd45de081574c406 (diff)
downloadvoidsky-339f26567af36bf250b58dc15974aac5339a8996.tar.zst
[Session] Consistently copy SessionAgent fields (#3779)
Co-authored-by: Eric Bailey <git@esb.lol>
Diffstat (limited to 'src')
-rw-r--r--src/state/session/index.tsx12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx
index 37b108766..2eb389bd1 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),