fix feckbackMoal auth bug (labring#47)

newfish-cmyk · Mar 15, 2024 · 8005929 · 8005929
1 parent 534748a
commit 8005929
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/packages/global/core/chat/api.d.ts b/packages/global/core/chat/api.d.ts
@@ -3,6 +3,8 @@ export type UpdateChatFeedbackProps = {
   chatId: string;
   chatItemId: string;
   shareId?: string;
+  teamId?: string;
+  teamToken?: string;
   outLinkUid?: string;
   userBadFeedback?: string;
   userGoodFeedback?: string;

diff --git a/projects/app/src/components/ChatBox/FeedbackModal.tsx b/projects/app/src/components/ChatBox/FeedbackModal.tsx
@@ -9,6 +9,8 @@ const FeedbackModal = ({
   appId,
   chatId,
   chatItemId,
+  teamId,
+  teamToken,
   shareId,
   outLinkUid,
   onSuccess,
@@ -18,6 +20,8 @@ const FeedbackModal = ({
   chatId: string;
   chatItemId: string;
   shareId?: string;
+  teamId?: string;
+  teamToken?: string;
   outLinkUid?: string;
   onSuccess: (e: string) => void;
   onClose: () => void;
@@ -33,6 +37,8 @@ const FeedbackModal = ({
         chatId,
         chatItemId,
         shareId,
+        teamId,
+        teamToken,
         outLinkUid,
         userBadFeedback: val
       });

diff --git a/projects/app/src/components/ChatBox/index.tsx b/projects/app/src/components/ChatBox/index.tsx
@@ -58,6 +58,7 @@ import { SseResponseEventEnum } from '@fastgpt/global/core/module/runtime/consta
 import ChatItem from './components/ChatItem';
 
 import dynamic from 'next/dynamic';
+import team from '@fastgpt/global/common/error/code/team';
 const ResponseTags = dynamic(() => import('./ResponseTags'));
 const FeedbackModal = dynamic(() => import('./FeedbackModal'));
 const ReadFeedbackModal = dynamic(() => import('./ReadFeedbackModal'));
@@ -630,6 +631,8 @@ const ChatBox = (
           updateChatUserFeedback({
             appId,
             chatId,
+            teamId,
+            teamToken,
             chatItemId: chat.dataId,
             shareId,
             outLinkUid,
@@ -654,6 +657,8 @@ const ChatBox = (
         );
         updateChatUserFeedback({
           appId,
+          teamId,
+          teamToken,
           chatId,
           chatItemId: chat.dataId,
           userGoodFeedback: undefined
@@ -687,6 +692,8 @@ const ChatBox = (
               chatId,
               chatItemId: chat.dataId,
               shareId,
+              teamId,
+              teamToken,
               outLinkUid
             });
           } catch (error) {}
@@ -955,6 +962,8 @@ const ChatBox = (
       {!!feedbackId && chatId && appId && (
         <FeedbackModal
           appId={appId}
+          teamId={teamId}
+          teamToken={teamToken}
           chatId={chatId}
           chatItemId={feedbackId}
           shareId={shareId}

diff --git a/projects/app/src/pages/api/core/chat/feedback/updateUserFeedback.ts b/projects/app/src/pages/api/core/chat/feedback/updateUserFeedback.ts
@@ -7,8 +7,17 @@ import { autChatCrud } from '@/service/support/permission/auth/chat';
 
 /* 初始化我的聊天框，需要身份验证 */
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  const { appId, chatId, chatItemId, shareId, outLinkUid, userBadFeedback, userGoodFeedback } =
-    req.body as UpdateChatFeedbackProps;
+  const {
+    appId,
+    chatId,
+    chatItemId,
+    shareId,
+    teamId,
+    teamToken,
+    outLinkUid,
+    userBadFeedback,
+    userGoodFeedback
+  } = req.body as UpdateChatFeedbackProps;
 
   try {
     await connectToDatabase();
@@ -17,6 +26,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       req,
       authToken: true,
       appId,
+      teamId,
+      teamToken,
       chatId,
       shareId,
       outLinkUid,