Track rotated auth tokens

2 files changed, 16 insertions, 1 deletions

diff --git a/src/state/index.ts b/src/state/index.ts
index fd81bc842..7bb757757 100644
--- a/src/state/index.ts
+++ b/src/state/index.ts
@@ -34,6 +34,8 @@ export async function setupState() {
     if (!api.sessionManager.session && rootStore.session.isAuthed) {
       // reset session
       rootStore.session.clear()
+    } else if (api.sessionManager.session) {
+      rootStore.session.updateAuthTokens(api.sessionManager.session)
     }
   })
 
diff --git a/src/state/models/session.ts b/src/state/models/session.ts
index e10a08e86..0f1faeaba 100644
--- a/src/state/models/session.ts
+++ b/src/state/models/session.ts
@@ -1,6 +1,9 @@
 import {makeAutoObservable} from 'mobx'
 import {sessionClient as AtpApi} from '../../third-party/api/index'
-import type {SessionServiceClient} from '../../third-party/api/src/index'
+import type {
+  SessionServiceClient,
+  Session,
+} from '../../third-party/api/src/index'
 import type * as GetAccountsConfig from '../../third-party/api/src/client/types/com/atproto/server/getAccountsConfig'
 import {isObj, hasProp} from '../lib/type-guards'
 import {RootStoreModel} from './root-store'
@@ -88,6 +91,16 @@ export class SessionModel {
     this.data = data
   }
 
+  updateAuthTokens(session: Session) {
+    if (this.data) {
+      this.setState({
+        ...this.data,
+        accessJwt: session.accessJwt,
+        refreshJwt: session.refreshJwt,
+      })
+    }
+  }
+
   private configureApi(): boolean {
     if (!this.data) {
       return false