@nocobase/plugin-acl 0.7.0-alpha.82 → 0.7.1-alpha.4

package/lib/model/RoleResourceActionModel.js

@@ -72,6 +72,12 @@ class RoleResourceActionModel extends _database().Model {
 
           const field = _step.value;
           const collectionField = collection.getField(field);
+
+          if (!collectionField) {
+            console.log(`${field} does not exist`);
+            continue;
+          }
+
           const fieldType = collectionField.get('interface');
           const fieldActions = associationFieldsActions === null || associationFieldsActions === void 0 ? void 0 : (_associationFieldsAct = associationFieldsActions[fieldType]) === null || _associationFieldsAct === void 0 ? void 0 : _associationFieldsAct[availableAction];
           const fieldTarget = collectionField.get('target');

package/lib/model/RoleResourceModel.d.ts

@@ -1,5 +1,5 @@
-import { Model } from '@nocobase/database';
 import { ACL, ACLRole } from '@nocobase/acl';
+import { Model } from '@nocobase/database';
 import { AssociationFieldsActions, GrantHelper } from '../server';
 export declare class RoleResourceModel extends Model {
     revoke(options: {

package/lib/model/RoleResourceModel.js

@@ -5,20 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.RoleResourceModel = void 0;
 
-function _database() {
-  const data = require("@nocobase/database");
+function _acl() {
+  const data = require("@nocobase/acl");
 
-  _database = function _database() {
+  _acl = function _acl() {
     return data;
   };
 
   return data;
 }
 
-function _acl() {
-  const data = require("@nocobase/acl");
+function _database() {
+  const data = require("@nocobase/database");
 
-  _acl = function _acl() {
+  _database = function _database() {
     return data;
   };
 
@@ -79,7 +79,13 @@ class RoleResourceModel extends _database().Model {
 
       const roleName = _this.get('roleName');
 
-      const role = acl.getRole(roleName); // revoke resource of role
+      const role = acl.getRole(roleName);
+
+      if (!role) {
+        console.log(`${roleName} role does not exist`);
+        return;
+      } // revoke resource of role
+
 
       yield _this.revoke({
         role,

package/lib/server.js

@@ -286,7 +286,9 @@ class PluginACL extends _server().Plugin {
         var _ref4 = _asyncToGenerator(function* (model, options) {
           const role = _this4.acl.getRole(model.get('roleName'));
 
-          role.revokeResource(model.get('name'));
+          if (role) {
+            role.revokeResource(model.get('name'));
+          }
         });
 
         return function (_x7, _x8) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-acl",
-  "version": "0.7.0-alpha.82",
+  "version": "0.7.1-alpha.4",
   "description": "",
   "license": "Apache-2.0",
   "licenses": [
@@ -12,14 +12,14 @@
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/acl": "0.7.0-alpha.82",
-    "@nocobase/database": "0.7.0-alpha.82",
-    "@nocobase/server": "0.7.0-alpha.82"
+    "@nocobase/acl": "0.7.1-alpha.4",
+    "@nocobase/database": "0.7.1-alpha.4",
+    "@nocobase/server": "0.7.1-alpha.4"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "4820fd09375c7200d1ea0bb0aab1bd4783b80d3d"
+  "gitHead": "570d039f1904a041729c1967c0637b1109c278a8"
 }

package/src/model/RoleResourceActionModel.ts

@@ -44,6 +44,12 @@ export class RoleResourceActionModel extends Model {
 
     for (const field of fields) {
       const collectionField = collection.getField(field);
+
+      if (!collectionField) {
+        console.log(`${field} does not exist`);
+        continue;
+      }
+
       const fieldType = collectionField.get('interface') as string;
 
       const fieldActions: AssociationFieldAction = associationFieldsActions?.[fieldType]?.[availableAction];

package/src/model/RoleResourceModel.ts

@@ -1,7 +1,7 @@
-import { Database, Model } from '@nocobase/database';
 import { ACL, ACLResource, ACLRole } from '@nocobase/acl';
-import { RoleResourceActionModel } from './RoleResourceActionModel';
+import { Model } from '@nocobase/database';
 import { AssociationFieldsActions, GrantHelper } from '../server';
+import { RoleResourceActionModel } from './RoleResourceActionModel';
 
 export class RoleResourceModel extends Model {
   async revoke(options: { role: ACLRole; resourceName: string; grantHelper: GrantHelper }) {
@@ -36,6 +36,11 @@ export class RoleResourceModel extends Model {
     const roleName = this.get('roleName') as string;
     const role = acl.getRole(roleName);
 
+    if (!role) {
+      console.log(`${roleName} role does not exist`);
+      return;
+    }
+
     // revoke resource of role
     await this.revoke({ role, resourceName, grantHelper });
 

package/src/server.ts

@@ -180,7 +180,9 @@ export class PluginACL extends Plugin {
 
     this.app.db.on('rolesResources.afterDestroy', async (model, options) => {
       const role = this.acl.getRole(model.get('roleName'));
-      role.revokeResource(model.get('name'));
+      if (role) {
+        role.revokeResource(model.get('name'));
+      }
     });
 
     this.app.db.on('collections.afterDestroy', async (model, options) => {