diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/App.native.tsx | 12 | ||||
| -rw-r--r-- | src/App.web.tsx | 12 | ||||
| -rw-r--r-- | src/state/session/index.tsx | 96 |
3 files changed, 67 insertions, 53 deletions
diff --git a/src/App.native.tsx b/src/App.native.tsx index 9b9287789..538e9b32d 100644 --- a/src/App.native.tsx +++ b/src/App.native.tsx @@ -39,7 +39,7 @@ SplashScreen.preventAutoHideAsync() function InnerApp() { const colorMode = useColorMode() - const {isInitialLoad, currentAccount} = useSession() + const {currentAccount} = useSession() const {resumeSession} = useSessionApi() // init @@ -53,16 +53,6 @@ function InnerApp() { resumeSession(account) }, [resumeSession]) - // show nothing prior to init - if (isInitialLoad) { - // TODO add a loading state - return null - } - - /* - * Session and initial state should be loaded prior to rendering below. - */ - return ( <React.Fragment // Resets the entire tree below when it changes: diff --git a/src/App.web.tsx b/src/App.web.tsx index e29eec0dc..ef172705e 100644 --- a/src/App.web.tsx +++ b/src/App.web.tsx @@ -30,7 +30,7 @@ import {Provider as UnreadNotifsProvider} from 'state/queries/notifications/unre import * as persisted from '#/state/persisted' function InnerApp() { - const {isInitialLoad, currentAccount} = useSession() + const {currentAccount} = useSession() const {resumeSession} = useSessionApi() const colorMode = useColorMode() @@ -40,16 +40,6 @@ function InnerApp() { resumeSession(account) }, [resumeSession]) - // show nothing prior to init - if (isInitialLoad) { - // TODO add a loading state - return null - } - - /* - * Session and initial state should be loaded prior to rendering below. - */ - return ( <React.Fragment // Resets the entire tree below when it changes: diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx index 76b77a087..d4cd2fcd2 100644 --- a/src/state/session/index.tsx +++ b/src/state/session/index.tsx @@ -28,7 +28,6 @@ export function getAgent() { export type SessionAccount = persisted.PersistedAccount export type SessionState = { - isInitialLoad: boolean isSwitchingAccounts: boolean accounts: SessionAccount[] currentAccount: SessionAccount | undefined @@ -76,7 +75,6 @@ export type ApiContext = { } const StateContext = React.createContext<StateContext>({ - isInitialLoad: true, isSwitchingAccounts: false, accounts: [], currentAccount: undefined, @@ -104,31 +102,43 @@ function createPersistSessionHandler( }) => void, ): AtpPersistSessionHandler { return function persistSession(event, session) { - const expired = !(event === 'create' || event === 'update') + const expired = event === 'expired' || event === 'create-failed' + const refreshedAccount: SessionAccount = { service: account.service, did: session?.did || account.did, handle: session?.handle || account.handle, email: session?.email || account.email, emailConfirmed: session?.emailConfirmed || account.emailConfirmed, - refreshJwt: session?.refreshJwt, // undefined when expired or creation fails - accessJwt: session?.accessJwt, // undefined when expired or creation fails + + /* + * Tokens are undefined if the session expires, or if creation fails for + * any reason e.g. tokens are invalid, network error, etc. + */ + refreshJwt: session?.refreshJwt, + accessJwt: session?.accessJwt, } - logger.debug( - `session: BskyAgent.persistSession`, - { - expired, - did: refreshedAccount.did, - handle: refreshedAccount.handle, - }, - logger.DebugContext.session, - ) + logger.info(`session: persistSession`, { + event, + did: refreshedAccount.did, + handle: refreshedAccount.handle, + }) if (expired) { emitSessionDropped() } + /* + * If the session expired, or it was successfully created/updated, we want + * to update/persist the data. + * + * If the session creation failed, it could be a network error, or it could + * be more serious like an invalid token(s). We can't differentiate, so in + * order to allow the user to get a fresh token (if they need it), we need + * to persist this data and wipe their tokens, effectively logging them + * out. + */ persistSessionCallback({ expired, refreshedAccount, @@ -140,7 +150,6 @@ export function Provider({children}: React.PropsWithChildren<{}>) { const queryClient = useQueryClient() const isDirty = React.useRef(false) const [state, setState] = React.useState<SessionState>({ - isInitialLoad: true, // try to resume the session first isSwitchingAccounts: false, accounts: persisted.get('session').accounts, currentAccount: undefined, // assume logged out to start @@ -338,7 +347,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) { } } } catch (e) { - console.error('Could not decode jwt.') + logger.error(`session: could not decode jwt`) } const prevSession = { @@ -355,23 +364,53 @@ export function Provider({children}: React.PropsWithChildren<{}>) { upsertAccount(account) // Intentionally not awaited to unblock the UI: - resumeSessionWithFreshAccount().then(freshAccount => { - if (JSON.stringify(account) !== JSON.stringify(freshAccount)) { - upsertAccount(freshAccount) - } - }) + resumeSessionWithFreshAccount() + .then(freshAccount => { + if (JSON.stringify(account) !== JSON.stringify(freshAccount)) { + upsertAccount(freshAccount) + } + }) + .catch(e => { + /* + * Note: `agent.persistSession` is also called when this fails, and + * we handle that failure via `createPersistSessionHandler` + */ + logger.info(`session: resumeSessionWithFreshAccount failed`, { + error: e, + }) + + __globalAgent = PUBLIC_BSKY_AGENT + }) } else { - const freshAccount = await resumeSessionWithFreshAccount() - __globalAgent = agent - queryClient.clear() - upsertAccount(freshAccount) + try { + const freshAccount = await resumeSessionWithFreshAccount() + __globalAgent = agent + queryClient.clear() + upsertAccount(freshAccount) + } catch (e) { + /* + * Note: `agent.persistSession` is also called when this fails, and + * we handle that failure via `createPersistSessionHandler` + */ + logger.info(`session: resumeSessionWithFreshAccount failed`, { + error: e, + }) + + __globalAgent = PUBLIC_BSKY_AGENT + } } async function resumeSessionWithFreshAccount(): Promise<SessionAccount> { - await networkRetry(3, () => agent.resumeSession(prevSession)) + await networkRetry(1, () => agent.resumeSession(prevSession)) + + /* + * If `agent.resumeSession` fails above, it'll throw. This is just to + * make TypeScript happy. + */ if (!agent.session) { throw new Error(`session: initSession failed to establish a session`) } + // ensure changes in handle/email etc are captured on reload return { service: agent.service.toString(), @@ -395,11 +434,6 @@ export function Provider({children}: React.PropsWithChildren<{}>) { } } catch (e) { logger.error(`session: resumeSession failed`, {error: e}) - } finally { - setState(s => ({ - ...s, - isInitialLoad: false, - })) } }, [initSession], |