Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 17:08:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

organization scope in operation

Browse source
This commit is contained in:
kriks7iitk 2024-08-06 14:14:38 +05:30
parent ca9c8aeb58
commit 6cdde65b80
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/ManageGroupPermissionsV2/groupPermissions.theme.scss
View file

@ -411,7 +411,7 @@
transition: background-color 0.3s ease;
border-bottom: 1px solid var(--slate5);
display: flex;
align-items:baseline;
align-items:flex-start;
padding: 12px;
gap: 10px;

4
server/src/controllers/group_permissions.controller.v2.ts
View file

@ -189,6 +189,10 @@ export class GroupPermissionsControllerV2 {
const granularPermissions = await this.granularPermissionsService.get(granularPermissionsId);
const group = granularPermissions.group;
console.log('logging user');
console.log(user);
validateGranularPermissionUpdateOperation(group, user.organizationId);
return await this.granularPermissionsService.update(granularPermissionsId, {
group: group,

2
server/src/modules/user_resource_permissions/utility/granular-permissios.utility.ts
View file

@ -12,7 +12,7 @@ export function validateGranularPermissionCreateOperation(group: GroupPermission
}
export function validateGranularPermissionUpdateOperation(group: GroupPermissions, organizationId: string) {
if (group.organizationId === organizationId) throw new BadRequestException(ERROR_HANDLER.GROUP_DOES_NOT_EXIST);
if (group.organizationId !== organizationId) throw new BadRequestException(ERROR_HANDLER.GROUP_DOES_NOT_EXIST);
if (group.name === USER_ROLE.ADMIN)
throw new BadRequestException(ERROR_HANDLER.ADMIN_DEFAULT_GROUP_GRANULAR_PERMISSIONS);
}