From 160b4d194bad9546cb3aff483b74dd0388bf3b1c Mon Sep 17 00:00:00 2001
From: yyh <92089059+lyzno1@users.noreply.github.com>
Date: Wed, 7 Jan 2026 14:20:38 +0800
Subject: [PATCH] fix: signin page stuck on loading when refresh token valid
 but access token expired (#30675)

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
---
 web/app/signin/normal-form.tsx | 4 +++-
 web/service/use-common.ts      | 9 ++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/web/app/signin/normal-form.tsx b/web/app/signin/normal-form.tsx
index bf4d80326b..be0feea6c1 100644
--- a/web/app/signin/normal-form.tsx
+++ b/web/app/signin/normal-form.tsx
@@ -28,7 +28,8 @@ const NormalForm = () => {
   const message = decodeURIComponent(searchParams.get('message') || '')
   const invite_token = decodeURIComponent(searchParams.get('invite_token') || '')
   const [isInitCheckLoading, setInitCheckLoading] = useState(true)
-  const isLoading = isCheckLoading || loginData?.logged_in || isInitCheckLoading
+  const [isRedirecting, setIsRedirecting] = useState(false)
+  const isLoading = isCheckLoading || isInitCheckLoading || isRedirecting
   const { systemFeatures } = useGlobalPublicStore()
   const [authType, updateAuthType] = useState<'code' | 'password'>('password')
   const [showORLine, setShowORLine] = useState(false)
@@ -40,6 +41,7 @@ const NormalForm = () => {
   const init = useCallback(async () => {
     try {
       if (isLoggedIn) {
+        setIsRedirecting(true)
         const redirectUrl = resolvePostLoginRedirect(searchParams)
         router.replace(redirectUrl || '/apps')
         return
diff --git a/web/service/use-common.ts b/web/service/use-common.ts
index a1edb041c0..ca0845d95a 100644
--- a/web/service/use-common.ts
+++ b/web/service/use-common.ts
@@ -221,13 +221,12 @@ export const useIsLogin = () => {
         await get('/account/profile', {}, {
           silent: true,
         })
-      }
-      catch (e: any) {
-        if (e.status === 401)
-          return { logged_in: false }
         return { logged_in: true }
       }
-      return { logged_in: true }
+      catch {
+        // Any error (401, 500, network error, etc.) means not logged in
+        return { logged_in: false }
+      }
     },
   })
 }