From 6cdde65b800b57ab15144255e1eb8de559eeec13 Mon Sep 17 00:00:00 2001 From: kriks7iitk Date: Tue, 6 Aug 2024 14:14:38 +0530 Subject: [PATCH] organization scope in operation --- .../src/ManageGroupPermissionsV2/groupPermissions.theme.scss | 2 +- server/src/controllers/group_permissions.controller.v2.ts | 4 ++++ .../utility/granular-permissios.utility.ts | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/ManageGroupPermissionsV2/groupPermissions.theme.scss b/frontend/src/ManageGroupPermissionsV2/groupPermissions.theme.scss index b0fee966ca..49ac01e89a 100644 --- a/frontend/src/ManageGroupPermissionsV2/groupPermissions.theme.scss +++ b/frontend/src/ManageGroupPermissionsV2/groupPermissions.theme.scss @@ -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; diff --git a/server/src/controllers/group_permissions.controller.v2.ts b/server/src/controllers/group_permissions.controller.v2.ts index 787d632dc5..4cbd28c4b4 100644 --- a/server/src/controllers/group_permissions.controller.v2.ts +++ b/server/src/controllers/group_permissions.controller.v2.ts @@ -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, diff --git a/server/src/modules/user_resource_permissions/utility/granular-permissios.utility.ts b/server/src/modules/user_resource_permissions/utility/granular-permissios.utility.ts index 91cf31dd6a..c7eb0b0a37 100644 --- a/server/src/modules/user_resource_permissions/utility/granular-permissios.utility.ts +++ b/server/src/modules/user_resource_permissions/utility/granular-permissios.utility.ts @@ -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); }