forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
[Session] Consistently copy SessionAgent fields (#3779)
Co-authored-by: Eric Bailey <git@esb.lol>
authored by
dan
Eric Bailey
and committed by
GitHub
339f2656
80bcf81d
+7
-5
+7
-5
src/state/session/index.tsx
+7
-5
src/state/session/index.tsx
···
142
142
handle: session?.handle || account.handle,
143
143
email: session?.email || account.email,
144
144
emailConfirmed: session?.emailConfirmed || account.emailConfirmed,
145
+
emailAuthFactor: session?.emailAuthFactor || account.emailAuthFactor,
145
146
deactivated: isSessionDeactivated(session?.accessJwt),
146
147
pdsUrl: agent.pdsUrl?.toString(),
147
148
···
271
272
service: agent.service.toString(),
272
273
did: agent.session.did,
273
274
handle: agent.session.handle,
274
-
email: agent.session.email!, // TODO this is always defined?
275
-
emailConfirmed: false,
275
+
email: agent.session.email,
276
+
emailConfirmed: agent.session.emailConfirmed,
277
+
emailAuthFactor: agent.session.emailAuthFactor,
276
278
refreshJwt: agent.session.refreshJwt,
277
279
accessJwt: agent.session.accessJwt,
278
280
deactivated,
···
324
326
did: agent.session.did,
325
327
handle: agent.session.handle,
326
328
email: agent.session.email,
327
-
emailConfirmed: agent.session.emailConfirmed || false,
329
+
emailConfirmed: agent.session.emailConfirmed,
328
330
emailAuthFactor: agent.session.emailAuthFactor,
329
331
refreshJwt: agent.session.refreshJwt,
330
332
accessJwt: agent.session.accessJwt,
···
506
508
did: agent.session.did,
507
509
handle: agent.session.handle,
508
510
email: agent.session.email,
509
-
emailConfirmed: agent.session.emailConfirmed || false,
510
-
emailAuthFactor: agent.session.emailAuthFactor || false,
511
+
emailConfirmed: agent.session.emailConfirmed,
512
+
emailAuthFactor: agent.session.emailAuthFactor,
511
513
refreshJwt: agent.session.refreshJwt,
512
514
accessJwt: agent.session.accessJwt,
513
515
deactivated: isSessionDeactivated(agent.session.accessJwt),