zio/bsky-app
2
0
Fork 0
Code Pull requests Releases Packages Activity

[Session] Align state and global agent switchpoints (#3845)

Browse source 
* Adopt synced accounts unconditionally

* Remove try/catch around resuming session

* Move to login form on resume failure

* Restructure code flow for easier reading

---------

Co-authored-by: Eric Bailey <git@esb.lol>
This commit is contained in:
dan 2024-05-03 17:57:09 +01:00 • committed by GitHub
parent 85b34418ef
commit 4a2d4253e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 50 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/screens/Login/ChooseAccountForm.tsx
View file

@ -39,31 +39,33 @@ export const ChooseAccountForm = ({
// The session API isn't resilient to race conditions so let's just ignore this.
return
}
if (account.accessJwt) {
if (account.did === currentAccount?.did) {
setShowLoggedOut(false)
Toast.show(_(msg`Already signed in as @${account.handle}`))
} else {
try {
setPendingDid(account.did)
await initSession(account)
logEvent('account:loggedIn', {
logContext: 'ChooseAccountForm',
withPassword: false,
})
track('Sign In', {resumedSession: true})
Toast.show(_(msg`Signed in as @${account.handle}`))
} catch (e: any) {
logger.error('choose account: initSession failed', {
message: e.message,
})
onSelectAccount(account)
} finally {
setPendingDid(null)
}
}
} else {
if (!account.accessJwt) {
// Move to login form.
onSelectAccount(account)
return
}
if (account.did === currentAccount?.did) {
setShowLoggedOut(false)
Toast.show(_(msg`Already signed in as @${account.handle}`))
return
}
try {
setPendingDid(account.did)
await initSession(account)
logEvent('account:loggedIn', {
logContext: 'ChooseAccountForm',
withPassword: false,
})
track('Sign In', {resumedSession: true})
Toast.show(_(msg`Signed in as @${account.handle}`))
} catch (e: any) {
logger.error('choose account: initSession failed', {
message: e.message,
})
// Move to login form.
onSelectAccount(account)
} finally {
setPendingDid(null)
}
},
[