v4.6.2-alpah (#511)

packages/service/support/permission/auth/chat.ts

@@ -1,6 +1,6 @@
 import { AuthResponseType } from '@fastgpt/global/support/permission/type';
 import { AuthModeType } from '../type';
-import type { ChatSchema, ChatWithAppSchema } from '@fastgpt/global/core/chat/type';
+import type { ChatWithAppSchema } from '@fastgpt/global/core/chat/type';
 import { parseHeaderCert } from '../controller';
 import { MongoChat } from '../../../core/chat/chatSchema';
 import { ChatErrEnum } from '@fastgpt/global/common/error/code/chat';
@@ -16,7 +16,7 @@ export async function authChat({
   chatId: string;
 }): Promise<
   AuthResponseType & {
-    chat: ChatSchema;
+    chat: ChatWithAppSchema;
   }
 > {
   const { userId, teamId, tmbId } = await parseHeaderCert(props);

packages/service/support/permission/auth/dataset.ts

@@ -15,19 +15,17 @@ import { getFileById } from '../../../common/file/gridfs/controller';
 import { BucketNameEnum } from '@fastgpt/global/common/file/constants';
 import { getTeamInfoByTmbId } from '../../user/team/controller';
 
-export async function authDataset({
+export async function authDatasetByTmbId({
+  teamId,
+  tmbId,
   datasetId,
-  per = 'owner',
-  ...props
-}: AuthModeType & {
+  per
+}: {
+  teamId: string;
+  tmbId: string;
   datasetId: string;
-}): Promise<
-  AuthResponseType & {
-    dataset: DatasetSchemaType;
-  }
-> {
-  const result = await parseHeaderCert(props);
-  const { teamId, tmbId } = result;
+  per: AuthModeType['per'];
+}) {
   const { role } = await getTeamInfoByTmbId({ tmbId });
 
   const { dataset, isOwner, canWrite } = await (async () => {
@@ -58,6 +56,32 @@ export async function authDataset({
     return { dataset, isOwner, canWrite };
   })();
 
+  return {
+    dataset,
+    isOwner,
+    canWrite
+  };
+}
+export async function authDataset({
+  datasetId,
+  per = 'owner',
+  ...props
+}: AuthModeType & {
+  datasetId: string;
+}): Promise<
+  AuthResponseType & {
+    dataset: DatasetSchemaType;
+  }
+> {
+  const result = await parseHeaderCert(props);
+  const { teamId, tmbId } = result;
+  const { dataset, isOwner, canWrite } = await authDatasetByTmbId({
+    teamId,
+    tmbId,
+    datasetId,
+    per
+  });
+
   return {
     ...result,
     dataset,

packages/service/support/permission/auth/plugin.ts

@@ -6,6 +6,8 @@ import { TeamMemberRoleEnum } from '@fastgpt/global/support/user/team/constant';
 import { MongoPlugin } from '../../../core/plugin/schema';
 import { PluginErrEnum } from '@fastgpt/global/common/error/code/plugin';
 import { PluginItemSchema } from '@fastgpt/global/core/plugin/type';
+import { splitCombinePluginId } from '../../../core/plugin/controller';
+import { PluginTypeEnum } from '@fastgpt/global/core/plugin/constants';
 
 export async function authPluginCrud({
   id,
@@ -54,3 +56,29 @@ export async function authPluginCrud({
     canWrite
   };
 }
+
+export async function authPluginCanUse({
+  id,
+  teamId,
+  tmbId
+}: {
+  id: string;
+  teamId: string;
+  tmbId: string;
+}) {
+  const { type, pluginId } = await splitCombinePluginId(id);
+
+  if (type === PluginTypeEnum.community) {
+    return true;
+  }
+
+  if (type === PluginTypeEnum.personal) {
+    const { role } = await getTeamInfoByTmbId({ tmbId });
+    const plugin = await MongoPlugin.findOne({ _id: pluginId, teamId });
+    if (!plugin) {
+      return Promise.reject(PluginErrEnum.unExist);
+    }
+  }
+
+  return true;
+}