Commit d6747417 by a.e Committed by GitHub

fix: permission conflict after moving (#3639)

parent e02a7ab3
...@@ -23,6 +23,7 @@ import { authUserPer } from '@fastgpt/service/support/permission/user/auth'; ...@@ -23,6 +23,7 @@ import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
import { TeamWritePermissionVal } from '@fastgpt/global/support/permission/user/constant'; import { TeamWritePermissionVal } from '@fastgpt/global/support/permission/user/constant';
import { AppErrEnum } from '@fastgpt/global/common/error/code/app'; import { AppErrEnum } from '@fastgpt/global/common/error/code/app';
import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller'; import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller';
import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema';
export type AppUpdateQuery = { export type AppUpdateQuery = {
appId: string; appId: string;
...@@ -148,6 +149,12 @@ async function handler(req: ApiRequestProps<AppUpdateBody, AppUpdateQuery>) { ...@@ -148,6 +149,12 @@ async function handler(req: ApiRequestProps<AppUpdateBody, AppUpdateQuery>) {
collaborators: parentClbsAndGroups, collaborators: parentClbsAndGroups,
session session
}); });
} else {
// Not folder, delete all clb
await MongoResourcePermission.deleteMany(
{ resourceType: PerResourceTypeEnum.app, teamId: app.teamId, resourceId: app._id },
{ session }
);
} }
return onUpdate(session); return onUpdate(session);
}); });
......
...@@ -29,6 +29,7 @@ import { MongoDatasetTraining } from '@fastgpt/service/core/dataset/training/sch ...@@ -29,6 +29,7 @@ import { MongoDatasetTraining } from '@fastgpt/service/core/dataset/training/sch
import { MongoDatasetCollection } from '@fastgpt/service/core/dataset/collection/schema'; import { MongoDatasetCollection } from '@fastgpt/service/core/dataset/collection/schema';
import { addDays } from 'date-fns'; import { addDays } from 'date-fns';
import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller'; import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller';
import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema';
export type DatasetUpdateQuery = {}; export type DatasetUpdateQuery = {};
export type DatasetUpdateResponse = any; export type DatasetUpdateResponse = any;
...@@ -175,6 +176,12 @@ async function handler( ...@@ -175,6 +176,12 @@ async function handler(
collaborators: parentClbsAndGroups, collaborators: parentClbsAndGroups,
session session
}); });
} else {
// Not folder, delete all clb
await MongoResourcePermission.deleteMany(
{ resourceId: id, teamId: dataset.teamId, resourceType: PerResourceTypeEnum.dataset },
{ session }
);
} }
return onUpdate(session); return onUpdate(session);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment