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

* 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>

src/lib/hooks/useAccountSwitcher.ts

@@ -15,7 +15,7 @@ export function useAccountSwitcher() {
   const [pendingDid, setPendingDid] = useState<string | null>(null)
   const {_} = useLingui()
   const {track} = useAnalytics()
-  const {initSession, clearCurrentAccount} = useSessionApi()
+  const {initSession} = useSessionApi()
   const {requestSwitchToAccount} = useLoggedOutViewControls()
 
   const onPressSwitchAccount = useCallback(
@@ -53,19 +53,11 @@ export function useAccountSwitcher() {
         logger.error(`switch account: selectAccount failed`, {
           message: e.message,
         })
-        clearCurrentAccount() // back user out to login
       } finally {
         setPendingDid(null)
       }
     },
-    [
-      _,
-      track,
-      clearCurrentAccount,
-      initSession,
-      requestSwitchToAccount,
-      pendingDid,
-    ],
+    [_, track, initSession, requestSwitchToAccount, pendingDid],
   )
 
   return {onPressSwitchAccount, pendingDid}

src/screens/Login/ChooseAccountForm.tsx

@@ -39,11 +39,16 @@ export const ChooseAccountForm = ({
         // The session API isn't resilient to race conditions so let's just ignore this.
         return
       }
-      if (account.accessJwt) {
+      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}`))
-        } else {
+        return
+      }
       try {
         setPendingDid(account.did)
         await initSession(account)
@@ -57,14 +62,11 @@ export const ChooseAccountForm = ({
         logger.error('choose account: initSession failed', {
           message: e.message,
         })
+        // Move to login form.
         onSelectAccount(account)
       } finally {
         setPendingDid(null)
       }
-        }
-      } else {
-        onSelectAccount(account)
-      }
     },
     [
       currentAccount,

src/state/session/index.tsx

@@ -337,7 +337,6 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       if (isSessionExpired(account)) {
         logger.debug(`session: attempting to resume using previous session`)
 
-        try {
         const freshAccount = await resumeSessionWithFreshAccount()
         __globalAgent = agent
         await fetchingGates
@@ -354,18 +353,6 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
             needsPersist: true,
           }
         })
-        } catch (e) {
-          /*
-           * Note: `agent.persistSession` is also called when this fails, and
-           * we handle that failure via `createPersistSessionHandler`
-           */
-          logger.info(`session: resumeSessionWithFreshAccount failed`, {
-            message: e,
-          })
-
-          __globalAgent = PUBLIC_BSKY_AGENT
-          // TODO: This needs a setState.
-        }
       } else {
         logger.debug(`session: attempting to reuse previous session`)
 
@@ -480,6 +467,11 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       const persistedSession = persisted.get('session')
 
       logger.debug(`session: persisted onUpdate`, {})
+      setState(s => ({
+        accounts: persistedSession.accounts,
+        currentAgentState: s.currentAgentState,
+        needsPersist: false, // Synced from another tab. Don't persist to avoid cycles.
+      }))
 
       const selectedAccount = persistedSession.accounts.find(
         a => a.did === persistedSession.currentAccount?.did,
@@ -531,15 +523,9 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
             did: undefined,
             agent: PUBLIC_BSKY_AGENT,
           },
-          needsPersist: true, // TODO: This seems bad in this codepath. Existing behavior.
-        }))
-      }
-
-      setState(s => ({
-        accounts: persistedSession.accounts,
-        currentAgentState: s.currentAgentState,
           needsPersist: false, // Synced from another tab. Don't persist to avoid cycles.
         }))
+      }
     })
   }, [state, setState, initSession])