@tachybase/module-acl 0.23.58 → 1.0.6

package/dist/externalVersion.js

@@ -1,19 +1,19 @@
 module.exports = {
   "react": "18.3.1",
-  "@tachybase/client": "0.23.58",
-  "@tachybase/schema": "0.23.58",
+  "@tachybase/client": "1.0.6",
+  "@tachybase/schema": "1.0.6",
   "antd": "5.22.5",
   "@ant-design/icons": "5.5.2",
   "react-i18next": "15.2.0",
-  "@tachybase/utils": "0.23.58",
-  "@tachybase/actions": "0.23.58",
-  "@tachybase/cache": "0.23.58",
-  "@tachybase/database": "0.23.58",
-  "@tachybase/server": "0.23.58",
+  "@tachybase/utils": "1.0.6",
+  "@tachybase/actions": "1.0.6",
+  "@tachybase/cache": "1.0.6",
+  "@tachybase/database": "1.0.6",
+  "@tachybase/server": "1.0.6",
   "async-mutex": "0.3.2",
   "lodash": "4.17.21",
-  "@tachybase/test": "0.23.58",
+  "@tachybase/test": "1.0.6",
   "ahooks": "3.8.4",
-  "@tachybase/components": "0.23.58",
-  "@tachybase/acl": "0.23.58"
+  "@tachybase/components": "1.0.6",
+  "@tachybase/acl": "1.0.6"
 };

package/dist/server/collections/roles-users.js

@@ -28,15 +28,18 @@ var roles_users_default = (0, import_database.defineCollection)({
   },
   fields: [
     {
-      name: "id",
+      type: "boolean",
+      name: "default"
+    },
+    {
       type: "bigInt",
-      autoIncrement: true,
-      primaryKey: true,
-      allowNull: false
+      name: "userId",
+      primaryKey: true
     },
     {
-      type: "boolean",
-      name: "default"
+      type: "string",
+      name: "roleName",
+      primaryKey: true
     }
   ]
 });

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

@@ -47,7 +47,7 @@ function createWithACLMetaMiddleware() {
     if (!ctx.action || !ctx.get("X-With-ACL-Meta") || ctx.status !== 200) {
       return;
     }
-    const { resourceName, actionName } = ctx.action;
+    const { resourceName, actionName } = ctx.permission;
     if (!["list", "get"].includes(actionName)) {
       return;
     }
@@ -75,6 +75,7 @@ function createWithACLMetaMiddleware() {
             return db;
           }
         },
+        getCurrentRepository: ctx.getCurrentRepository,
         action: {
           actionName: action,
           name: action,
@@ -124,6 +125,9 @@ function createWithACLMetaMiddleware() {
       }
       return listData.filter(Boolean).map((item) => item[primaryKeyField]);
     })();
+    if (ids.filter(Boolean).length === 0) {
+      return;
+    }
     const conditions = [];
     const allAllowed = [];
     for (const [action, params, actionCtx] of actionsParams) {

package/dist/server/server.d.ts

@@ -22,7 +22,6 @@ export declare class PluginACL extends Plugin {
     grantHelper: GrantHelper;
     get acl(): import("packages/acl/lib").ACL;
     registerAssociationFieldAction(associationType: string, value: AssociationFieldActions): void;
-    registerAssociationFieldsActions(): void;
     writeResourceToACL(resourceModel: RoleResourceModel, transaction: any): Promise<void>;
     writeActionToACL(actionModel: RoleResourceActionModel, transaction: any): Promise<void>;
     writeRolesToACL(options: any): Promise<void>;

package/dist/server/server.js

@@ -34,7 +34,6 @@ __export(server_exports, {
 module.exports = __toCommonJS(server_exports);
 var import_path = require("path");
 var import_worker_threads = require("worker_threads");
-var import_actions = require("@tachybase/actions");
 var import_database = require("@tachybase/database");
 var import_server = require("@tachybase/server");
 var import_async_mutex = require("async-mutex");
@@ -67,52 +66,6 @@ class PluginACL extends import_server.Plugin {
   registerAssociationFieldAction(associationType, value) {
     this.associationFieldsActions[associationType] = value;
   }
-  registerAssociationFieldsActions() {
-    this.registerAssociationFieldAction("hasOne", {
-      view: {
-        associationActions: ["list", "get", "view"]
-      },
-      create: {
-        associationActions: ["create", "set"]
-      },
-      update: {
-        associationActions: ["update", "remove", "set"]
-      }
-    });
-    this.registerAssociationFieldAction("hasMany", {
-      view: {
-        associationActions: ["list", "get", "view"]
-      },
-      create: {
-        associationActions: ["create", "set", "add"]
-      },
-      update: {
-        associationActions: ["update", "remove", "set"]
-      }
-    });
-    this.registerAssociationFieldAction("belongsTo", {
-      view: {
-        associationActions: ["list", "get", "view"]
-      },
-      create: {
-        associationActions: ["create", "set"]
-      },
-      update: {
-        associationActions: ["update", "remove", "set"]
-      }
-    });
-    this.registerAssociationFieldAction("belongsToMany", {
-      view: {
-        associationActions: ["list", "get", "view"]
-      },
-      create: {
-        associationActions: ["create", "set", "add"]
-      },
-      update: {
-        associationActions: ["update", "remove", "set", "toggle"]
-      }
-    });
-  }
   async writeResourceToACL(resourceModel, transaction) {
     await resourceModel.writeToACL({
       acl: this.acl,
@@ -177,7 +130,14 @@ class PluginACL extends import_server.Plugin {
         "roles.resources:*",
         "uiSchemas:getProperties",
         "roles.menuUiSchemas:*",
-        "roles.users:*"
+        "roles.users:*",
+        "dataSources.roles:*",
+        "dataSources:list",
+        "dataSources.rolesResourcesScopes:*",
+        "roles.dataSourcesCollections:*",
+        "roles.dataSourceResources:*",
+        "dataSourcesRolesResourcesScopes:*",
+        "rolesResourcesScopes:*"
       ]
     });
     this.app.acl.beforeGrantAction((ctx) => {
@@ -202,7 +162,6 @@ class PluginACL extends import_server.Plugin {
         };
       }
     });
-    this.registerAssociationFieldsActions();
     this.app.resourcer.define(import_available_actions.availableActionResource);
     this.app.resourcer.define(import_role_collections.roleCollectionsResource);
     this.app.resourcer.registerActionHandler("roles:check", import_role_check.checkAction);
@@ -592,30 +551,6 @@ class PluginACL extends import_server.Plugin {
         before: "core"
       }
     );
-    this.app.acl.use(
-      async (ctx, next) => {
-        var _a, _b;
-        const action = (_b = (_a = ctx.permission) == null ? void 0 : _a.can) == null ? void 0 : _b.action;
-        if (action === "destroy" && !ctx.action.resourceName.includes(".")) {
-          const repository = import_actions.utils.getRepositoryFromParams(ctx);
-          if (!repository) {
-            await next();
-            return;
-          }
-          const filteredCount = await repository.count(ctx.permission.mergedParams);
-          const queryCount = await repository.count(ctx.permission.rawParams);
-          if (queryCount > filteredCount) {
-            ctx.throw(403, "No permissions");
-            return;
-          }
-        }
-        await next();
-      },
-      {
-        after: "core",
-        group: "after"
-      }
-    );
     const withACLMeta = (0, import_with_acl_meta.createWithACLMetaMiddleware)();
     this.app.use(
       async (ctx, next) => {
@@ -625,8 +560,21 @@ class PluginACL extends import_server.Plugin {
           ctx.logger.error(error);
         }
       },
-      { after: "restApi", group: "after" }
+      { after: "dataSource", group: "after" }
     );
+    this.db.on("afterUpdateCollection", async (collection) => {
+      if (collection.options.loadedFromCollectionManager || collection.options.asStrategyResource) {
+        this.app.acl.appendStrategyResource(collection.name);
+      }
+    });
+    this.db.on("afterDefineCollection", async (collection) => {
+      if (collection.options.loadedFromCollectionManager || collection.options.asStrategyResource) {
+        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

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/module-acl",
   "displayName": "Access control",
-  "version": "0.23.58",
+  "version": "1.0.6",
   "description": "Based on roles, resources, and actions, access control can precisely manage interface configuration permissions, data operation permissions, menu access permissions, and plugin permissions.",
   "keywords": [
     "Users & permissions"
@@ -20,18 +20,18 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-i18next": "^15.2.0",
-    "@tachybase/schema": "0.23.58",
-    "@tachybase/components": "0.23.58"
+    "@tachybase/components": "1.0.6",
+    "@tachybase/schema": "1.0.6"
   },
   "peerDependencies": {
-    "@tachybase/acl": "0.23.58",
-    "@tachybase/actions": "0.23.58",
-    "@tachybase/cache": "0.23.58",
-    "@tachybase/client": "0.23.58",
-    "@tachybase/database": "0.23.58",
-    "@tachybase/test": "0.23.58",
-    "@tachybase/server": "0.23.58",
-    "@tachybase/utils": "0.23.58"
+    "@tachybase/acl": "1.0.6",
+    "@tachybase/actions": "1.0.6",
+    "@tachybase/cache": "1.0.6",
+    "@tachybase/client": "1.0.6",
+    "@tachybase/database": "1.0.6",
+    "@tachybase/server": "1.0.6",
+    "@tachybase/utils": "1.0.6",
+    "@tachybase/test": "1.0.6"
   },
   "description.zh-CN": "基于角色、资源和操作的权限控制，可以精确控制界面配置权限、数据操作权限、菜单访问权限、插件权限。",
   "displayName.zh-CN": "权限控制",