v4.6 -1 (#459)

projects/app/src/pages/api/support/openapi/create.ts

@@ -1,19 +1,19 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@/service/response';
+import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
 import { MongoOpenApi } from '@fastgpt/service/support/openapi/schema';
-import { authUser } from '@fastgpt/service/support/user/auth';
 import { customAlphabet } from 'nanoid';
-import type { EditApiKeyProps } from '@/global/support/api/openapiReq.d';
+import type { EditApiKeyProps } from '@/global/support/openapi/api';
+import { authUserNotVisitor } from '@fastgpt/service/support/permission/auth/user';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
     await connectToDatabase();
     const { appId, name, limit } = req.body as EditApiKeyProps;
-    const { userId } = await authUser({ req, authToken: true });
+    const { teamId, tmbId } = await authUserNotVisitor({ req, authToken: true });
 
-    const count = await MongoOpenApi.find({ userId, appId }).countDocuments();
+    const count = await MongoOpenApi.find({ tmbId, appId }).countDocuments();
 
     if (count >= 10) {
       throw new Error('最多 10 组 API 秘钥');
@@ -26,7 +26,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     const apiKey = `${global.systemEnv?.openapiPrefix || 'fastgpt'}-${nanoid()}`;
 
     await MongoOpenApi.create({
-      userId,
+      teamId,
+      tmbId,
       apiKey,
       appId,
       name,

projects/app/src/pages/api/support/openapi/delete.ts

@@ -1,9 +1,9 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@/service/response';
+import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
 import { MongoOpenApi } from '@fastgpt/service/support/openapi/schema';
-import { authUser } from '@fastgpt/service/support/user/auth';
+import { authOpenApiKeyCrud } from '@fastgpt/service/support/permission/auth/openapi';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
@@ -14,9 +14,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       throw new Error('缺少参数');
     }
 
-    const { userId } = await authUser({ req, authToken: true });
+    await authOpenApiKeyCrud({ req, authToken: true, id, per: 'owner' });
 
-    await MongoOpenApi.findOneAndRemove({ _id: id, userId });
+    await MongoOpenApi.findOneAndRemove({ _id: id });
 
     jsonRes(res);
   } catch (err) {

projects/app/src/pages/api/support/openapi/getKeys.ts

@@ -1,25 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@/service/response';
-import { connectToDatabase } from '@/service/mongo';
-import { MongoOpenApi } from '@fastgpt/service/support/openapi/schema';
-import { authUser } from '@fastgpt/service/support/user/auth';
-import type { GetApiKeyProps } from '@/global/support/api/openapiReq.d';
-
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    await connectToDatabase();
-    const { appId } = req.query as GetApiKeyProps;
-    const { userId } = await authUser({ req, authToken: true });
-
-    const findResponse = await MongoOpenApi.find({ userId, appId }).sort({ _id: -1 });
-
-    jsonRes(res, {
-      data: findResponse.map((item) => item.toObject())
-    });
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
-  }
-}

projects/app/src/pages/api/support/openapi/list.ts

@@ -0,0 +1,48 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@fastgpt/service/common/response';
+import { connectToDatabase } from '@/service/mongo';
+import { MongoOpenApi } from '@fastgpt/service/support/openapi/schema';
+import type { GetApiKeyProps } from '@/global/support/openapi/api';
+import { authUserNotVisitor } from '@fastgpt/service/support/permission/auth/user';
+import { authApp } from '@fastgpt/service/support/permission/auth/app';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  try {
+    await connectToDatabase();
+    const { appId } = req.query as GetApiKeyProps;
+
+    if (appId) {
+      const { tmbId, teamOwner } = await authApp({ req, authToken: true, appId, per: 'w' });
+
+      const findResponse = await MongoOpenApi.find({
+        appId,
+        ...(!teamOwner && { tmbId })
+      }).sort({ _id: -1 });
+
+      return jsonRes(res, {
+        data: findResponse.map((item) => item.toObject())
+      });
+    }
+
+    const {
+      teamId,
+      tmbId,
+      isOwner: teamOwner
+    } = await authUserNotVisitor({ req, authToken: true });
+
+    const findResponse = await MongoOpenApi.find({
+      appId,
+      teamId,
+      ...(!teamOwner && { tmbId })
+    }).sort({ _id: -1 });
+
+    return jsonRes(res, {
+      data: findResponse.map((item) => item.toObject())
+    });
+  } catch (err) {
+    jsonRes(res, {
+      code: 500,
+      error: err
+    });
+  }
+}

projects/app/src/pages/api/support/openapi/update.ts

@@ -1,26 +1,21 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@/service/response';
+import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
 import { MongoOpenApi } from '@fastgpt/service/support/openapi/schema';
-import { authUser } from '@fastgpt/service/support/user/auth';
-import type { EditApiKeyProps } from '@/global/support/api/openapiReq.d';
+import type { EditApiKeyProps } from '@/global/support/openapi/api.d';
+import { authOpenApiKeyCrud } from '@fastgpt/service/support/permission/auth/openapi';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
     await connectToDatabase();
     const { _id, name, limit } = req.body as EditApiKeyProps & { _id: string };
-    const { userId } = await authUser({ req, authToken: true });
 
-    await MongoOpenApi.findOneAndUpdate(
-      {
-        _id,
-        userId
-      },
-      {
-        ...(name && { name }),
-        ...(limit && { limit })
-      }
-    );
+    await authOpenApiKeyCrud({ req, authToken: true, id: _id, per: 'owner' });
+
+    await MongoOpenApi.findByIdAndUpdate(_id, {
+      ...(name && { name }),
+      ...(limit && { limit })
+    });
 
     jsonRes(res);
   } catch (err) {

projects/app/src/pages/api/support/outLink/create.ts

@@ -1,9 +1,8 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@/service/response';
+import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
 import { MongoOutLink } from '@fastgpt/service/support/outLink/schema';
-import { authApp } from '@/service/utils/auth';
-import { authUser } from '@fastgpt/service/support/user/auth';
+import { authApp } from '@fastgpt/service/support/permission/auth/app';
 import type { OutLinkEditType } from '@fastgpt/global/support/outLink/type.d';
 import { customAlphabet } from 'nanoid';
 import { OutLinkTypeEnum } from '@fastgpt/global/support/outLink/constant';
@@ -18,17 +17,13 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       type: `${OutLinkTypeEnum}`;
     };
 
-    const { userId } = await authUser({ req, authToken: true });
-    await authApp({
-      appId,
-      userId,
-      authOwner: false
-    });
+    const { teamId, tmbId } = await authApp({ req, authToken: true, appId, per: 'w' });
 
     const shareId = nanoid();
     await MongoOutLink.create({
       shareId,
-      userId,
+      teamId,
+      tmbId,
       appId,
       ...props
     });

projects/app/src/pages/api/support/outLink/delete.ts

@@ -1,8 +1,8 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@/service/response';
+import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
 import { MongoOutLink } from '@fastgpt/service/support/outLink/schema';
-import { authUser } from '@fastgpt/service/support/user/auth';
+import { authOutLinkCrud } from '@fastgpt/service/support/permission/auth/outLink';
 
 /* delete a shareChat by shareChatId */
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
@@ -13,12 +13,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       id: string;
     };
 
-    const { userId } = await authUser({ req, authToken: true });
+    await authOutLinkCrud({ req, outLinkId: id, authToken: true, per: 'owner' });
 
-    await MongoOutLink.findOneAndRemove({
-      _id: id,
-      userId
-    });
+    await MongoOutLink.findByIdAndRemove(id);
 
     jsonRes(res);
   } catch (err) {

projects/app/src/pages/api/support/outLink/init.ts

@@ -1,14 +1,13 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@/service/response';
+import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
-import { MongoOutLink } from '@fastgpt/service/support/outLink/schema';
 import { MongoUser } from '@fastgpt/service/support/user/schema';
-import type { InitShareChatResponse } from '@/global/support/api/outLinkRes.d';
-import { authApp } from '@/service/utils/auth';
-import { HUMAN_ICON } from '@/constants/chat';
+import type { InitShareChatResponse } from '@fastgpt/global/support/outLink/api.d';
+import { HUMAN_ICON } from '@fastgpt/global/core/chat/constants';
 import { getGuideModule } from '@/global/core/app/modules/utils';
-import { authShareChatInit } from '@fastgpt/service/support/outLink/auth';
+import { authShareChatInit } from '@/service/support/outLink/auth';
 import { getChatModelNameListByModules } from '@/service/core/app/module';
+import { authOutLinkValid } from '@fastgpt/service/support/permission/auth/outLink';
 
 /* init share chat window */
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
@@ -19,27 +18,11 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       authToken?: string;
     };
 
-    if (!shareId) {
-      throw new Error('params is error');
-    }
-
     // get shareChat
-    const shareChat = await MongoOutLink.findOne({ shareId });
-
-    if (!shareChat) {
-      return jsonRes(res, {
-        code: 501,
-        error: '分享链接已失效'
-      });
-    }
+    const { app, shareChat } = await authOutLinkValid({ shareId });
 
     // 校验使用权限
-    const [{ app }, user] = await Promise.all([
-      authApp({
-        appId: shareChat.appId,
-        userId: String(shareChat.userId),
-        authOwner: false
-      }),
+    const [user] = await Promise.all([
       MongoUser.findById(shareChat.userId, 'avatar'),
       authShareChatInit({
         authToken,

projects/app/src/pages/api/support/outLink/list.ts

@@ -1,8 +1,8 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@/service/response';
+import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
 import { MongoOutLink } from '@fastgpt/service/support/outLink/schema';
-import { authUser } from '@fastgpt/service/support/user/auth';
+import { authApp } from '@fastgpt/service/support/permission/auth/app';
 
 /* get shareChat list by appId */
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
@@ -13,11 +13,11 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       appId: string;
     };
 
-    const { userId } = await authUser({ req, authToken: true });
+    const { teamId, tmbId, isOwner } = await authApp({ req, authToken: true, appId, per: 'w' });
 
     const data = await MongoOutLink.find({
       appId,
-      userId
+      ...(isOwner ? { teamId } : { tmbId })
     }).sort({
       _id: -1
     });

projects/app/src/pages/api/support/outLink/update.ts

@@ -1,8 +1,9 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@/service/response';
+import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
 import { MongoOutLink } from '@fastgpt/service/support/outLink/schema';
 import type { OutLinkEditType } from '@fastgpt/global/support/outLink/type.d';
+import { authOutLinkCrud } from '@fastgpt/service/support/permission/auth/outLink';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
@@ -10,6 +11,12 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
     const { _id, name, responseDetail, limit } = req.body as OutLinkEditType & {};
 
+    if (!_id) {
+      throw new Error('_id is required');
+    }
+
+    await authOutLinkCrud({ req, outLinkId: _id, authToken: true, per: 'owner' });
+
     await MongoOutLink.findByIdAndUpdate(_id, {
       name,
       responseDetail,

projects/app/src/pages/api/support/wallet/bill/createTrainingBill.ts

@@ -0,0 +1,49 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@fastgpt/service/common/response';
+import { connectToDatabase } from '@/service/mongo';
+import { MongoBill } from '@fastgpt/service/support/wallet/bill/schema';
+import { authCert } from '@fastgpt/service/support/permission/auth/common';
+import { BillSourceEnum } from '@fastgpt/global/support/wallet/bill/constants';
+import { CreateTrainingBillProps } from '@fastgpt/global/support/wallet/bill/api.d';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  try {
+    await connectToDatabase();
+    const { name } = req.body as CreateTrainingBillProps;
+
+    const { teamId, tmbId } = await authCert({ req, authToken: true, authApiKey: true });
+
+    const qaModel = global.qaModels[0];
+
+    const { _id } = await MongoBill.create({
+      teamId,
+      tmbId,
+      appName: name,
+      source: BillSourceEnum.training,
+      list: [
+        {
+          moduleName: '索引生成',
+          model: 'embedding',
+          amount: 0,
+          tokenLen: 0
+        },
+        {
+          moduleName: 'QA 拆分',
+          model: qaModel?.name,
+          amount: 0,
+          tokenLen: 0
+        }
+      ],
+      total: 0
+    });
+
+    jsonRes<string>(res, {
+      data: _id
+    });
+  } catch (err) {
+    jsonRes(res, {
+      code: 500,
+      error: err
+    });
+  }
+}