🐛 Fix bug: login modal not automatically pop up when login session is expired

🐛 Fix bug: login modal not automatically pop up when login session is expired

Author: Jasonxia007

frontend/app/[locale]/setup/page.tsx

@@ -47,21 +47,7 @@ export default function CreatePage() {
   useEffect(() => {
     if (!userLoading) {
       if (!user) {
-        // user not logged in, show login prompt
-        modal.confirm({
-          title: t('login.expired.title'),
-          icon: <ExclamationCircleOutlined />,
-          content: t('login.expired.content'),
-          okText: t('login.expired.okText'),
-          cancelText: t('login.expired.cancelText'),
-          closable: false,
-          onOk() {
-            openLoginModal();
-          },
-          onCancel() {
-            router.push('/');
-          }
-        });
+        // user not logged in, do nothing
         return
       }
 

frontend/components/auth/sessionListeners.tsx

@@ -2,7 +2,7 @@
 
 import { useEffect, useRef } from 'react';
 import { useRouter, usePathname } from 'next/navigation';
-import { App } from 'antd';
+import { App, Modal } from 'antd';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 import { authService } from '@/services/authService';
 import { EVENTS } from '@/types/auth';
@@ -28,13 +28,6 @@ export function SessionListeners() {
   const showSessionExpiredModal = () => {
     // 若已显示过，则直接返回
     if (modalShownRef.current) return;
-    
-    // 修复：在首页不显示过期弹窗
-    if (pathname === '/' || pathname?.startsWith('/?') || 
-        pathname?.startsWith('/zh') || pathname?.startsWith('/en')) {
-      return;
-    }
-
     modalShownRef.current = true;
 
     modal.confirm({
@@ -50,6 +43,7 @@ export function SessionListeners() {
         } finally {
           // Mark the source as session expired
           setIsFromSessionExpired(true);
+          Modal.destroyAll();
           openLoginModal();
           setTimeout(() => (modalShownRef.current = false), 500);
         }
@@ -83,12 +77,6 @@ export function SessionListeners() {
   // 监听会话过期事件
   useEffect(() => {
     const handleSessionExpired = (event: CustomEvent) => {
-      // 修复：在首页不处理会话过期事件
-      if (pathname === '/' || pathname?.startsWith('/?') || 
-          pathname?.startsWith('/zh') || pathname?.startsWith('/en')) {
-        return;
-      }
-
       // 直接调用封装函数
       showSessionExpiredModal();
     };
@@ -106,19 +94,14 @@ export function SessionListeners() {
   // 组件初次挂载时，如果发现本地已经没有 session，也立即弹窗
   useEffect(() => {
     if (typeof window !== 'undefined') {
-      const localSession = localStorage.getItem('session');
-      // 修复：只在非首页且没有session时才弹窗
-      if (!localSession && pathname && 
-          pathname !== '/' && 
-          !pathname.startsWith('/?') && 
-          !pathname.startsWith('/zh') && 
-          !pathname.startsWith('/en')) {
+      const localSession = localStorage.getItem('session'); 
+      if (!localSession) {
         showSessionExpiredModal();
       }
     }
     // 该副作用只需在首次渲染时执行一次
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [pathname]);
+  }, []);
 
   // 会话状态检查
   useEffect(() => {
@@ -127,8 +110,7 @@ export function SessionListeners() {
       try {
         // 尝试获取当前会话
         const session = await authService.getSession();
-        // 修复：只在chat路径且没有session时才触发过期事件
-        if (!session && pathname?.startsWith('/chat')) {
+        if (!session) {
           window.dispatchEvent(new CustomEvent(EVENTS.SESSION_EXPIRED, {
             detail: { message: "登录已过期，请重新登录" }
           }));

frontend/hooks/useAuth.ts

@@ -130,13 +130,7 @@ export function AuthProvider({ children }: { children: (value: AuthContextType)
     if (!isLoading && !user) {
       // 页面加载完成后，如果没有登录，则触发会话过期事件
       // 只在非首页路径触发，且仅在之前有会话的情况下触发
-      // 修复：添加更严格的路径检查，避免在首页触发
-      if (pathname && 
-          pathname !== '/' && 
-          !pathname.startsWith('/?') && 
-          !pathname.startsWith('/zh') && 
-          !pathname.startsWith('/en') && 
-          shouldCheckSession) {
+      if (pathname && pathname !== '/' && !pathname.startsWith('/?') && shouldCheckSession) {
         window.dispatchEvent(new CustomEvent(EVENTS.SESSION_EXPIRED, {
           detail: { message: t('auth.sessionExpired') }
         }));
@@ -246,7 +240,7 @@ export function AuthProvider({ children }: { children: (value: AuthContextType)
           window.dispatchEvent(new StorageEvent("storage", { key: "session", newValue: localStorage.getItem("session") }))
 
           // If on the chat page, trigger conversation list update
-          if (pathname === '/chat') {
+          if (pathname.includes('/chat')) {
             window.dispatchEvent(new CustomEvent('conversationListUpdated'))
           }
         }, 150)

frontend/services/api.ts

@@ -206,13 +206,6 @@ function handleSessionExpired() {
     return;
   }
 
-  // 修复：在首页不触发会话过期事件
-  const currentPath = window.location.pathname;
-  if (currentPath === '/' || currentPath.startsWith('/?') || 
-      currentPath.startsWith('/zh') || currentPath.startsWith('/en')) {
-    return;
-  }
-
   // 标记正在处理中
   window.__isHandlingSessionExpired = true;