@nocobase/plugin-acl 1.0.0-alpha.11 → 1.0.0-alpha.12

package/dist/externalVersion.js

@@ -8,24 +8,24 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.0.0-alpha.11",
+  "@nocobase/client": "1.0.0-alpha.12",
   "react": "18.2.0",
   "@formily/shared": "2.3.0",
   "antd": "5.12.8",
   "@formily/react": "2.3.0",
   "@ant-design/icons": "5.2.6",
   "react-i18next": "11.18.6",
-  "@nocobase/utils": "1.0.0-alpha.11",
-  "@nocobase/actions": "1.0.0-alpha.11",
-  "@nocobase/cache": "1.0.0-alpha.11",
-  "@nocobase/database": "1.0.0-alpha.11",
-  "@nocobase/server": "1.0.0-alpha.11",
+  "@nocobase/utils": "1.0.0-alpha.12",
+  "@nocobase/actions": "1.0.0-alpha.12",
+  "@nocobase/cache": "1.0.0-alpha.12",
+  "@nocobase/database": "1.0.0-alpha.12",
+  "@nocobase/server": "1.0.0-alpha.12",
   "async-mutex": "0.3.2",
   "lodash": "4.17.21",
-  "@nocobase/test": "1.0.0-alpha.11",
+  "@nocobase/test": "1.0.0-alpha.12",
   "@formily/core": "2.3.0",
   "ahooks": "3.7.8",
   "@formily/antd-v5": "1.1.9",
   "antd-style": "3.4.5",
-  "@nocobase/acl": "1.0.0-alpha.11"
+  "@nocobase/acl": "1.0.0-alpha.12"
 };

package/dist/server/middlewares/with-acl-meta.js

@@ -41,8 +41,7 @@ __export(with_acl_meta_exports, {
 module.exports = __toCommonJS(with_acl_meta_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_database = require("@nocobase/database");
-class NoPermissionError extends Error {
-}
+var import_acl = require("@nocobase/acl");
 function createWithACLMetaMiddleware() {
   return async (ctx, next) => {
     var _a, _b, _c, _d;
@@ -119,13 +118,13 @@ function createWithACLMetaMiddleware() {
         },
         permission: {},
         throw(...args) {
-          throw new NoPermissionError(...args);
+          throw new import_acl.NoPermissionError(...args);
         }
       };
       try {
         await acl.getActionParams(actionCtx);
       } catch (e) {
-        if (e instanceof NoPermissionError) {
+        if (e instanceof import_acl.NoPermissionError) {
           continue;
         }
         throw e;

package/dist/server/server.js

@@ -123,7 +123,9 @@ class PluginACLServer extends import_server.Plugin {
         "dataSources.roles:*",
         "dataSources:list",
         "roles.dataSourcesCollections:*",
-        "roles.dataSourceResources:*"
+        "roles.dataSourceResources:*",
+        "dataSourcesRolesResourcesScopes:*",
+        "rolesResourcesScopes:*"
       ]
     });
     this.app.acl.beforeGrantAction((ctx) => {
@@ -514,6 +516,19 @@ class PluginACLServer extends import_server.Plugin {
       },
       { after: "dataSource", group: "with-acl-meta" }
     );
+    this.db.on("afterUpdateCollection", async (collection) => {
+      if (collection.options.loadedFromCollectionManager) {
+        this.app.acl.appendStrategyResource(collection.name);
+      }
+    });
+    this.db.on("afterDefineCollection", async (collection) => {
+      if (collection.options.loadedFromCollectionManager) {
+        this.app.acl.appendStrategyResource(collection.name);
+      }
+    });
+    this.db.on("afterRemoveCollection", (collection) => {
+      this.app.acl.removeStrategyResource(collection.name);
+    });
   }
   async install() {
     const repo = this.db.getRepository("collections");

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.0.0-alpha.11",
+  "version": "1.0.0-alpha.12",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/acl",
@@ -34,5 +34,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "00ffb260456e5a22701fd16c87112a92708d9dc1"
+  "gitHead": "d8db7d708cf8e7819003dbbe636238164bc5ec5b"
 }