hotfix/fix: fix login logic

taco-official · Oct 15, 2024 · 2469ff0 · 2469ff0
1 parent 61e5f91
commit 2469ff0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/hooks/useUserData.js b/src/hooks/useUserData.js
@@ -6,6 +6,7 @@ import useKyQuery from './useKyQuery'
 const useUserData = () => {
   const {
     isLoading,
+    isFetched,
     data: userData,
     isError,
   } = useKyQuery('me', undefined, {
@@ -16,13 +17,14 @@ const useUserData = () => {
   const loginStore = useLoginStore()
 
   useEffect(() => {
-    if (isLoading) return
-    if (userData)
-      if (!loginStore.isLogin) loginStore.setLogin(userData)
-      else if (!isEqual(loginStore.loginData, userData))
+    if (userData) {
+      if (isFetched && !loginStore.isLogin) loginStore.setLogin(userData)
+      else if (loginStore.isLogin && !isEqual(userData, loginStore.loginData))
         loginStore.setLoginData(userData)
-    if (isError && loginStore.isLogin) loginStore.setLogout()
-  }, [isLoading, userData, isError])
+    } else if (isError && loginStore.isLogin) loginStore.setLogout()
+  }, [userData, isFetched, isError])
+
+  return isLoading
 }
 
 export default useUserData
diff --git a/src/pages/Layout.jsx b/src/pages/Layout.jsx
@@ -6,16 +6,17 @@ import GlobalStyle from '@styles/GlobalStyle'
 import useUserData from '@hooks/useUserData'
 import NavBar from '@components/Navbar/NavBar'
 import Footer from '@components/Footer/Footer'
+import LoadingPage from './LoadingPage'
 
 export default function Layout() {
-  useUserData()
+  const isLoading = useUserData()
 
   return (
     <>
       <GlobalStyle />
       <NavBar />
       <StyledMain>
-        <RouterProvider router={router} />
+        {isLoading ? <LoadingPage /> : <RouterProvider router={router} />}
       </StyledMain>
       <Footer />
     </>