Skip to content

Backend development #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Artuomka merged 2 commits into from
Mar 13, 2024
Merged

Backend development #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05ebeab
removed "fullaccess" and and uppercase access levels
Artuomka Mar 13, 2024
3c3192d
Remove redundant access level enum value
Artuomka Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions backend/src/entities/permission/repository/permission-custom-repository-extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
14 changes: 2 additions & 12 deletions backend/src/entities/user-access/repository/user-access-custom-repository-extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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:
Expand All @@ -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;
Expand Down Expand Up @@ -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)) {
Expand All @@ -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:
Expand All @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions backend/src/enums/access-level.enum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
export enum AccessLevelEnum {
FullAccess = 'FullAccess',
fullaccess = 'fullaccess',
Readonly = 'Readonly',
readonly = 'readonly',
Edit = 'Edit',
edit = 'edit',
visibility = 'visibility',
add = 'add',
delete = 'delete',
None = 'None',
none = 'none',
}