@abtnode/rbac 1.16.52-beta-20251003-083412-fdfc4e36 → 1.16.52-beta-20251005-235515-42ad5caf

package/lib/core/base.js

@@ -8,7 +8,7 @@ module.exports = class Base {
    * @param  {String}   opt.description Description of the grant
    * @param  {String}   opt.extra Extra info of the grant
    { */
-  constructor(rbac, name, { title, description, extra } = {}) {
+  constructor(rbac, name, { title, description, extra, orgId } = {}) {
     if (!rbac || !name) {
       throw new Error('One of parameters is undefined');
     }
@@ -17,6 +17,7 @@ module.exports = class Base {
     this.title = title;
     this.description = description;
     this.extra = extra;
+    this.orgId = orgId;
     this.rbac = rbac;
   }
 

package/lib/core/rbac.js

@@ -185,8 +185,8 @@ module.exports = class RBAC {
    * @param {String} opt.extra Extra info of new Role
    * @return {Role} Instance of the Role
    */
-  async createRole(roleName, add, { title, description, extra } = {}) {
-    const role = new Role(this, roleName, { title, description, extra });
+  async createRole(roleName, add, { title, description, extra, orgId } = {}) {
+    const role = new Role(this, roleName, { title, description, extra, orgId });
     if (add) {
       await role.add();
     }
@@ -256,8 +256,8 @@ module.exports = class RBAC {
    * Return all instances of Role
    * @method RBAC#getRoles
    */
-  getRoles() {
-    return this.storage.getRoles();
+  getRoles(orgId) {
+    return this.storage.getRoles(orgId);
   }
 
   /**

package/lib/core/role.js

@@ -12,12 +12,12 @@ module.exports = class Role extends Base {
    * @param {String} opt.description Description of the role
    * @param {String} opt.extra Extra info of the role
    */
-  constructor(rbac, name, { title, description, extra } = {}) {
+  constructor(rbac, name, { title, description, extra, orgId } = {}) {
     if (!Permission.isValidName(name, rbac.options.delimiter)) {
       throw new Error('Role has no valid name');
     }
 
-    super(rbac, name, { title, description, extra });
+    super(rbac, name, { title, description, extra, orgId });
   }
 
   /**

package/lib/index.js

@@ -26,9 +26,9 @@ const createRBAC = async ({ storage, data = {} } = {}) => {
 
   await rbac.init();
 
-  const createRole = async ({ name, title, description, extra, childName, permissions = [] } = {}) => {
+  const createRole = async ({ name, title, description, extra, childName, permissions = [], orgId } = {}) => {
     // add role
-    await rbac.createRole(name, true, { title, description, extra });
+    await rbac.createRole(name, true, { title, description, extra, orgId });
 
     // add grants
     const grants = [childName, ...permissions].filter(Boolean);

package/lib/store/memory.js

@@ -129,8 +129,18 @@ class Memory extends Storage {
     return undefined;
   }
 
-  getRoles() {
+  getRoles(orgId) {
     return Object.keys(this.items)
+      .filter((k) => {
+        const { instance } = this.items[k];
+        if (!orgId) {
+          return true;
+        }
+        if (instance instanceof Role) {
+          return instance.orgId === orgId;
+        }
+        return false;
+      })
       .map((k) => this.items[k])
       .reduce((filtered, item) => {
         const { instance } = item;

package/lib/store/nedb.js

@@ -46,6 +46,7 @@ class Nedb extends Storage {
       title: item.title,
       description: item.description,
       extra: item.extra,
+      orgId: item.orgId,
     };
 
     if (item instanceof Role) {
@@ -178,10 +179,14 @@ class Nedb extends Storage {
     return undefined;
   }
 
-  async getRoles() {
+  async getRoles(orgId) {
+    const where = { type: ItemTypes.Role };
+    if (orgId) {
+      where.orgId = orgId;
+    }
     const roles = await new Promise((resolve, reject) => {
       this.db
-        .cursor({ type: ItemTypes.Role })
+        .cursor(where)
         .sort({ createdAt: -1 })
         .exec((err, docs) => {
           if (err) {
@@ -280,8 +285,8 @@ class Nedb extends Storage {
    *  grants: string[]
    */
   resolveRole(item) {
-    const { name, title, description, extra } = item;
-    const role = new Role(this.rbac, name, { title, description, extra });
+    const { name, title, description, extra, orgId } = item;
+    const role = new Role(this.rbac, name, { title, description, extra, orgId });
     role.grants = item.grants;
     return role;
   }

package/lib/store/sequelize.js

@@ -27,6 +27,7 @@ class SequelizeStorage extends Storage {
       title: item.title,
       description: item.description,
       extra: item.extra,
+      orgId: item.orgId,
     };
 
     if (item instanceof Role) {
@@ -133,9 +134,13 @@ class SequelizeStorage extends Storage {
     return undefined;
   }
 
-  async getRoles() {
+  async getRoles(orgId) {
     // 因为对象 JSON 有循环引用, 所以无法用原来的缓存
-    const roles = await this.db.find({ type: ItemTypes.Role }, {}, { createdAt: -1 });
+    const where = { type: ItemTypes.Role };
+    if (orgId) {
+      where.orgId = orgId;
+    }
+    const roles = await this.db.find(where, {}, { createdAt: -1 });
     return roles.map((item) => this.resolveRole(item));
   }
 
@@ -197,8 +202,8 @@ class SequelizeStorage extends Storage {
    *  grants: string[]
    */
   resolveRole(item) {
-    const { name, title, description, extra } = item;
-    const role = new Role(this.rbac, name, { title, description, extra });
+    const { name, title, description, extra, orgId } = item;
+    const role = new Role(this.rbac, name, { title, description, extra, orgId });
     role.grants = item.grants;
     return role;
   }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.52-beta-20251003-083412-fdfc4e36",
+  "version": "1.16.52-beta-20251005-235515-42ad5caf",
   "description": "Simple lib to manage access controls in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -19,15 +19,15 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.52-beta-20251003-083412-fdfc4e36",
-    "@abtnode/db": "1.16.52-beta-20251003-083412-fdfc4e36",
-    "@abtnode/db-cache": "1.16.52-beta-20251003-083412-fdfc4e36",
-    "@abtnode/util": "1.16.52-beta-20251003-083412-fdfc4e36",
+    "@abtnode/constant": "1.16.52-beta-20251005-235515-42ad5caf",
+    "@abtnode/db": "1.16.52-beta-20251005-235515-42ad5caf",
+    "@abtnode/db-cache": "1.16.52-beta-20251005-235515-42ad5caf",
+    "@abtnode/util": "1.16.52-beta-20251005-235515-42ad5caf",
     "fs-extra": "^11.2.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "jest": "^29.7.0"
   },
-  "gitHead": "973c4fe0d6c1bb59c9101cea4866105ab5ec89d2"
+  "gitHead": "7b295929a123edac2cb292c43f2edda0d3e3e6b8"
 }