From 8290aecdc74fe9b8bdab687e48abbea2a9f42a60 Mon Sep 17 00:00:00 2001
From: hailin <hailin@gdzx.xyz>
Date: Thu, 22 May 2025 21:08:15 +0800
Subject: [PATCH] .

---
 chatdesk-ui/app/[locale]/login/page.tsx                | 10 ++++++----
 .../system/clearcookies-then-redirect/page.tsx         |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/chatdesk-ui/app/[locale]/login/page.tsx b/chatdesk-ui/app/[locale]/login/page.tsx
index cecc360..bdd0b03 100644
--- a/chatdesk-ui/app/[locale]/login/page.tsx
+++ b/chatdesk-ui/app/[locale]/login/page.tsx
@@ -73,11 +73,13 @@ export default async function Login({
 
       //return redirect(`/${localeString}`);
       //return redirect(`/${localeString}/login`);
-      //return redirect(`/${localeString}/clearcookies-then-redirect`);
-      return redirect(`/${localeString}/system/clearcookies-then-redirect`);
+      if (searchParams.cleaned !== "true") {
+        return redirect(`/${locale}/system/clearcookies-then-redirect`)
+      }
+    }
+    else{
+      return redirect(`/${localeString}/${homeWorkspace!.id}/chat`);
     }
-
-    return redirect(`/${localeString}/${homeWorkspace!.id}/chat`);
   }
 
   const signIn = async (formData: FormData) => {
diff --git a/chatdesk-ui/app/[locale]/system/clearcookies-then-redirect/page.tsx b/chatdesk-ui/app/[locale]/system/clearcookies-then-redirect/page.tsx
index 5f25567..de96c78 100644
--- a/chatdesk-ui/app/[locale]/system/clearcookies-then-redirect/page.tsx
+++ b/chatdesk-ui/app/[locale]/system/clearcookies-then-redirect/page.tsx
@@ -9,7 +9,7 @@ export default function ClearCookiesThenRedirect({ params }: { params: { locale:
 
   useEffect(() => {
     fetch("/api/clearcookies", { method: "POST" }).finally(() => {
-      router.replace(`/${params.locale}/login?message=sessionExpired`)
+      router.replace(`/${params.locale}/login?message=sessionExpired&cleaned=true`)
     })
   }, [])