fix: attempt to fix losing auth state

Author: guansss

src/App.tsx

@@ -1,18 +1,10 @@
-import { getDefaultStore } from 'jotai/vanilla'
 import { BrowserRouter } from 'react-router-dom'
 import { SWRConfig } from 'swr'
 
-import { authAtom } from 'store/auth'
-import { TokenManager } from 'utils/token-manager'
-
 import { GlobalErrorBoundary } from './components/GlobalErrorBoundary'
 import { I18NProvider } from './i18n/I18NProvider'
 import { FCC } from './types'
 
-// jotai 在没有 Provider 时会使用默认的 store
-TokenManager.setAuthGetter(() => getDefaultStore().get(authAtom))
-TokenManager.setAuthSetter((v) => getDefaultStore().set(authAtom, v))
-
 export const App: FCC = ({ children }) => {
   return (
     <SWRConfig

src/utils/token-manager.ts

@@ -1,35 +1,29 @@
 import { refreshAccessToken } from 'apis/auth'
+import { getDefaultStore } from 'jotai'
 import { noop } from 'lodash-es'
 
-import { AuthState, fromCredentials } from 'store/auth'
+import { authAtom, fromCredentials } from 'store/auth'
 import {
   InvalidTokenError,
   NetworkError,
   TokenExpiredError,
   UnauthorizedError,
 } from 'utils/error'
 
-export namespace TokenManager {
-  let getAuth: () => AuthState = () => ({})
-  let setAuth: (set: AuthState | ((auth: AuthState) => AuthState)) => void =
-    noop
+let store = getDefaultStore()
+let pendingGetToken: Promise<string> | undefined
 
-  export function setAuthGetter(get: typeof getAuth) {
-    getAuth = get
-  }
-  export function setAuthSetter(set: typeof setAuth) {
-    setAuth = set
-  }
-
-  let pendingGetToken: Promise<string> | undefined
-
-  export async function updateAndGetToken() {
+export const TokenManager = {
+  setStore(newStore: typeof store) {
+    store = newStore
+  },
+  updateAndGetToken() {
     if (pendingGetToken) {
       return pendingGetToken
     }
 
     const { token, validBefore, refreshToken, refreshTokenValidBefore } =
-      getAuth()
+      store.get(authAtom)
 
     const endTime = +new Date(validBefore || 0) || 0
     const refreshEndTime = +new Date(refreshTokenValidBefore || 0) || 0
@@ -46,15 +40,15 @@ export namespace TokenManager {
       }
 
       if (!refreshToken) {
-        setAuth({})
+        store.set(authAtom, {})
         throw new InvalidTokenError()
       }
 
       if (refreshEndTime > now) {
         try {
           const res = await refreshAccessToken({ refreshToken })
 
-          setAuth(fromCredentials(res))
+          store.set(authAtom, fromCredentials(res))
 
           return res.token
         } catch (e) {
@@ -64,7 +58,7 @@ export namespace TokenManager {
           throw new TokenExpiredError()
         }
       } else {
-        setAuth({})
+        store.set(authAtom, {})
         throw new InvalidTokenError()
       }
     })()
@@ -78,5 +72,5 @@ export namespace TokenManager {
       .catch(noop)
 
     return pendingGetToken
-  }
+  },
 }