casbin 5.20.3 → 5.21.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [5.21.0](https://github.com/casbin/node-casbin/compare/v5.20.4...v5.21.0) (2023-01-21)
+
+
+### Features
+
+* support setNamedRoleManager() ([#416](https://github.com/casbin/node-casbin/issues/416)) ([869e8f9](https://github.com/casbin/node-casbin/commit/869e8f989b899073e071fa90777584f12cde0856))
+
+## [5.20.4](https://github.com/casbin/node-casbin/compare/v5.20.3...v5.20.4) (2023-01-20)
+
+
+### Bug Fixes
+
+* add groupPolicy for GetPermissionForUser in frontend.ts ([#415](https://github.com/casbin/node-casbin/issues/415)) ([5d1a679](https://github.com/casbin/node-casbin/commit/5d1a6795f94af487218f10dce85fe191fb0dea37))
+
 ## [5.20.3](https://github.com/casbin/node-casbin/compare/v5.20.2...v5.20.3) (2023-01-10)
 
 

package/lib/cjs/coreEnforcer.d.ts

@@ -69,6 +69,13 @@ export declare class CoreEnforcer {
      * @param rm the role manager.
      */
     setRoleManager(rm: RoleManager): void;
+    /**
+     * setRoleManager sets the role manager for the named policy.
+     *
+     * @param ptype the named policy.
+     * @param rm the role manager.
+     */
+    setNamedRoleManager(ptype: string, rm: RoleManager): void;
     /**
      * getRoleManager gets the current role manager.
      */

package/lib/cjs/coreEnforcer.js

@@ -113,6 +113,15 @@ class CoreEnforcer {
     setRoleManager(rm) {
         this.rmMap.set('g', rm);
     }
+    /**
+     * setRoleManager sets the role manager for the named policy.
+     *
+     * @param ptype the named policy.
+     * @param rm the role manager.
+     */
+    setNamedRoleManager(ptype, rm) {
+        this.rmMap.set(ptype, rm);
+    }
     /**
      * getRoleManager gets the current role manager.
      */

package/lib/cjs/frontend.js

@@ -14,6 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.casbinJsGetPermissionForUser = void 0;
+const lodash_1 = require("lodash");
 const util_1 = require("./util");
 /**
  * Experiment!
@@ -40,10 +41,15 @@ async function casbinJsGetPermissionForUser(e, user) {
     s += '[matchers]\n';
     s += `m = ${(_l = (_k = m.get('m')) === null || _k === void 0 ? void 0 : _k.get('m')) === null || _l === void 0 ? void 0 : _l.value.replace(/_/g, '.')}`;
     obj['m'] = s;
-    obj['p'] = util_1.deepCopy(await e.getPolicy());
-    for (const arr of obj['p']) {
-        arr.splice(0, 0, 'p');
-    }
+    const policy = util_1.deepCopy(await e.getPolicy());
+    const groupPolicy = util_1.deepCopy(await e.getGroupingPolicy());
+    policy.forEach((item) => {
+        item.unshift('p');
+    });
+    groupPolicy.forEach((item) => {
+        item.unshift('g');
+    });
+    obj['p'] = lodash_1.concat(policy, groupPolicy);
     return JSON.stringify(obj);
 }
 exports.casbinJsGetPermissionForUser = casbinJsGetPermissionForUser;

package/lib/esm/coreEnforcer.d.ts

@@ -69,6 +69,13 @@ export declare class CoreEnforcer {
      * @param rm the role manager.
      */
     setRoleManager(rm: RoleManager): void;
+    /**
+     * setRoleManager sets the role manager for the named policy.
+     *
+     * @param ptype the named policy.
+     * @param rm the role manager.
+     */
+    setNamedRoleManager(ptype: string, rm: RoleManager): void;
     /**
      * getRoleManager gets the current role manager.
      */

package/lib/esm/coreEnforcer.js

@@ -110,6 +110,15 @@ export class CoreEnforcer {
     setRoleManager(rm) {
         this.rmMap.set('g', rm);
     }
+    /**
+     * setRoleManager sets the role manager for the named policy.
+     *
+     * @param ptype the named policy.
+     * @param rm the role manager.
+     */
+    setNamedRoleManager(ptype, rm) {
+        this.rmMap.set(ptype, rm);
+    }
     /**
      * getRoleManager gets the current role manager.
      */

package/lib/esm/frontend.js

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+import { concat } from 'lodash';
 import { deepCopy } from './util';
 /**
  * Experiment!
@@ -37,9 +38,14 @@ export async function casbinJsGetPermissionForUser(e, user) {
     s += '[matchers]\n';
     s += `m = ${(_l = (_k = m.get('m')) === null || _k === void 0 ? void 0 : _k.get('m')) === null || _l === void 0 ? void 0 : _l.value.replace(/_/g, '.')}`;
     obj['m'] = s;
-    obj['p'] = deepCopy(await e.getPolicy());
-    for (const arr of obj['p']) {
-        arr.splice(0, 0, 'p');
-    }
+    const policy = deepCopy(await e.getPolicy());
+    const groupPolicy = deepCopy(await e.getGroupingPolicy());
+    policy.forEach((item) => {
+        item.unshift('p');
+    });
+    groupPolicy.forEach((item) => {
+        item.unshift('g');
+    });
+    obj['p'] = concat(policy, groupPolicy);
     return JSON.stringify(obj);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "casbin",
-  "version": "5.20.3",
+  "version": "5.21.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",