Merge pull request #7 from cobuildlab/hotfix/main/createRules-error

fix assign diferents permissions to same role
cobuildlab · Jun 3, 2021 · fd0078e · fd0078e
2 parents 577b14e + eab0f12
commit fd0078e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cobuildlab/rbac",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",

diff --git a/src/__tests__/module.test.ts b/src/__tests__/module.test.ts
@@ -8,6 +8,7 @@ test('Test static rules', () => {
   }
   enum Permissions {
     DASHBOARD = 'DASHBOARD',
+    SETTINGS = 'SETTINGS',
   }
 
   const staticRules = new RBAC<Roles, Permissions>(Roles.ADMIN);
@@ -18,6 +19,12 @@ test('Test static rules', () => {
     true,
     'Access granted',
   );
+  staticRules.createRule(
+    Roles.ADMIN,
+    Permissions.SETTINGS,
+    true,
+    'Access granted',
+  );
   staticRules.createRule(
     Roles.MANAGER,
     Permissions.DASHBOARD,
@@ -28,6 +35,10 @@ test('Test static rules', () => {
     true,
     'Access granted',
   ]);
+  expect(staticRules.check(Roles.ADMIN, Permissions.SETTINGS)).toStrictEqual([
+    true,
+    'Access granted',
+  ]);
   expect(
     staticRules.check(Roles.MANAGER, Permissions.DASHBOARD),
   ).toStrictEqual([false, 'Access denied']);

diff --git a/src/rbac.ts b/src/rbac.ts
@@ -28,15 +28,25 @@ export class RBAC<
     test: boolean | ValidatorFunctionType<D[P]>,
     message?: string,
   ): void {
-    Object.assign(this.rules, {
-      [roleName]: {
+    if (this.rules[roleName]) {
+      Object.assign(this.rules[roleName], {
         [permissionName]: {
           can: typeof test === 'boolean' ? test : undefined,
           dynamic: typeof test === 'function' ? test : undefined,
           message,
         },
-      },
-    });
+      });
+    } else {
+      Object.assign(this.rules, {
+        [roleName]: {
+          [permissionName]: {
+            can: typeof test === 'boolean' ? test : undefined,
+            dynamic: typeof test === 'function' ? test : undefined,
+            message,
+          },
+        },
+      });
+    }
   }
 
   /**