u

code/allapp/allapp-rn/src/store/navigation.ts

@@ -36,7 +36,7 @@ export const useNavStore = create<NavState>()(
       navigateToAuth: () => {
         const pathname = useNavStore.getState().pathname
 
-        if (!pathname.startsWith('/auth')) {
+        if (pathname !== '/auth') {
           router.replace('/auth')
         }
       },
@@ -44,7 +44,7 @@ export const useNavStore = create<NavState>()(
     }),
     {
       name: 'nav-storage',
-      // storage: createJSONStorage(() => AsyncStorage),
+      storage: createJSONStorage(() => AsyncStorage),
     },
   ),
 )

code/allapp/allapp-rn/src/store/user.ts

@@ -4,8 +4,8 @@ import { create } from 'zustand'
 import { createJSONStorage, persist } from 'zustand/middleware'
 
 interface UserState {
-  userInfo: UserInfo | null
-  setUserInfo: (userInfo: UserInfo | null) => void
+  userInfo: UserInfo
+  setUserInfo: (userInfo: UserInfo) => void
   clear: () => void
   isLoggedIn: () => boolean
 
@@ -13,17 +13,24 @@ interface UserState {
   setUserSpace: (userSpace: UserSpace | null) => void
 }
 
+const defaultUserInfo: UserInfo = {
+  id: 0,
+  token: '',
+  nickname: '',
+  avatar: '',
+}
+
 const useUserStore = create<UserState>()(
   persist(
     (set, get) => ({
-      userInfo: null,
+      userInfo: defaultUserInfo,
       userSpace: null,
 
       setUserInfo: userInfo => set({ userInfo }),
       setUserSpace: userSpace => set({ userSpace }),
 
       clear: () => {
-        set({ userInfo: null, userSpace: null })
+        set({ userInfo: defaultUserInfo, userSpace: null })
       },
 
       isLoggedIn: () => Boolean(get().userInfo?.token),