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

Session fixes, pt. 1 (#3762)

Browse source 
* Update persisted schema for new source of truth, implement in existing session

(cherry picked from commit b1e5f12baee932721d66c60dd51c981b46b0c274)

* Improve toasts, log caught error, during switch account

(cherry picked from commit fe0d1507063d2e532b7b1a447670b689292d1dc3)

* Handle thrown errors from initSession during login

(cherry picked from commit 2c85c045917e923901284b9ba310a82e28f37b5c)

---------

Co-authored-by: Eric Bailey <git@esb.lol>
This commit is contained in:
dan 2024-04-30 17:38:05 +01:00 • committed by GitHub
parent 4de78fb69e
commit 2b7d796ca9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 62 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/state/session/index.tsx
View file

@ -618,20 +618,24 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
logger.debug(`session: persisted onUpdate`, {})
if (session.currentAccount && session.currentAccount.refreshJwt) {
if (session.currentAccount?.did !== state.currentAccount?.did) {
const selectedAccount = session.accounts.find(
a => a.did === session.currentAccount?.did,
)
if (selectedAccount && selectedAccount.refreshJwt) {
if (selectedAccount.did !== state.currentAccount?.did) {
logger.debug(`session: persisted onUpdate, switching accounts`, {
from: {
did: state.currentAccount?.did,
handle: state.currentAccount?.handle,
},
to: {
did: session.currentAccount.did,
handle: session.currentAccount.handle,
did: selectedAccount.did,
handle: selectedAccount.handle,
},
})
initSession(session.currentAccount)
initSession(selectedAccount)
} else {
logger.debug(`session: persisted onUpdate, updating session`, {})
@ -641,9 +645,9 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
* already persisted, and we'll get a loop between tabs.
*/
// @ts-ignore we checked for `refreshJwt` above
__globalAgent.session = session.currentAccount
__globalAgent.session = selectedAccount
}
} else if (!session.currentAccount && state.currentAccount) {
} else if (!selectedAccount && state.currentAccount) {
logger.debug(
`session: persisted onUpdate, logging out`,
{},
@ -662,7 +666,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
setState(s => ({
...s,
accounts: session.accounts,
currentAccount: session.currentAccount,
currentAccount: selectedAccount,
}))
})
}, [state, setState, clearCurrentAccount, initSession])