@nocobase/plugin-acl 1.4.0-beta.1 → 1.5.0-alpha.3

package/dist/externalVersion.js

@@ -11,21 +11,20 @@ module.exports = {
   "antd": "5.12.8",
   "react": "18.2.0",
   "react-i18next": "11.18.6",
-  "@nocobase/client": "1.4.0-beta.1",
+  "@nocobase/client": "1.5.0-alpha.3",
   "@formily/shared": "2.3.2",
   "@formily/react": "2.3.0",
   "@ant-design/icons": "5.2.6",
-  "@nocobase/utils": "1.4.0-beta.1",
-  "@nocobase/actions": "1.4.0-beta.1",
-  "@nocobase/cache": "1.4.0-beta.1",
-  "@nocobase/database": "1.4.0-beta.1",
-  "@nocobase/server": "1.4.0-beta.1",
-  "async-mutex": "0.3.2",
+  "@nocobase/utils": "1.5.0-alpha.3",
+  "@nocobase/actions": "1.5.0-alpha.3",
+  "@nocobase/cache": "1.5.0-alpha.3",
+  "@nocobase/database": "1.5.0-alpha.3",
+  "@nocobase/server": "1.5.0-alpha.3",
   "lodash": "4.17.21",
-  "@nocobase/test": "1.4.0-beta.1",
+  "@nocobase/test": "1.5.0-alpha.3",
   "@formily/core": "2.3.0",
   "ahooks": "3.7.8",
   "@formily/antd-v5": "1.1.9",
   "antd-style": "3.7.1",
-  "@nocobase/acl": "1.4.0-beta.1"
+  "@nocobase/acl": "1.5.0-alpha.3"
 };

package/dist/server/model/RoleResourceModel.d.ts

@@ -15,6 +15,6 @@ export declare class RoleResourceModel extends Model {
     }): Promise<void>;
     writeToACL(options: {
         acl: ACL;
-        transaction: any;
+        transaction?: any;
     }): Promise<void>;
 }

package/dist/server/server.d.ts

@@ -15,6 +15,7 @@ export declare class PluginACLServer extends Plugin {
     get acl(): import("@nocobase/acl").ACL;
     writeResourceToACL(resourceModel: RoleResourceModel, transaction: Transaction): Promise<void>;
     writeActionToACL(actionModel: RoleResourceActionModel, transaction: Transaction): Promise<void>;
+    handleSyncMessage(message: any): Promise<void>;
     writeRolesToACL(options: any): Promise<void>;
     writeRoleToACL(role: RoleModel, options?: any): Promise<void>;
     beforeLoad(): Promise<void>;

package/dist/server/server.js

@@ -43,7 +43,6 @@ module.exports = __toCommonJS(server_exports);
 var import_actions = require("@nocobase/actions");
 var import_database = require("@nocobase/database");
 var import_server = require("@nocobase/server");
-var import_async_mutex = require("async-mutex");
 var import_lodash = __toESM(require("lodash"));
 var import_path = require("path");
 var import_available_actions = require("./actions/available-actions");
@@ -74,6 +73,23 @@ class PluginACLServer extends import_server.Plugin {
       resourceName: resource.get("name")
     });
   }
+  async handleSyncMessage(message) {
+    const { type } = message;
+    if (type === "syncRole") {
+      const { roleName } = message;
+      const role = await this.app.db.getRepository("roles").findOne({
+        filter: {
+          name: roleName
+        }
+      });
+      await this.writeRoleToACL(role, {
+        withOutResources: true
+      });
+      await this.app.emitAsync("acl:writeResources", {
+        roleName: role.get("name")
+      });
+    }
+  }
   async writeRolesToACL(options) {
     const roles = await this.app.db.getRepository("roles").find({
       appends: ["resources", "resources.actions"]
@@ -211,6 +227,15 @@ class PluginACLServer extends import_server.Plugin {
           transaction
         });
       }
+      this.sendSyncMessage(
+        {
+          type: "syncRole",
+          roleName: model.get("name")
+        },
+        {
+          transaction: options.transaction
+        }
+      );
     });
     this.app.db.on("roles.afterDestroy", (model) => {
       const roleName = model.get("name");
@@ -260,9 +285,9 @@ class PluginACLServer extends import_server.Plugin {
         });
       }
     });
-    const mutex = new import_async_mutex.Mutex();
     this.app.db.on("fields.afterDestroy", async (model, options) => {
-      await mutex.runExclusive(async () => {
+      const lockKey = `${this.name}:fields.afterDestroy:${model.get("collectionName")}:${model.get("name")}`;
+      await this.app.lockManager.runExclusive(lockKey, async () => {
         const collectionName = model.get("collectionName");
         const fieldName = model.get("name");
         const resourceActions = await this.app.db.getRepository("dataSourcesRolesResourcesActions").find({

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "权限控制",
   "description": "Based on roles, resources, and actions, access control can precisely manage interface configuration permissions, data operation permissions, menu access permissions, and plugin permissions.",
   "description.zh-CN": "基于角色、资源和操作的权限控制，可以精确控制界面配置权限、数据操作权限、菜单访问权限、插件权限。",
-  "version": "1.4.0-beta.1",
+  "version": "1.5.0-alpha.3",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/acl",
@@ -14,7 +14,6 @@
   ],
   "devDependencies": {
     "@types/jsonwebtoken": "^8.5.8",
-    "async-mutex": "^0.3.2",
     "jsonwebtoken": "^8.5.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
@@ -34,5 +33,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "1ece4e558ba445088dbb658bd458eb0004295326"
+  "gitHead": "5e01d81e7bb07f9a35b271ce903fb0dcd0d83fcf"
 }