From c24a0c87dcea1443284bd0c261175214b6b2323a Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Wed, 29 Nov 2023 14:03:10 -0800
Subject: [PATCH] Updated login check.

---
 src/app/(main)/App.tsx                  | 13 ++++++++++--
 src/components/hooks/index.js           |  2 +-
 src/components/hooks/useLogin.ts        | 22 +++++++++++++++++++
 src/components/hooks/useRequireLogin.ts | 28 -------------------------
 src/index.ts                            |  2 +-
 src/lib/middleware.ts                   |  2 +-
 6 files changed, 36 insertions(+), 33 deletions(-)
 create mode 100644 src/components/hooks/useLogin.ts
 delete mode 100644 src/components/hooks/useRequireLogin.ts

diff --git a/src/app/(main)/App.tsx b/src/app/(main)/App.tsx
index 01da9a6a..4b093165 100644
--- a/src/app/(main)/App.tsx
+++ b/src/app/(main)/App.tsx
@@ -1,14 +1,23 @@
 'use client';
+import { Loading } from 'react-basics';
 import Script from 'next/script';
 import { usePathname } from 'next/navigation';
+import { useLogin, useConfig } from 'components/hooks';
 import UpdateNotice from './UpdateNotice';
-import { useRequireLogin, useConfig } from 'components/hooks';
 
 export function App({ children }) {
-  const { user } = useRequireLogin();
+  const { user, isLoading, error } = useLogin();
   const config = useConfig();
   const pathname = usePathname();
 
+  if (isLoading) {
+    return <Loading />;
+  }
+
+  if (error) {
+    window.location.href = `${process.env.basePath || ''}/login`;
+  }
+
   if (!user || !config) {
     return null;
   }
diff --git a/src/components/hooks/index.js b/src/components/hooks/index.js
index 697d54c3..b851eeb7 100644
--- a/src/components/hooks/index.js
+++ b/src/components/hooks/index.js
@@ -13,7 +13,7 @@ export * from './useMessages';
 export * from './useNavigation';
 export * from './useReport';
 export * from './useReports';
-export * from './useRequireLogin';
+export * from './useLogin';
 export * from './useShareToken';
 export * from './useSticky';
 export * from './useTheme';
diff --git a/src/components/hooks/useLogin.ts b/src/components/hooks/useLogin.ts
new file mode 100644
index 00000000..a4ac9d3b
--- /dev/null
+++ b/src/components/hooks/useLogin.ts
@@ -0,0 +1,22 @@
+import useApi from 'components/hooks/useApi';
+import useUser from 'components/hooks/useUser';
+
+export function useLogin() {
+  const { get, useQuery } = useApi();
+  const { user, setUser } = useUser();
+
+  const query = useQuery({
+    queryKey: ['login'],
+    queryFn: async () => {
+      const data = await get('/auth/verify');
+
+      setUser(data);
+
+      return data;
+    },
+  });
+
+  return { user, ...query };
+}
+
+export default useLogin;
diff --git a/src/components/hooks/useRequireLogin.ts b/src/components/hooks/useRequireLogin.ts
deleted file mode 100644
index 68de411b..00000000
--- a/src/components/hooks/useRequireLogin.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useEffect } from 'react';
-import useApi from 'components/hooks/useApi';
-import useUser from 'components/hooks/useUser';
-
-export function useRequireLogin() {
-  const { get } = useApi();
-  const { user, setUser } = useUser();
-
-  useEffect(() => {
-    async function loadUser() {
-      try {
-        const data = await get('/auth/verify');
-
-        setUser(data);
-      } catch {
-        window.location.href = `${process.env.basePath || ''}/login`;
-      }
-    }
-
-    if (!user) {
-      loadUser();
-    }
-  }, [user]);
-
-  return { user };
-}
-
-export default useRequireLogin;
diff --git a/src/index.ts b/src/index.ts
index 01ceb7d1..de555051 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -10,7 +10,7 @@ export * from 'components/hooks/useFormat';
 export * from 'components/hooks/useLocale';
 export * from 'components/hooks/useMessages';
 export * from 'components/hooks/useNavigation';
-export * from 'components/hooks/useRequireLogin';
+export * from 'components/hooks/useLogin';
 export * from 'components/hooks/useShareToken';
 export * from 'components/hooks/useSticky';
 export * from 'components/hooks/useTheme';
diff --git a/src/lib/middleware.ts b/src/lib/middleware.ts
index a6da65c0..865a6f3d 100644
--- a/src/lib/middleware.ts
+++ b/src/lib/middleware.ts
@@ -57,7 +57,7 @@ export const useAuth = createMiddleware(async (req, res, next) => {
   } else if (redis.enabled && authKey) {
     const key = await redis.client.get(authKey);
 
-    user = await getUserById(key.userId);
+    user = await getUserById(key?.userId);
   }
 
   if (process.env.NODE_ENV === 'development') {