casbin 5.13.1 → 5.14.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [5.14.0](https://github.com/casbin/node-casbin/compare/v5.13.2...v5.14.0) (2022-03-18)
+
+
+### Features
+
+* **rbac:** add `getUsersForRoleInDomain` & `getRolesForUserInDomain` ([#351](https://github.com/casbin/node-casbin/issues/351)) ([4896ca2](https://github.com/casbin/node-casbin/commit/4896ca260c2f35672b9b520969898155ec616f0b)), closes [#304](https://github.com/casbin/node-casbin/issues/304)
+
+## [5.13.2](https://github.com/casbin/node-casbin/compare/v5.13.1...v5.13.2) (2022-03-02)
+
+
+### Bug Fixes
+
+* *matcher result should be boolean or number* for KeyGet2 ([#347](https://github.com/casbin/node-casbin/issues/347)) ([0257078](https://github.com/casbin/node-casbin/commit/0257078e1302f5ef081ec143afe5c470f4f862e9))
+
 ## [5.13.1](https://github.com/casbin/node-casbin/compare/v5.13.0...v5.13.1) (2022-02-22)
 
 

package/examples/basic_keyget2_model.conf

@@ -0,0 +1,11 @@
+[request_definition]
+r = sub, obj
+
+[policy_definition]
+p = sub, obj
+
+[policy_effect]
+e = some(where (p.eft == allow))
+
+[matchers]
+m = keyGet2(r.obj, p.obj, 'id')

package/examples/basic_keyget2_policy.csv

@@ -0,0 +1 @@
+p, alice, /data/:id

package/lib/cjs/coreEnforcer.js

@@ -387,8 +387,16 @@ class CoreEnforcer {
                             eftRes = result;
                         }
                         break;
+                    case 'string':
+                        if (result === '') {
+                            eftRes = effect_1.Effect.Indeterminate;
+                        }
+                        else {
+                            eftRes = effect_1.Effect.Allow;
+                        }
+                        break;
                     default:
-                        throw new Error('matcher result should be boolean or number');
+                        throw new Error('matcher result should only be of type boolean, number, or string');
                 }
                 const eft = parameters['p_eft'];
                 if (eft && eftRes === effect_1.Effect.Allow) {

package/lib/cjs/enforcer.d.ts

@@ -186,6 +186,24 @@ export declare class Enforcer extends ManagementEnforcer {
      * But getImplicitUsersForRole("user") will get: ["role:admin", "alice"].
      */
     getImplicitUsersForRole(role: string, ...domain: string[]): Promise<string[]>;
+    /**
+     * getRolesForUserInDomain gets the roles that a user has inside a domain
+     * An alias for getRolesForUser with the domain params.
+     *
+     * @param name the user.
+     * @param domain the domain.
+     * @return the roles that the user has.
+     */
+    getRolesForUserInDomain(name: string, domain: string): Promise<string[]>;
+    /**
+     * getUsersForRoleInFomain gets the users that has a role inside a domain
+     * An alias for getUsesForRole with the domain params.
+     *
+     * @param name the role.
+     * @param domain the domain.
+     * @return the users that has the role.
+     */
+    getUsersForRoleInDomain(name: string, domain: string): Promise<string[]>;
     /**
      * getImplicitUsersForPermission gets implicit users for a permission.
      * For example:

package/lib/cjs/enforcer.js

@@ -348,6 +348,28 @@ class Enforcer extends managementEnforcer_1.ManagementEnforcer {
         }
         return Array.from(res);
     }
+    /**
+     * getRolesForUserInDomain gets the roles that a user has inside a domain
+     * An alias for getRolesForUser with the domain params.
+     *
+     * @param name the user.
+     * @param domain the domain.
+     * @return the roles that the user has.
+     */
+    async getRolesForUserInDomain(name, domain) {
+        return this.getRolesForUser(name, domain);
+    }
+    /**
+     * getUsersForRoleInFomain gets the users that has a role inside a domain
+     * An alias for getUsesForRole with the domain params.
+     *
+     * @param name the role.
+     * @param domain the domain.
+     * @return the users that has the role.
+     */
+    async getUsersForRoleInDomain(name, domain) {
+        return this.getUsersForRole(name, domain);
+    }
     /**
      * getImplicitUsersForPermission gets implicit users for a permission.
      * For example:

package/lib/esm/coreEnforcer.js

@@ -384,8 +384,16 @@ export class CoreEnforcer {
                             eftRes = result;
                         }
                         break;
+                    case 'string':
+                        if (result === '') {
+                            eftRes = Effect.Indeterminate;
+                        }
+                        else {
+                            eftRes = Effect.Allow;
+                        }
+                        break;
                     default:
-                        throw new Error('matcher result should be boolean or number');
+                        throw new Error('matcher result should only be of type boolean, number, or string');
                 }
                 const eft = parameters['p_eft'];
                 if (eft && eftRes === Effect.Allow) {

package/lib/esm/enforcer.d.ts

@@ -186,6 +186,24 @@ export declare class Enforcer extends ManagementEnforcer {
      * But getImplicitUsersForRole("user") will get: ["role:admin", "alice"].
      */
     getImplicitUsersForRole(role: string, ...domain: string[]): Promise<string[]>;
+    /**
+     * getRolesForUserInDomain gets the roles that a user has inside a domain
+     * An alias for getRolesForUser with the domain params.
+     *
+     * @param name the user.
+     * @param domain the domain.
+     * @return the roles that the user has.
+     */
+    getRolesForUserInDomain(name: string, domain: string): Promise<string[]>;
+    /**
+     * getUsersForRoleInFomain gets the users that has a role inside a domain
+     * An alias for getUsesForRole with the domain params.
+     *
+     * @param name the role.
+     * @param domain the domain.
+     * @return the users that has the role.
+     */
+    getUsersForRoleInDomain(name: string, domain: string): Promise<string[]>;
     /**
      * getImplicitUsersForPermission gets implicit users for a permission.
      * For example:

package/lib/esm/enforcer.js

@@ -345,6 +345,28 @@ export class Enforcer extends ManagementEnforcer {
         }
         return Array.from(res);
     }
+    /**
+     * getRolesForUserInDomain gets the roles that a user has inside a domain
+     * An alias for getRolesForUser with the domain params.
+     *
+     * @param name the user.
+     * @param domain the domain.
+     * @return the roles that the user has.
+     */
+    async getRolesForUserInDomain(name, domain) {
+        return this.getRolesForUser(name, domain);
+    }
+    /**
+     * getUsersForRoleInFomain gets the users that has a role inside a domain
+     * An alias for getUsesForRole with the domain params.
+     *
+     * @param name the role.
+     * @param domain the domain.
+     * @return the users that has the role.
+     */
+    async getUsersForRoleInDomain(name, domain) {
+        return this.getUsersForRole(name, domain);
+    }
     /**
      * getImplicitUsersForPermission gets implicit users for a permission.
      * For example:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "casbin",
-  "version": "5.13.1",
+  "version": "5.14.0",
   "description": "An authorization library that supports access control models like ACL, RBAC, ABAC in Node.JS",
   "main": "lib/cjs/index.js",
   "typings": "lib/cjs/index.d.ts",