From 05ebeab91a2835fe80c42626ced8fc8aba426bb0 Mon Sep 17 00:00:00 2001 From: Artem Niehrieiev Date: Wed, 13 Mar 2024 11:07:35 +0000 Subject: [PATCH 1/2] removed "fullaccess" and and uppercase access levels --- .../permission-custom-repository-extension.ts | 3 --- .../user-access-custom-repository-extension.ts | 14 ++------------ backend/src/enums/access-level.enum.ts | 4 ---- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/backend/src/entities/permission/repository/permission-custom-repository-extension.ts b/backend/src/entities/permission/repository/permission-custom-repository-extension.ts index 9865cc43c..44cc1c12c 100644 --- a/backend/src/entities/permission/repository/permission-custom-repository-extension.ts +++ b/backend/src/entities/permission/repository/permission-custom-repository-extension.ts @@ -1,4 +1,3 @@ - import { AccessLevelEnum } from '../../../enums/access-level.enum.js'; import { PermissionTypeEnum } from '../../../enums/permission-type.enum.js'; import { GroupEntity } from '../../group/group.entity.js'; @@ -38,7 +37,6 @@ export const permissionCustomRepositoryExtension = { if (connectionPermission) { switch (connectionPermission.accessLevel.toLowerCase()) { case AccessLevelEnum.edit: - case AccessLevelEnum.fullaccess: connectionAccessLevel = AccessLevelEnum.edit; break; case AccessLevelEnum.readonly: @@ -65,7 +63,6 @@ export const permissionCustomRepositoryExtension = { if (groupPermission) { switch (groupPermission.accessLevel.toLowerCase()) { case AccessLevelEnum.edit: - case AccessLevelEnum.fullaccess: groupAccessLevel = AccessLevelEnum.edit; break; case AccessLevelEnum.readonly: diff --git a/backend/src/entities/user-access/repository/user-access-custom-repository-extension.ts b/backend/src/entities/user-access/repository/user-access-custom-repository-extension.ts index c771be8d3..da128b038 100644 --- a/backend/src/entities/user-access/repository/user-access-custom-repository-extension.ts +++ b/backend/src/entities/user-access/repository/user-access-custom-repository-extension.ts @@ -23,10 +23,7 @@ export const userAccessCustomReposiotoryExtension = { const connectionAccessLevels = resultPermissions.map((permission: PermissionEntity) => { return permission.accessLevel.toLowerCase(); }); - if ( - connectionAccessLevels.includes(AccessLevelEnum.fullaccess) || - connectionAccessLevels.includes(AccessLevelEnum.edit) - ) { + if (connectionAccessLevels.includes(AccessLevelEnum.edit)) { return AccessLevelEnum.edit; } if (connectionAccessLevels.includes(AccessLevelEnum.readonly)) { @@ -39,7 +36,6 @@ export const userAccessCustomReposiotoryExtension = { const connectionAccessLevel = await this.getUserConnectionAccessLevel(cognitoUserName, connectionId); switch (connectionAccessLevel) { case AccessLevelEnum.edit: - case AccessLevelEnum.fullaccess: case AccessLevelEnum.readonly: return true; default: @@ -51,7 +47,6 @@ export const userAccessCustomReposiotoryExtension = { const connectionAccessLevel = await this.getUserConnectionAccessLevel(cognitoUserName, connectionId); switch (connectionAccessLevel) { case AccessLevelEnum.edit: - case AccessLevelEnum.fullaccess: return true; case AccessLevelEnum.readonly: return false; @@ -81,10 +76,7 @@ export const userAccessCustomReposiotoryExtension = { const connectionAccessLevels = resultPermissions.map((permission: PermissionEntity) => { return permission.accessLevel.toLowerCase(); }); - if ( - connectionAccessLevels.includes(AccessLevelEnum.fullaccess) || - connectionAccessLevels.includes(AccessLevelEnum.edit) - ) { + if (connectionAccessLevels.includes(AccessLevelEnum.edit)) { return AccessLevelEnum.edit; } if (connectionAccessLevels.includes(AccessLevelEnum.readonly)) { @@ -97,7 +89,6 @@ export const userAccessCustomReposiotoryExtension = { const userGroupAccessLevel = await this.getGroupAccessLevel(cognitoUserName, groupId); switch (userGroupAccessLevel) { case AccessLevelEnum.edit: - case AccessLevelEnum.fullaccess: case AccessLevelEnum.readonly: return true; default: @@ -109,7 +100,6 @@ export const userAccessCustomReposiotoryExtension = { const userGroupAccessLevel = await this.getGroupAccessLevel(cognitoUserName, groupId); switch (userGroupAccessLevel) { case AccessLevelEnum.edit: - case AccessLevelEnum.fullaccess: return true; case AccessLevelEnum.readonly: return false; diff --git a/backend/src/enums/access-level.enum.ts b/backend/src/enums/access-level.enum.ts index 52e900dc2..6a9121c49 100644 --- a/backend/src/enums/access-level.enum.ts +++ b/backend/src/enums/access-level.enum.ts @@ -1,9 +1,5 @@ export enum AccessLevelEnum { - FullAccess = 'FullAccess', - fullaccess = 'fullaccess', - Readonly = 'Readonly', readonly = 'readonly', - Edit = 'Edit', edit = 'edit', visibility = 'visibility', add = 'add', From 3c3192d3d45d70223cea3ce5763bb95eb49f4c35 Mon Sep 17 00:00:00 2001 From: Artem Niehrieiev Date: Wed, 13 Mar 2024 11:08:08 +0000 Subject: [PATCH 2/2] Remove redundant access level enum value --- backend/src/enums/access-level.enum.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/enums/access-level.enum.ts b/backend/src/enums/access-level.enum.ts index 6a9121c49..f49cc60a7 100644 --- a/backend/src/enums/access-level.enum.ts +++ b/backend/src/enums/access-level.enum.ts @@ -4,6 +4,5 @@ export enum AccessLevelEnum { visibility = 'visibility', add = 'add', delete = 'delete', - None = 'None', none = 'none', }