fix: login validation

Signed-off-by: Innei <tukon479@gmail.com>
mx-space · Mar 26, 2023 · 8426eba · 8426eba
1 parent 2c35916
commit 8426eba
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/atoms/app.ts b/src/atoms/app.ts
@@ -4,7 +4,7 @@ import { apiClient } from '~/utils/client'
 
 import { useUserStore } from './user'
 
-import './dev'
+// import './dev'
 
 export interface ViewportRecord {
   w: number

diff --git a/src/atoms/user.ts b/src/atoms/user.ts
@@ -31,9 +31,11 @@ export const useUserStore = create<UserState & UserAction>(
           setState({ token: null })
           return
         }
-        setState({ token })
+        setState({ token, isLogged: true })
 
-        useAppStore.getState().fetchUrl()
+        requestAnimationFrame(() => {
+          useAppStore.getState().fetchUrl()
+        })
       },
       setUser(model) {
         setState({ master: model })

diff --git a/src/hooks/use-check-logged.ts b/src/hooks/use-check-logged.ts
@@ -10,7 +10,6 @@ import { useThemeConfig } from './use-initial-data'
 export const useCheckLogged = () => {
   const userStore = useUserStore.getState()
 
-  const master = userStore.master
   const {
     function: {
       banDevtool: { enable: banDevtoolEnable },
@@ -30,7 +29,10 @@ export const useCheckLogged = () => {
                   .put<{ token: string }>()
                   .then((res) => {
                     userStore.setToken(res.token)
-                    message.success(`欢迎回来，${master!.name}`, 1500)
+                    message.success(
+                      `欢迎回来，${useUserStore.getState().master!.name}`,
+                      1500,
+                    )
                     setToken(res.token)
                   })
               } else {

diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
@@ -28,6 +28,7 @@ const LoginView: NextPage = () => {
       Router.push('/')
     }
     message.success('登录成功')
+
     useUserStore.getState().setToken(data.token)
     releaseDevtool()
   }