From 68bc18f5845c8b9add060261e02d9af10476a255 Mon Sep 17 00:00:00 2001
From: "web@ppanel" <web@ppanel.dev>
Date: Mon, 30 Dec 2024 22:41:12 +0700
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(auth):=20Refactor?=
 =?UTF-8?q?=20user=20authorization=20handling=20and=20improve=20error=20lo?=
 =?UTF-8?q?gging?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/admin/app/layout.tsx               | 18 +++++++++++-------
 apps/admin/components/providers.tsx     |  1 +
 apps/admin/services/admin/typings.d.ts  |  5 -----
 apps/admin/services/common/typings.d.ts |  5 -----
 apps/user/app/layout.tsx                | 24 ++++++++++++++++--------
 apps/user/components/providers.tsx      |  1 +
 apps/user/services/common/typings.d.ts  |  5 -----
 apps/user/services/user/typings.d.ts    |  5 -----
 8 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/apps/admin/app/layout.tsx b/apps/admin/app/layout.tsx
index dd3fefe..a4d465a 100644
--- a/apps/admin/app/layout.tsx
+++ b/apps/admin/app/layout.tsx
@@ -75,6 +75,8 @@ export default async function RootLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
+  const Authorization = (await cookies()).get('Authorization')?.value;
+
   const locale = await getLocale();
   const messages = await getMessages();
 
@@ -86,13 +88,15 @@ export default async function RootLayout({
     console.log('Error fetching global config:', error);
   }
 
-  try {
-    user = await currentUser({
-      skipErrorHandler: true,
-      Authorization: (await cookies()).get('Authorization')?.value,
-    }).then((res) => res.data.data);
-  } catch (error) {
-    console.log('Error fetching current user:', error);
+  if (Authorization) {
+    try {
+      user = await currentUser({
+        skipErrorHandler: true,
+        Authorization,
+      }).then((res) => res.data.data);
+    } catch (error) {
+      console.log('Error fetching current user:', error);
+    }
   }
 
   return (
diff --git a/apps/admin/components/providers.tsx b/apps/admin/components/providers.tsx
index 711e9d6..57f1f67 100644
--- a/apps/admin/components/providers.tsx
+++ b/apps/admin/components/providers.tsx
@@ -22,6 +22,7 @@ export default function Providers({
         defaultOptions: {
           queries: {
             staleTime: 5 * 1000,
+            retry: false,
           },
         },
       }),
diff --git a/apps/admin/services/admin/typings.d.ts b/apps/admin/services/admin/typings.d.ts
index 65a3870..531c246 100644
--- a/apps/admin/services/admin/typings.d.ts
+++ b/apps/admin/services/admin/typings.d.ts
@@ -613,11 +613,6 @@ declare namespace API {
     ip_register_limit_duration: number;
   };
 
-  type RelayConfig = {
-    dispatch_mode: string;
-    relay_nodes: NodeRelay[];
-  };
-
   type Response = {
     /** 状态码 */
     code?: number;
diff --git a/apps/admin/services/common/typings.d.ts b/apps/admin/services/common/typings.d.ts
index 4c49d7d..1a84d0f 100644
--- a/apps/admin/services/common/typings.d.ts
+++ b/apps/admin/services/common/typings.d.ts
@@ -222,11 +222,6 @@ declare namespace API {
     ip_register_limit_duration: number;
   };
 
-  type RelayConfig = {
-    dispatch_mode: string;
-    relay_nodes: NodeRelay[];
-  };
-
   type ResetPasswordRequest = {
     email: string;
     password: string;
diff --git a/apps/user/app/layout.tsx b/apps/user/app/layout.tsx
index 4835ee2..f3a2d00 100644
--- a/apps/user/app/layout.tsx
+++ b/apps/user/app/layout.tsx
@@ -69,7 +69,13 @@ export const viewport: Viewport = {
   ],
 };
 
-export default async function RootLayout({ children }: { children: React.ReactNode }) {
+export default async function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  const Authorization = (await cookies()).get('Authorization')?.value;
+
   const locale = await getLocale();
   const messages = await getMessages();
 
@@ -81,13 +87,15 @@ export default async function RootLayout({ children }: { children: React.ReactNo
     console.log('Error fetching global config:', error);
   }
 
-  try {
-    user = await queryUserInfo({
-      skipErrorHandler: true,
-      Authorization: (await cookies()).get('Authorization')?.value,
-    }).then((res) => res.data.data);
-  } catch (error) {
-    console.log('Error fetching user info:', error);
+  if (Authorization) {
+    try {
+      user = await queryUserInfo({
+        skipErrorHandler: true,
+        Authorization,
+      }).then((res) => res.data.data);
+    } catch (error) {
+      console.log('Error fetching user info:', error);
+    }
   }
 
   return (
diff --git a/apps/user/components/providers.tsx b/apps/user/components/providers.tsx
index 711e9d6..57f1f67 100644
--- a/apps/user/components/providers.tsx
+++ b/apps/user/components/providers.tsx
@@ -22,6 +22,7 @@ export default function Providers({
         defaultOptions: {
           queries: {
             staleTime: 5 * 1000,
+            retry: false,
           },
         },
       }),
diff --git a/apps/user/services/common/typings.d.ts b/apps/user/services/common/typings.d.ts
index 4c49d7d..1a84d0f 100644
--- a/apps/user/services/common/typings.d.ts
+++ b/apps/user/services/common/typings.d.ts
@@ -222,11 +222,6 @@ declare namespace API {
     ip_register_limit_duration: number;
   };
 
-  type RelayConfig = {
-    dispatch_mode: string;
-    relay_nodes: NodeRelay[];
-  };
-
   type ResetPasswordRequest = {
     email: string;
     password: string;
diff --git a/apps/user/services/user/typings.d.ts b/apps/user/services/user/typings.d.ts
index 9ad5dd9..2defe38 100644
--- a/apps/user/services/user/typings.d.ts
+++ b/apps/user/services/user/typings.d.ts
@@ -358,11 +358,6 @@ declare namespace API {
     ip_register_limit_duration: number;
   };
 
-  type RelayConfig = {
-    dispatch_mode: string;
-    relay_nodes: NodeRelay[];
-  };
-
   type RenewalOrderRequest = {
     subscribe_id: number;
     quantity: number;