@nocobase/plugin-acl 0.21.0-alpha.9 → 1.0.0-alpha.2

package/dist/externalVersion.js

@@ -1,22 +1,22 @@
 module.exports = {
-  "@nocobase/client": "0.21.0-alpha.9",
+  "@nocobase/client": "1.0.0-alpha.2",
   "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": "0.21.0-alpha.9",
-  "@nocobase/actions": "0.21.0-alpha.9",
-  "@nocobase/cache": "0.21.0-alpha.9",
-  "@nocobase/database": "0.21.0-alpha.9",
-  "@nocobase/server": "0.21.0-alpha.9",
+  "@nocobase/utils": "1.0.0-alpha.2",
+  "@nocobase/actions": "1.0.0-alpha.2",
+  "@nocobase/cache": "1.0.0-alpha.2",
+  "@nocobase/database": "1.0.0-alpha.2",
+  "@nocobase/server": "1.0.0-alpha.2",
   "async-mutex": "0.3.2",
   "lodash": "4.17.21",
-  "@nocobase/test": "0.21.0-alpha.9",
+  "@nocobase/test": "1.0.0-alpha.2",
   "@formily/core": "2.3.0",
   "ahooks": "3.7.8",
   "@formily/antd-v5": "1.1.9",
   "antd-style": "3.4.5",
-  "@nocobase/acl": "0.21.0-alpha.9"
+  "@nocobase/acl": "1.0.0-alpha.2"
 };

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

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

package/dist/server/migrations/20221214072638-set-role-snippets.js

@@ -21,6 +21,7 @@ __export(set_role_snippets_exports, {
 });
 module.exports = __toCommonJS(set_role_snippets_exports);
 var import_server = require("@nocobase/server");
+/* istanbul ignore file -- @preserve */
 class set_role_snippets_default extends import_server.Migration {
   appVersion = "<0.9.0-alpha.1";
   async up() {

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

@@ -1,12 +1,9 @@
 import { ACL, ACLRole } from '@nocobase/acl';
 import { Model } from '@nocobase/database';
-import { AssociationFieldsActions, GrantHelper } from '../server';
 export declare class RoleResourceActionModel extends Model {
     writeToACL(options: {
         acl: ACL;
         role: ACLRole;
         resourceName: string;
-        associationFieldsActions: AssociationFieldsActions;
-        grantHelper: GrantHelper;
     }): Promise<void>;
 }

package/dist/server/model/RoleResourceActionModel.js

@@ -23,9 +23,7 @@ module.exports = __toCommonJS(RoleResourceActionModel_exports);
 var import_database = require("@nocobase/database");
 class RoleResourceActionModel extends import_database.Model {
   async writeToACL(options) {
-    var _a;
-    const db = this.constructor.database;
-    const { resourceName, role, acl, associationFieldsActions, grantHelper } = options;
+    const { resourceName, role } = options;
     const actionName = this.get("name");
     const fields = this.get("fields");
     const actionPath = `${resourceName}:${actionName}`;
@@ -38,45 +36,6 @@ class RoleResourceActionModel extends import_database.Model {
       actionParams["filter"] = scope.get("scope");
     }
     role.grantAction(actionPath, actionParams);
-    const collection = db.getCollection(resourceName);
-    if (!collection) {
-      return;
-    }
-    const availableAction = acl.resolveActionAlias(actionName);
-    for (const field of fields) {
-      const collectionField = collection.getField(field);
-      if (!collectionField) {
-        console.log(`field ${field} does not exist at ${collection.name}`);
-        continue;
-      }
-      const fieldType = collectionField.get("type");
-      const fieldActions = (_a = associationFieldsActions == null ? void 0 : associationFieldsActions[fieldType]) == null ? void 0 : _a[availableAction];
-      const fieldTarget = collectionField.get("target");
-      if (fieldActions) {
-        const associationActions = fieldActions.associationActions || [];
-        associationActions.forEach((associationAction) => {
-          const actionName2 = `${resourceName}.${collectionField.get("name")}:${associationAction}`;
-          role.grantAction(actionName2);
-        });
-        const targetActions = fieldActions.targetActions || [];
-        targetActions.forEach((targetAction) => {
-          const targetActionPath = `${fieldTarget}:${targetAction}`;
-          const existsAction = role.getActionParams(targetActionPath);
-          if (existsAction) {
-            return;
-          }
-          grantHelper.resourceTargetActionMap.set(`${role.name}.${resourceName}`, [
-            ...grantHelper.resourceTargetActionMap.get(resourceName) || [],
-            targetActionPath
-          ]);
-          grantHelper.targetActionResourceMap.set(targetActionPath, [
-            ...grantHelper.targetActionResourceMap.get(targetActionPath) || [],
-            `${role.name}.${resourceName}`
-          ]);
-          role.grantAction(targetActionPath);
-        });
-      }
-    }
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,16 +1,12 @@
 import { ACL, ACLRole } from '@nocobase/acl';
 import { Model } from '@nocobase/database';
-import { AssociationFieldsActions, GrantHelper } from '../server';
 export declare class RoleResourceModel extends Model {
     revoke(options: {
         role: ACLRole;
         resourceName: string;
-        grantHelper: GrantHelper;
     }): Promise<void>;
     writeToACL(options: {
         acl: ACL;
-        associationFieldsActions: AssociationFieldsActions;
-        grantHelper: GrantHelper;
         transaction: any;
     }): Promise<void>;
 }

package/dist/server/model/RoleResourceModel.js

@@ -24,22 +24,11 @@ var import_acl = require("@nocobase/acl");
 var import_database = require("@nocobase/database");
 class RoleResourceModel extends import_database.Model {
   async revoke(options) {
-    const { role, resourceName, grantHelper } = options;
+    const { role, resourceName } = options;
     role.revokeResource(resourceName);
-    const targetActions = grantHelper.resourceTargetActionMap.get(`${role.name}.${resourceName}`) || [];
-    for (const targetAction of targetActions) {
-      const targetActionResource = (grantHelper.targetActionResourceMap.get(targetAction) || []).filter(
-        (item) => `${role.name}.${resourceName}` !== item
-      );
-      grantHelper.targetActionResourceMap.set(targetAction, targetActionResource);
-      if (targetActionResource.length == 0) {
-        role.revokeAction(targetAction);
-      }
-    }
-    grantHelper.resourceTargetActionMap.set(`${role.name}.${resourceName}`, []);
   }
   async writeToACL(options) {
-    const { acl, associationFieldsActions, grantHelper } = options;
+    const { acl } = options;
     const resourceName = this.get("name");
     const roleName = this.get("roleName");
     const role = acl.getRole(roleName);
@@ -47,7 +36,7 @@ class RoleResourceModel extends import_database.Model {
       console.log(`${roleName} role does not exist`);
       return;
     }
-    await this.revoke({ role, resourceName, grantHelper });
+    await this.revoke({ role, resourceName });
     if (this.usingActionsConfig === false) {
       return;
     }
@@ -63,9 +52,7 @@ class RoleResourceModel extends import_database.Model {
       await action.writeToACL({
         acl,
         role,
-        resourceName,
-        associationFieldsActions,
-        grantHelper: options.grantHelper
+        resourceName
       });
     }
   }

package/dist/server/server.d.ts

@@ -1,30 +1,12 @@
+import { Transaction } from '@nocobase/database';
 import { Plugin } from '@nocobase/server';
 import { RoleModel } from './model/RoleModel';
 import { RoleResourceActionModel } from './model/RoleResourceActionModel';
 import { RoleResourceModel } from './model/RoleResourceModel';
-export interface AssociationFieldAction {
-    associationActions: string[];
-    targetActions?: string[];
-}
-interface AssociationFieldActions {
-    [availableActionName: string]: AssociationFieldAction;
-}
-export interface AssociationFieldsActions {
-    [associationType: string]: AssociationFieldActions;
-}
-export declare class GrantHelper {
-    resourceTargetActionMap: Map<string, string[]>;
-    targetActionResourceMap: Map<string, string[]>;
-    constructor();
-}
 export declare class PluginACLServer extends Plugin {
-    associationFieldsActions: AssociationFieldsActions;
-    grantHelper: GrantHelper;
     get acl(): import("@nocobase/acl").ACL;
-    registerAssociationFieldAction(associationType: string, value: AssociationFieldActions): void;
-    registerAssociationFieldsActions(): void;
-    writeResourceToACL(resourceModel: RoleResourceModel, transaction: any): Promise<void>;
-    writeActionToACL(actionModel: RoleResourceActionModel, transaction: any): Promise<void>;
+    writeResourceToACL(resourceModel: RoleResourceModel, transaction: Transaction): Promise<void>;
+    writeActionToACL(actionModel: RoleResourceActionModel, transaction: Transaction): Promise<void>;
     writeRolesToACL(options: any): Promise<void>;
     writeRoleToACL(role: RoleModel, options?: any): Promise<void>;
     beforeLoad(): Promise<void>;

package/dist/server/server.js

@@ -27,7 +27,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var server_exports = {};
 __export(server_exports, {
-  GrantHelper: () => GrantHelper,
   PluginACLServer: () => PluginACLServer,
   default: () => server_default
 });
@@ -47,74 +46,14 @@ var import_with_acl_meta = require("./middlewares/with-acl-meta");
 var import_RoleModel = require("./model/RoleModel");
 var import_RoleResourceActionModel = require("./model/RoleResourceActionModel");
 var import_RoleResourceModel = require("./model/RoleResourceModel");
-class GrantHelper {
-  resourceTargetActionMap = /* @__PURE__ */ new Map();
-  targetActionResourceMap = /* @__PURE__ */ new Map();
-  constructor() {
-  }
-}
 class PluginACLServer extends import_server.Plugin {
-  // association field actions config
-  associationFieldsActions = {};
-  grantHelper = new GrantHelper();
   get acl() {
     return this.app.acl;
   }
-  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,
-      associationFieldsActions: this.associationFieldsActions,
-      transaction,
-      grantHelper: this.grantHelper
+      transaction
     });
   }
   async writeActionToACL(actionModel, transaction) {
@@ -123,9 +62,7 @@ class PluginACLServer extends import_server.Plugin {
     await actionModel.writeToACL({
       acl: this.acl,
       role,
-      resourceName: resource.get("name"),
-      associationFieldsActions: this.associationFieldsActions,
-      grantHelper: this.grantHelper
+      resourceName: resource.get("name")
     });
   }
   async writeRolesToACL(options) {
@@ -587,6 +524,5 @@ class PluginACLServer extends import_server.Plugin {
 var server_default = PluginACLServer;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  GrantHelper,
   PluginACLServer
 });

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": "0.21.0-alpha.9",
+  "version": "1.0.0-alpha.2",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/acl",
@@ -20,19 +20,19 @@
     "react-dom": "^18.2.0"
   },
   "peerDependencies": {
-    "@nocobase/acl": "0.x",
-    "@nocobase/actions": "0.x",
-    "@nocobase/cache": "0.x",
-    "@nocobase/client": "0.x",
-    "@nocobase/database": "0.x",
-    "@nocobase/server": "0.x",
-    "@nocobase/test": "0.x",
-    "@nocobase/utils": "0.x"
+    "@nocobase/acl": "1.x",
+    "@nocobase/actions": "1.x",
+    "@nocobase/cache": "1.x",
+    "@nocobase/client": "1.x",
+    "@nocobase/database": "1.x",
+    "@nocobase/server": "1.x",
+    "@nocobase/test": "1.x",
+    "@nocobase/utils": "1.x"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "a6fe6c4ee532c04e5a50ec777bf76436ca624cbd"
+  "gitHead": "f89dbc9e67d58404a2e484a5e124f739f340dcf8"
 }