Merge pull request #76 from blacksky-algorithms/fix/oauth-session-restore

Fix OAuth session restore hangs and false Logged out status

Author: rudyfraser

src/components/AccountList.tsx

@@ -122,7 +122,9 @@ function AccountItem({
     onSelect(account)
   }, [account, onSelect])
 
-  const isLoggedOut = !account.refreshJwt || isJwtExpired(account.refreshJwt)
+  const isLoggedOut = account.isOauthSession
+    ? false // OAuth sessions are managed by the OAuth client, not refreshJwt
+    : !account.refreshJwt || isJwtExpired(account.refreshJwt)
 
   return (
     <Button

src/screens/Login/ChooseAccountForm.tsx

@@ -46,7 +46,15 @@ export const ChooseAccountForm = ({
       }
       try {
         setPendingDid(account.did)
-        await resumeSession(account, true)
+        await Promise.race([
+          resumeSession(account, true),
+          new Promise<never>((_, reject) =>
+            setTimeout(
+              () => reject(new Error('Session resume timed out')),
+              15_000,
+            ),
+          ),
+        ])
         ax.metric('account:loggedIn', {
           logContext: 'ChooseAccountForm',
           withPassword: false,
@@ -56,6 +64,7 @@ export const ChooseAccountForm = ({
         logger.error('choose account: initSession failed', {
           message: e.message,
         })
+        Toast.show(_(msg`Sign in failed. Please try again.`))
         // Move to login form.
         onSelectAccount(account)
       } finally {

src/state/session/oauth-agent.ts

@@ -20,9 +20,28 @@ export async function oauthCreateAgent(session: OAuthSession) {
   return agent.prepare(account, gates, moderation)
 }
 
+const OAUTH_RESTORE_TIMEOUT_MS = 10_000
+
 export async function oauthResumeSession(account: SessionAccount) {
   const client = getWebOAuthClient()
-  const session = await client.restore(account.did)
+  let session: OAuthSession
+  try {
+    session = await Promise.race([
+      client.restore(account.did),
+      new Promise<never>((_, reject) =>
+        setTimeout(
+          () => reject(new Error('OAuth session restore timed out')),
+          OAUTH_RESTORE_TIMEOUT_MS,
+        ),
+      ),
+    ])
+  } catch (e) {
+    logger.error('oauthResumeSession: restore failed', {
+      did: account.did,
+      error: e instanceof Error ? e.message : String(e),
+    })
+    throw e
+  }
   return await oauthCreateAgent(session)
 }
 
@@ -43,13 +62,36 @@ export async function oauthAgentAndSessionToSessionAccount(
 ): Promise<SessionAccount | undefined> {
   let data: OutputSchema
   try {
-    const res = await agent.com.atproto.server.getSession()
+    const res = await Promise.race([
+      agent.com.atproto.server.getSession(),
+      new Promise<never>((_, reject) =>
+        setTimeout(
+          () => reject(new Error('getSession timed out')),
+          OAUTH_RESTORE_TIMEOUT_MS,
+        ),
+      ),
+    ])
     data = res.data
   } catch (e: any) {
-    logger.error(e)
+    logger.error('oauthAgentAndSessionToSessionAccount: getSession failed', e)
+    return undefined
+  }
+  let aud: string
+  try {
+    const tokenInfo = await Promise.race([
+      session.getTokenInfo(false),
+      new Promise<never>((_, reject) =>
+        setTimeout(
+          () => reject(new Error('getTokenInfo timed out')),
+          OAUTH_RESTORE_TIMEOUT_MS,
+        ),
+      ),
+    ])
+    aud = tokenInfo.aud
+  } catch (e: any) {
+    logger.error('oauthAgentAndSessionToSessionAccount: getTokenInfo failed', e)
     return undefined
   }
-  const {aud} = await session.getTokenInfo(false)
   return {
     service: session.serverMetadata.issuer,
     did: session.did,
@@ -69,12 +111,8 @@ export class OauthBskyAppAgent extends Agent {
   session?: AtpSessionData
   dispatchUrl?: string
 
-  #oauthSession: OAuthSession
-  #account?: SessionAccount
-
   constructor(session: OAuthSession) {
     super(session)
-    this.#oauthSession = session
   }
 
   async prepare(