From 42bfdfd71bec590bf21b121ee12b53e02f41fc27 Mon Sep 17 00:00:00 2001
From: Tristan Yang <yanggc888@163.com>
Date: Wed, 19 Jul 2023 20:33:33 +0800
Subject: [PATCH] chore: ignore initialized API error

---
 src/app/services/auth.ts       | 5 +++--
 src/components/RequireAuth.tsx | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/services/auth.ts b/src/app/services/auth.ts
index 2b2b2138..279f3d14 100644
--- a/src/app/services/auth.ts
+++ b/src/app/services/auth.ts
@@ -190,13 +190,14 @@ export const authApi = createApi({
       }
     }),
     getInitialized: builder.query<boolean, void>({
-      query: () => ({ url: "/admin/system/initialized" }),
+      query: () => ({ url: "/admin/system/initialized", timeout: 5000 }),
       async onQueryStarted(params, { dispatch, queryFulfilled }) {
         try {
           const { data: isInitialized } = await queryFulfilled;
           dispatch(updateInitialized(isInitialized));
         } catch {
-          console.log("api initialized error");
+          console.error("api initialized error");
+          dispatch(updateInitialized(true));
         }
       }
     }),
diff --git a/src/components/RequireAuth.tsx b/src/components/RequireAuth.tsx
index f783223e..952cc282 100644
--- a/src/components/RequireAuth.tsx
+++ b/src/components/RequireAuth.tsx
@@ -19,12 +19,12 @@ const RequireAuth: FC<Props> = ({ children, redirectTo = "/login" }) => {
   const matches = matchRoutes(GuestAllows, location);
   const allowGuest = matches ? !!matches[0].pathname : false;
   const { data: loginConfig, isSuccess: loginConfigSuccess } = useGetLoginConfigQuery();
-  const { isSuccess: checkInitialSuccess } = useGetInitializedQuery();
+  const { isLoading: checkingInitialized } = useGetInitializedQuery();
   const { token, guest, initialized } = useAppSelector((store) => store.authData);
-  // console.log("auth route", { checkInitialSuccess, loginConfigSuccess, initialized, guest: loginConfig?.guest, token, allowGuest, guest });
+  // console.log("auth route", { checkingInitialized, loginConfigSuccess, initialized, guest: loginConfig?.guest, token, allowGuest, guest });
 
   // 初始化和login配置检查
-  if (!checkInitialSuccess || !loginConfigSuccess) return <Loading fullscreen={true} />;
+  if (checkingInitialized || !loginConfigSuccess) return <Loading fullscreen={true} />;
   //  未初始化 则先走setup 流程
   if (!initialized) return <Navigate to={`/onboarding`} replace />;
   // 开启guest 并且没token 而且是允许guest访问的路由  则先去过渡页登录