Fix chat login (#6993)

* fix: chat home login * doc

Fix chat login (#6993)
* fix: chat home login * doc
db8edc43 · Archer · GitHub · 5a221391 · db8edc43 · db8edc43
Commit db8edc43 authored May 26, 2026 by Archer Committed by GitHub May 26, 2026
Showing with 77 additions and 26 deletions

document/content/self-host/upgrading/4-15/41503.mdx
+5 -0

document/data/doc-last-modified.json
+1 -1

projects/app/src/pages/chat/index.tsx
+64 -11

projects/app/src/web/core/chat/context/chatPageContext.tsx
+7 -14

No files found.
--- a/document/content/self-host/upgrading/4-15/41503.mdx
+++ b/document/content/self-host/upgrading/4-15/41503.mdx
@@ -10,6 +10,10 @@ description: 'FastGPT V4.15.0-beta3 更新说明'
 ## ⚙️ 优化
+1. Skill 模块相关弹窗样式。
+2. Skill list 接口性能。
+3. 工作流节点名称和介绍输入。
 ## 🐛 修复
 1. TTS 语音播放适配最新 OpenAI SDK，避免报错。
@@ -20,3 +24,4 @@ description: 'FastGPT V4.15.0-beta3 更新说明'
 2. 重写了对话框相关代码，进行模块化细分。
 3. 优化单测性能，全量从 10 分支将至 5 分钟。
 4. 升级 ts6。
+5. GitHub action 增强安全性。
--- a/document/data/doc-last-modified.json
+++ b/document/data/doc-last-modified.json
@@ -281,7 +281,7 @@
  "content/self-host/upgrading/4-15/41502.en.mdx": "2026-05-25T11:21:30+08:00",
  "content/self-host/upgrading/4-15/41502.mdx": "2026-05-25T11:21:30+08:00",
  "content/self-host/upgrading/4-15/41503.en.mdx": "2026-05-25T11:21:30+08:00",
-  "content/self-host/upgrading/4-15/41503.mdx": "2026-05-26T13:09:31+08:00",
+  "content/self-host/upgrading/4-15/41503.mdx": "2026-05-26T20:01:48+08:00",
  "content/self-host/upgrading/outdated/40.en.mdx": "2026-04-26T21:08:47+08:00",
  "content/self-host/upgrading/outdated/40.mdx": "2026-04-26T21:08:47+08:00",
  "content/self-host/upgrading/outdated/41.en.mdx": "2026-04-26T21:08:47+08:00",

--- a/projects/app/src/pages/chat/index.tsx
+++ b/projects/app/src/pages/chat/index.tsx
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import NextHead from '@/components/common/NextHead';
 import { Box, Flex } from '@chakra-ui/react';
 import { useChatStore } from '@/web/core/chat/context/useChatStore';
@@ -89,6 +89,7 @@ const Chat = () => {
 type ChatPageProps = {
  appId: string;
+  shouldInitUserInfo: boolean;
  isStandalone?: string;
  showRunningStatus: boolean;
  showSkillReferences: boolean;
@@ -98,11 +99,22 @@ type ChatPageProps = {
  showWholeResponse: boolean;
 };
+const ChatLogin = ({ onSuccess }: { onSuccess: (res: LoginSuccessResponseType) => void }) => {
+  const { feConfigs } = useSystemStore();
+  return (
+    <>
+      <NextHead title={feConfigs?.systemTitle}></NextHead>
+      <LoginModal onSuccess={onSuccess} />
+    </>
+  );
+};
 const ChatContent = (props: ChatPageProps) => {
  const { appId: pageAppId, isStandalone } = props;
  const { appId: storeAppId, chatId } = useChatStore();
  const { setUserInfo } = useUserStore();
-  const { feConfigs } = useSystemStore();
  const isInitedUser = useContextSelector(ChatPageContext, (v) => v.isInitedUser);
  const userInfo = useContextSelector(ChatPageContext, (v) => v.userInfo);
@@ -134,20 +146,14 @@ const ChatContent = (props: ChatPageProps) => {
  if (!isInitedUser) {
    return (
      <PageContainer isLoading flex={'1'} p={4}>
-        <NextHead title={feConfigs?.systemTitle} icon={feConfigs?.favicon} />
+        <NextHead />
      </PageContainer>
    );
  }
  // Not login
  if (!userInfo) {
-    return (
+    return <ChatLogin onSuccess={loginSuccess} />;
-      <>
-        <NextHead title={feConfigs?.systemTitle}></NextHead>
-        <LoginModal onSuccess={loginSuccess} />
-      </>
-    );
  }
  // show main chat interface
@@ -171,6 +177,51 @@ const ChatContent = (props: ChatPageProps) => {
 };
 const Render = (props: ChatPageProps) => {
+  const { feConfigs } = useSystemStore();
+  const { userInfo, setUserInfo, initUserInfo } = useUserStore();
+  const [isInitedUser, setIsInitedUser] = useState(!props.shouldInitUserInfo);
+  const loginSuccess = useCallback(
+    async (res: LoginSuccessResponseType) => {
+      setUserInfo(res.user);
+    },
+    [setUserInfo]
+  );
+  useEffect(() => {
+    if (!props.shouldInitUserInfo) return;
+    let isUnmounted = false;
+    const init = async () => {
+      try {
+        await initUserInfo();
+      } finally {
+        if (!isUnmounted) {
+          setIsInitedUser(true);
+        }
+      }
+    };
+    init();
+    return () => {
+      isUnmounted = true;
+    };
+  }, [initUserInfo, props.shouldInitUserInfo]);
+  if (!isInitedUser) {
+    return (
+      <PageContainer isLoading flex={'1'} p={4}>
+        <NextHead title={feConfigs?.systemTitle} icon={feConfigs?.favicon} />
+      </PageContainer>
+    );
+  }
+  if (!userInfo) {
+    return <ChatLogin onSuccess={loginSuccess} />;
+  }
  return (
    <ChatPageContextProvider appId={props.appId}>
      <ChatContent {...props} />
@@ -182,6 +233,7 @@ export default Render;
 export async function getServerSideProps(context: any) {
  const appId = context?.query?.appId || '';
+  const shouldInitUserInfo = !!context.req?.cookies?.fastgpt_token;
  const chatQuoteReaderConfig = await (async () => {
    try {
@@ -205,13 +257,14 @@ export async function getServerSideProps(context: any) {
  return {
    props: {
      appId,
+      shouldInitUserInfo,
      showRunningStatus: chatQuoteReaderConfig?.showRunningStatus ?? true,
      showSkillReferences: chatQuoteReaderConfig?.showSkillReferences ?? false,
      showCite: chatQuoteReaderConfig?.showCite ?? true,
      showFullText: chatQuoteReaderConfig?.showFullText ?? true,
      canDownloadSource: chatQuoteReaderConfig?.canDownloadSource ?? true,
      showWholeResponse: chatQuoteReaderConfig?.showWholeResponse ?? true,
-      ...(await serviceSideProps(context, ['file', 'app', 'chat', 'workflow']))
+      ...(await serviceSideProps(context, ['file', 'app', 'chat', 'workflow', 'login', 'user']))
    }
  };
 }
--- a/projects/app/src/web/core/chat/context/chatPageContext.tsx
+++ b/projects/app/src/web/core/chat/context/chatPageContext.tsx
@@ -67,20 +67,20 @@ export const ChatPageContextProvider = ({
  const router = useRouter();
  const { feConfigs } = useSystemStore();
  const { setSource, setAppId, setLastPane, setLastChatAppId, lastPane } = useChatStore();
-  const { userInfo, initUserInfo } = useUserStore();
+  const { userInfo } = useUserStore();
  const { pane = lastPane || ChatSidebarPaneEnum.HOME } = router.query as {
    pane: ChatSidebarPaneEnum;
  };
  const [collapse, setCollapse] = useState<CollapseStatusType>(defaultCollapseStatus);
-  const [isInitedUser, setIsInitedUser] = useState(false);
  // Get recently used apps
  const { data: myApps = [], refresh: refreshRecentlyUsed } = useRequest(
    () => getRecentlyUsedApps(),
    {
      manual: false,
+      ready: !!userInfo,
      errorToast: '',
      refreshDeps: [userInfo?.team?.tmbId],
      pollingInterval: 30000,
@@ -88,17 +88,10 @@ export const ChatPageContextProvider = ({
    }
  );
-  // Initialize user info
+  // Initialize chat page state
  useMount(async () => {
    if (routeAppId) setAppId(routeAppId);
-    try {
+    setSource('online');
-      await initUserInfo();
-    } catch (error) {
-      console.log('User not logged in:', error);
-    } finally {
-      setSource('online');
-      setIsInitedUser(true);
-    }
  });
  // Sync appId to store as route/appId changes
@@ -115,7 +108,8 @@ export const ChatPageContextProvider = ({
    },
    {
      manual: false,
-      refreshDeps: [feConfigs.isPlus],
+      ready: !!userInfo && !!feConfigs.isPlus,
+      refreshDeps: [feConfigs.isPlus, userInfo?.team?.tmbId],
      onSuccess: (data) => {
        if (!data) return;
@@ -198,7 +192,7 @@ export const ChatPageContextProvider = ({
      chatSettings,
      refreshChatSetting,
      logos,
-      isInitedUser,
+      isInitedUser: true,
      userInfo,
      myApps,
      refreshRecentlyUsed
@@ -211,7 +205,6 @@ export const ChatPageContextProvider = ({
      chatSettings,
      refreshChatSetting,
      logos,
-      isInitedUser,
      userInfo,
      myApps,
      refreshRecentlyUsed