ChatGPT/FastGPT
1
0
Fork 0
mirror of https://github.com/labring/FastGPT.git synced 2025-07-22 20:37:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix/group (#3012)

Browse Source 
* fix: app/dataset list private resource bug

* fix: auth owner
This commit is contained in:
Finley Ge
2024-10-29 11:22:21 +08:00
committed by GitHub
parent e06d72e86e
commit efc4e860b7
4 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/service/support/permission/app/auth.ts
View File

@@ -72,6 +72,12 @@ export const authAppByTmbId = async ({
const isOwner = tmbPer.isOwner || String(app.tmbId) === String(tmbId);
const { Per } = await (async () => {
if (isOwner) {
return {
Per: new AppPermission({ isOwner: true })
};
}
if (
AppFolderTypeList.includes(app.type) ||
app.inheritPermission === false ||

5
packages/service/support/permission/dataset/auth.ts
View File

@@ -64,6 +64,11 @@ export const authDatasetByTmbId = async ({
// get dataset permission or inherit permission from parent folder.
const { Per } = await (async () => {
if (isOwner) {
return {
Per: new DatasetPermission({ isOwner: true })
};
}
if (
dataset.type === DatasetTypeEnum.folder ||
dataset.inheritPermission === false ||

24
projects/app/src/pages/api/core/app/list.ts
View File

@@ -107,16 +107,11 @@ async function handler(req: ApiRequestProps<ListAppBody>): Promise<AppListItemTy
.limit(searchKey ? 20 : 1000)
.lean(),
MongoResourcePermission.find({
$and: [
{
resourceType: PerResourceTypeEnum.app,
teamId,
resourceId: {
$exists: true
}
},
{ $or: [{ tmbId }, { groupId: { $in: myGroupIds } }] }
]
resourceType: PerResourceTypeEnum.app,
teamId,
resourceId: {
$exists: true
}
}).lean()
]);
@@ -143,7 +138,8 @@ async function handler(req: ApiRequestProps<ListAppBody>): Promise<AppListItemTy
per: tmbPer ?? groupPer ?? AppDefaultPermissionVal,
isOwner: String(app.tmbId) === String(tmbId) || myPer.isOwner
}),
privateApp: !tmbPer && !groupPer
privateApp:
perList.filter((item) => String(item.resourceId) === String(app._id)).length <= 1
};
} else {
const tmbPer = perList.find(
@@ -160,14 +156,16 @@ async function handler(req: ApiRequestProps<ListAppBody>): Promise<AppListItemTy
per: tmbPer ?? groupPer ?? AppDefaultPermissionVal,
isOwner: String(app.tmbId) === String(tmbId) || myPer.isOwner
}),
privateApp: !tmbPer && !groupPer
privateApp:
perList.filter((item) => String(item.resourceId) === String(app._id)).length <= 1
};
}
})();
return {
...app,
permission: Per,
privateApp: privateApp
privateApp
};
})
.filter((app) => app.permission.hasReadPer);

22
projects/app/src/pages/api/core/dataset/list.ts
View File

@@ -92,16 +92,11 @@ async function handler(req: ApiRequestProps<GetDatasetListBody>) {
})
.lean(),
MongoResourcePermission.find({
$and: [
{
resourceType: PerResourceTypeEnum.dataset,
teamId,
resourceId: {
$exists: true
}
},
{ $or: [{ tmbId }, { groupId: { $in: myGroupIds } }] }
]
resourceType: PerResourceTypeEnum.dataset,
teamId,
resourceId: {
$exists: true
}
}).lean()
]);
@@ -127,7 +122,8 @@ async function handler(req: ApiRequestProps<GetDatasetListBody>) {
per: tmbPer ?? groupPer ?? DatasetDefaultPermissionVal,
isOwner: String(parentDataset.tmbId) === tmbId || myPer.isOwner
}),
privateDataset: !tmbPer && !groupPer
privateDataset:
perList.filter((item) => String(item.resourceId) === String(dataset._id)).length <= 1
};
} else {
const tmbPer = perList.find(
@@ -148,10 +144,12 @@ async function handler(req: ApiRequestProps<GetDatasetListBody>) {
per: tmbPer ?? groupPer ?? DatasetDefaultPermissionVal,
isOwner: String(dataset.tmbId) === tmbId || myPer.isOwner
}),
privateDataset: !tmbPer && !groupPer
privateDataset:
perList.filter((item) => String(item.resourceId) === String(dataset._id)).length <= 1
};
}
})();
return {
...dataset,
permission: Per,