v4.6 -1 (#459)

projects/app/src/service/utils/auth.ts

@@ -1,49 +0,0 @@
-import { App } from '../mongo';
-import { MongoDataset } from '@fastgpt/service/core/dataset/schema';
-import type { AppSchema } from '@/types/mongoSchema';
-import { ERROR_ENUM } from '@fastgpt/global/common/error/errorCode';
-
-// 模型使用权校验
-export const authApp = async ({
-  appId,
-  userId,
-  authUser = true,
-  authOwner = true
-}: {
-  appId: string;
-  userId: string;
-  authUser?: boolean;
-  authOwner?: boolean;
-}) => {
-  // 获取 app 数据
-  const app = await App.findById<AppSchema>(appId);
-  if (!app) {
-    return Promise.reject('App is not exists');
-  }
-
-  /* 
-    Access verification
-    1. authOwner=true or authUser = true ,  just owner can use
-    2. authUser = false and share, anyone can use
-  */
-  if (authOwner || authUser) {
-    if (userId !== String(app.userId)) return Promise.reject(ERROR_ENUM.unAuthModel);
-  }
-
-  return {
-    app,
-    showModelDetail: userId === String(app.userId)
-  };
-};
-
-// 知识库操作权限
-export const authDataset = async ({ datasetId, userId }: { datasetId: string; userId: string }) => {
-  const dataset = await MongoDataset.findOne({
-    _id: datasetId,
-    userId
-  });
-  if (dataset) {
-    return dataset;
-  }
-  return Promise.reject(ERROR_ENUM.unAuthDataset);
-};

projects/app/src/service/utils/chat/saveChat.ts

@@ -1,11 +1,15 @@
-import { ChatItemType } from '@/types/chat';
-import { Chat, App, ChatItem } from '@/service/mongo';
-import { ChatSourceEnum } from '@/constants/chat';
+import type { ChatItemType } from '@fastgpt/global/core/chat/type.d';
+import { MongoApp } from '@fastgpt/service/core/app/schema';
+import { ChatSourceEnum } from '@fastgpt/global/core/chat/constants';
+import { MongoChatItem } from '@fastgpt/service/core/chat/chatItemSchema';
+import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
+import { addLog } from '@fastgpt/service/common/mongo/controller';
 
 type Props = {
   chatId: string;
   appId: string;
-  userId: string;
+  teamId: string;
+  tmbId: string;
   variables?: Record<string, any>;
   isOwner: boolean;
   source: `${ChatSourceEnum}`;
@@ -16,7 +20,8 @@ type Props = {
 export async function saveChat({
   chatId,
   appId,
-  userId,
+  teamId,
+  tmbId,
   variables,
   isOwner,
   source,
@@ -24,20 +29,22 @@ export async function saveChat({
   content
 }: Props) {
   try {
-    const chatHistory = await Chat.findOne(
+    const chatHistory = await MongoChat.findOne(
       {
         chatId,
-        userId,
+        teamId,
+        tmbId,
         appId
       },
       '_id'
     );
 
     const promise: any[] = [
-      ChatItem.insertMany(
+      MongoChatItem.insertMany(
         content.map((item) => ({
           chatId,
-          userId,
+          teamId,
+          tmbId,
           appId,
           ...item
         }))
@@ -46,8 +53,8 @@ export async function saveChat({
 
     if (chatHistory) {
       promise.push(
-        Chat.updateOne(
-          { chatId, userId, appId },
+        MongoChat.updateOne(
+          { chatId },
           {
             title: content[0].value.slice(0, 20),
             updateTime: new Date()
@@ -56,9 +63,10 @@ export async function saveChat({
       );
     } else {
       promise.push(
-        Chat.create({
+        MongoChat.create({
           chatId,
-          userId,
+          teamId,
+          tmbId,
           appId,
           variables,
           title: content[0].value.slice(0, 20),
@@ -70,7 +78,7 @@ export async function saveChat({
 
     if (isOwner && source === ChatSourceEnum.online) {
       promise.push(
-        App.findByIdAndUpdate(appId, {
+        MongoApp.findByIdAndUpdate(appId, {
           updateTime: new Date()
         })
       );
@@ -78,16 +86,6 @@ export async function saveChat({
 
     await Promise.all(promise);
   } catch (error) {
-    Chat.updateOne(
-      { chatId, userId },
-      {
-        $push: {
-          content: {
-            $each: [],
-            $slice: -10
-          }
-        }
-      }
-    );
+    addLog.error(`update chat history error`, error);
   }
 }

projects/app/src/service/utils/tools.ts

@@ -19,30 +19,3 @@ export const startQueue = (limit?: number) => {
     generateVector();
   }
 };
-
-/* add logger */
-export const addLog = {
-  info: (msg: string, obj?: Record<string, any>) => {
-    global.logger?.info(msg, { meta: obj });
-  },
-  error: (msg: string, error?: any) => {
-    global.logger?.error(msg, {
-      meta: {
-        stack: error?.stack,
-        ...(error?.config && {
-          config: {
-            headers: error.config.headers,
-            url: error.config.url,
-            data: error.config.data
-          }
-        }),
-        ...(error?.response && {
-          response: {
-            status: error.response.status,
-            statusText: error.response.statusText
-          }
-        })
-      }
-    });
-  }
-};