Skip to content

Commit d674741

Browse files
authored
fix: permission conflict after moving (#3639)
1 parent e02a7ab commit d674741

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

projects/app/src/pages/api/core/app/update.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
2323
import { TeamWritePermissionVal } from '@fastgpt/global/support/permission/user/constant';
2424
import { AppErrEnum } from '@fastgpt/global/common/error/code/app';
2525
import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller';
26+
import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema';
2627

2728
export type AppUpdateQuery = {
2829
appId: string;
@@ -148,6 +149,12 @@ async function handler(req: ApiRequestProps<AppUpdateBody, AppUpdateQuery>) {
148149
collaborators: parentClbsAndGroups,
149150
session
150151
});
152+
} else {
153+
// Not folder, delete all clb
154+
await MongoResourcePermission.deleteMany(
155+
{ resourceType: PerResourceTypeEnum.app, teamId: app.teamId, resourceId: app._id },
156+
{ session }
157+
);
151158
}
152159
return onUpdate(session);
153160
});

projects/app/src/pages/api/core/dataset/update.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import { MongoDatasetTraining } from '@fastgpt/service/core/dataset/training/sch
2929
import { MongoDatasetCollection } from '@fastgpt/service/core/dataset/collection/schema';
3030
import { addDays } from 'date-fns';
3131
import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller';
32+
import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema';
3233

3334
export type DatasetUpdateQuery = {};
3435
export type DatasetUpdateResponse = any;
@@ -175,6 +176,12 @@ async function handler(
175176
collaborators: parentClbsAndGroups,
176177
session
177178
});
179+
} else {
180+
// Not folder, delete all clb
181+
await MongoResourcePermission.deleteMany(
182+
{ resourceId: id, teamId: dataset.teamId, resourceType: PerResourceTypeEnum.dataset },
183+
{ session }
184+
);
178185
}
179186
return onUpdate(session);
180187
} else {

0 commit comments

Comments
 (0)