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) {