Merge pull request #78 from infinitybase/lb/fix/workspace-permission

Workspace Permissions
infinitybase · Feb 28, 2024 · 8d2f541 · 8d2f541
2 parents 3f5261b + 5a2fabf
commit 8d2f541
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 33 deletions.
diff --git a/src/models/Workspace.ts b/src/models/Workspace.ts
@@ -32,42 +32,47 @@ export enum PermissionRoles {
   VIEWER = 'VIEWER',
 }
 
+export enum PermissionAccess {
+  ALL = '*',
+  NONE = '',
+}
+
 //todo: change to specific permissions of each role depends the complete flow
 export const defaultPermissions = {
   [PermissionRoles.OWNER]: {
-    OWNER: ['*'],
-    ADMIN: [''],
-    MANAGER: [''],
-    SIGNER: [''],
-    VIEWER: [''],
+    OWNER: [PermissionAccess.ALL],
+    ADMIN: [PermissionAccess.NONE],
+    MANAGER: [PermissionAccess.NONE],
+    SIGNER: [PermissionAccess.NONE],
+    VIEWER: [PermissionAccess.NONE],
   },
   [PermissionRoles.ADMIN]: {
-    OWNER: [''],
-    ADMIN: ['*'],
-    MANAGER: [''],
-    SIGNER: [''],
-    VIEWER: [''],
+    OWNER: [PermissionAccess.NONE],
+    ADMIN: [PermissionAccess.ALL],
+    MANAGER: [PermissionAccess.NONE],
+    SIGNER: [PermissionAccess.NONE],
+    VIEWER: [PermissionAccess.NONE],
   },
   [PermissionRoles.MANAGER]: {
-    OWNER: [''],
-    ADMIN: [''],
-    MANAGER: ['*'],
-    SIGNER: [''],
-    VIEWER: [''],
+    OWNER: [PermissionAccess.NONE],
+    ADMIN: [PermissionAccess.NONE],
+    MANAGER: [PermissionAccess.ALL],
+    SIGNER: [PermissionAccess.NONE],
+    VIEWER: [PermissionAccess.NONE],
   },
   [PermissionRoles.SIGNER]: {
-    OWNER: [''],
-    ADMIN: [''],
-    MANAGER: [''],
-    SIGNER: [''],
-    VIEWER: [''],
+    OWNER: [PermissionAccess.NONE],
+    ADMIN: [PermissionAccess.NONE],
+    MANAGER: [PermissionAccess.NONE],
+    SIGNER: [PermissionAccess.NONE],
+    VIEWER: [PermissionAccess.NONE],
   },
   [PermissionRoles.VIEWER]: {
-    OWNER: [''],
-    ADMIN: [''],
-    MANAGER: [''],
-    SIGNER: [''],
-    VIEWER: ['*'],
+    OWNER: [PermissionAccess.NONE],
+    ADMIN: [PermissionAccess.NONE],
+    MANAGER: [PermissionAccess.NONE],
+    SIGNER: [PermissionAccess.NONE],
+    VIEWER: [PermissionAccess.ALL],
   },
 };
 

diff --git a/src/modules/workspace/controller.ts b/src/modules/workspace/controller.ts
@@ -2,7 +2,7 @@ import axios from 'axios';
 import { defaultConfig } from 'bsafe';
 import { BN, bn } from 'fuels';
 
-import { Predicate, User } from '@src/models';
+import { PermissionAccess, Predicate, User } from '@src/models';
 import {
   PermissionRoles,
   Workspace,
@@ -186,14 +186,16 @@ export class WorkspaceController {
             });
           }
 
-          const signer_permissions =
-            workspace.permissions[member][PermissionRoles.SIGNER];
-          permissions[PermissionRoles.SIGNER] = signer_permissions;
+          const memberPermission = workspace.permissions[member];
+          const signerPermission = memberPermission?.[PermissionRoles.SIGNER];
 
-          // update user permissions exepct signer objet
+          // update user permissions expect signer object
           workspace.permissions = {
             ...workspace.permissions,
-            [member]: permissions,
+            [member]: {
+              ...permissions,
+              SIGNER: signerPermission ?? [PermissionAccess.NONE],
+            },
           };
 
           return await workspace.save();

diff --git a/src/modules/workspace/services.ts b/src/modules/workspace/services.ts
@@ -1,6 +1,6 @@
 import { defaultConfig } from 'bsafe';
 
-import { User } from '@src/models';
+import { PermissionAccess, User } from '@src/models';
 import {
   IPermissions,
   PermissionRoles,
@@ -225,7 +225,9 @@ export class WorkspaceService implements IWorkspaceService {
         signers.map(s => {
           if (p[s]) {
             p[s][PermissionRoles.SIGNER] = [
-              ...p[s][PermissionRoles.SIGNER].filter(i => i != '*'),
+              ...p[s][PermissionRoles.SIGNER].filter(
+                i => i != PermissionAccess.ALL && i !== PermissionAccess.NONE,
+              ),
               predicate,
             ];
           } else {