feat: set initial state of auth to null (#108)

infiniflow · Mar 7, 2024 · b69b5dd · b69b5dd
1 parent cfc3b62
commit b69b5dd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/web/.umirc.ts b/web/.umirc.ts
@@ -21,6 +21,7 @@ export default defineConfig({
       hack: `true; @import "~@/less/index.less";`,
     },
   },
+  devtool: 'source-map',
   proxy: {
     '/v1': {
       target: 'http://123.60.95.134:9380/',

diff --git a/web/src/hooks/authHook.ts b/web/src/hooks/authHook.ts
@@ -1,6 +1,7 @@
 import authorizationUtil from '@/utils/authorizationUtil';
 import { message } from 'antd';
 import { useEffect, useMemo, useState } from 'react';
+import { Nullable } from 'typings';
 import { useNavigate, useSearchParams } from 'umi';
 
 export const useLoginWithGithub = () => {
@@ -32,10 +33,10 @@ export const useLoginWithGithub = () => {
 
 export const useAuth = () => {
   const auth = useLoginWithGithub();
-  const [isLogin, setIsLogin] = useState(true);
+  const [isLogin, setIsLogin] = useState<Nullable<boolean>>(null);
 
   useEffect(() => {
-    setIsLogin(!!auth || !!authorizationUtil.getAuthorization());
+    setIsLogin(!!authorizationUtil.getAuthorization() || !!auth);
   }, [auth]);
 
   return { isLogin };

diff --git a/web/src/wrappers/auth.tsx b/web/src/wrappers/auth.tsx
@@ -3,9 +3,11 @@ import { Navigate, Outlet } from 'umi';
 
 export default () => {
   const { isLogin } = useAuth();
-  if (isLogin) {
+  if (isLogin === true) {
     return <Outlet />;
-  } else {
+  } else if (isLogin === false) {
     return <Navigate to="/login" />;
   }
+
+  return <></>;
 };