ColdBreeze/ColdBreeze-chat-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: ignore initialized API error

Browse Source
This commit is contained in:
Tristan Yang
2023-07-19 20:33:33 +08:00
parent 201bd349f2
commit 42bfdfd71b
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/services/auth.ts
+3 -2
View File
@@ -190,13 +190,14 @@ export const authApi = createApi({
} }
}), }),
getInitialized: builder.query<boolean, void>({ getInitialized: builder.query<boolean, void>({
query: () => ({ url: "/admin/system/initialized" }), query: () => ({ url: "/admin/system/initialized", timeout: 5000 }),
async onQueryStarted(params, { dispatch, queryFulfilled }) { async onQueryStarted(params, { dispatch, queryFulfilled }) {
try { try {
const { data: isInitialized } = await queryFulfilled; const { data: isInitialized } = await queryFulfilled;
dispatch(updateInitialized(isInitialized)); dispatch(updateInitialized(isInitialized));
} catch { } catch {
console.log("api initialized error"); console.error("api initialized error");
dispatch(updateInitialized(true));
} }
} }
}), }),
src/components/RequireAuth.tsx
+3 -3
View File
@@ -19,12 +19,12 @@ const RequireAuth: FC<Props> = ({ children, redirectTo = "/login" }) => {
const matches = matchRoutes(GuestAllows, location); const matches = matchRoutes(GuestAllows, location);
const allowGuest = matches ? !!matches[0].pathname : false; const allowGuest = matches ? !!matches[0].pathname : false;
const { data: loginConfig, isSuccess: loginConfigSuccess } = useGetLoginConfigQuery(); const { data: loginConfig, isSuccess: loginConfigSuccess } = useGetLoginConfigQuery();
const { isSuccess: checkInitialSuccess } = useGetInitializedQuery(); const { isLoading: checkingInitialized } = useGetInitializedQuery();
const { token, guest, initialized } = useAppSelector((store) => store.authData); 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配置检查 // 初始化和login配置检查
if (!checkInitialSuccess || !loginConfigSuccess) return <Loading fullscreen={true} />; if (checkingInitialized || !loginConfigSuccess) return <Loading fullscreen={true} />;
// 未初始化 则先走setup 流程 // 未初始化 则先走setup 流程
if (!initialized) return <Navigate to={`/onboarding`} replace />; if (!initialized) return <Navigate to={`/onboarding`} replace />;
// 开启guest 并且没token 而且是允许guest访问的路由 则先去过渡页登录 // 开启guest 并且没token 而且是允许guest访问的路由 则先去过渡页登录