@nocobase/plugin-acl 0.9.4-alpha.2 → 0.10.0-alpha.3

package/lib/actions/role-check.js

@@ -42,32 +42,38 @@ function checkAction(_x2, _x3) {
 function _checkAction() {
   _checkAction = _asyncToGenerator(function* (ctx, next) {
     const currentRole = ctx.state.currentRole;
-    if (currentRole) {
-      const roleInstance = yield ctx.db.getRepository('roles').findOne({
-        filter: {
-          name: currentRole
-        },
-        appends: ['menuUiSchemas']
-      });
-      const anonymous = yield ctx.db.getRepository('roles').findOne({
-        filter: {
-          name: 'anonymous'
-        }
-      });
-      const role = ctx.app.acl.getRole(currentRole);
-      const availableActions = ctx.app.acl.getAvailableActions();
-      ctx.body = _objectSpread(_objectSpread({}, role.toJSON()), {}, {
-        availableActions: [...availableActions.keys()],
-        resources: [...role.resources.keys()],
-        actionAlias: map2obj(ctx.app.acl.actionAlias),
-        allowAll: currentRole === 'root',
-        allowConfigure: roleInstance.get('allowConfigure'),
-        allowMenuItemIds: roleInstance.get('menuUiSchemas').map(uiSchema => uiSchema.get('x-uid')),
-        allowAnonymous: !!anonymous
-      });
-    } else {
-      throw new Error('Role not found');
+    if (!currentRole) {
+      throw new Error('User role not found');
     }
+    const roleInstance = yield ctx.db.getRepository('roles').findOne({
+      filter: {
+        name: currentRole
+      },
+      appends: ['menuUiSchemas']
+    });
+    if (!roleInstance) {
+      throw new Error(`Role ${currentRole} not exists`);
+    }
+    const anonymous = yield ctx.db.getRepository('roles').findOne({
+      filter: {
+        name: 'anonymous'
+      }
+    });
+    let role = ctx.app.acl.getRole(currentRole);
+    if (!role) {
+      yield ctx.app.emitAsync('acl:writeRoleToACL', roleInstance);
+      role = ctx.app.acl.getRole(currentRole);
+    }
+    const availableActions = ctx.app.acl.getAvailableActions();
+    ctx.body = _objectSpread(_objectSpread({}, role.toJSON()), {}, {
+      availableActions: [...availableActions.keys()],
+      resources: [...role.resources.keys()],
+      actionAlias: map2obj(ctx.app.acl.actionAlias),
+      allowAll: currentRole === 'root',
+      allowConfigure: roleInstance.get('allowConfigure'),
+      allowMenuItemIds: roleInstance.get('menuUiSchemas').map(uiSchema => uiSchema.get('x-uid')),
+      allowAnonymous: !!anonymous
+    });
     yield next();
   });
   return _checkAction.apply(this, arguments);

package/lib/server.d.ts

@@ -1,4 +1,5 @@
 import { Plugin } from '@nocobase/server';
+import { RoleModel } from './model/RoleModel';
 import { RoleResourceActionModel } from './model/RoleResourceActionModel';
 import { RoleResourceModel } from './model/RoleResourceModel';
 export interface AssociationFieldAction {
@@ -25,6 +26,7 @@ export declare class PluginACL extends Plugin {
     writeResourceToACL(resourceModel: RoleResourceModel, transaction: any): Promise<void>;
     writeActionToACL(actionModel: RoleResourceActionModel, transaction: any): Promise<void>;
     writeRolesToACL(): Promise<void>;
+    writeRoleToACL(role: RoleModel, transaction?: any): Promise<void>;
     beforeLoad(): Promise<void>;
     install(): Promise<void>;
     load(): Promise<void>;

package/lib/server.js

@@ -173,21 +173,7 @@ class PluginACL extends _server().Plugin {
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           const role = _step.value;
-          role.writeToAcl({
-            acl: _this3.acl
-          });
-          var _iterator2 = _createForOfIteratorHelper(role.get('resources')),
-            _step2;
-          try {
-            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-              const resource = _step2.value;
-              yield _this3.writeResourceToACL(resource, null);
-            }
-          } catch (err) {
-            _iterator2.e(err);
-          } finally {
-            _iterator2.f();
-          }
+          yield _this3.writeRoleToACL(role);
         }
       } catch (err) {
         _iterator.e(err);
@@ -196,29 +182,55 @@ class PluginACL extends _server().Plugin {
       }
     })();
   }
-  beforeLoad() {
+  writeRoleToACL(role, transaction = null) {
     var _this4 = this;
     return _asyncToGenerator(function* () {
-      _this4.db.addMigrations({
-        namespace: _this4.name,
+      role.writeToAcl({
+        acl: _this4.acl
+      });
+      let resources = role.get('resources');
+      if (!resources) {
+        resources = yield role.getResources({
+          transaction
+        });
+      }
+      var _iterator2 = _createForOfIteratorHelper(resources),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          const resource = _step2.value;
+          yield _this4.writeResourceToACL(resource, transaction);
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    })();
+  }
+  beforeLoad() {
+    var _this5 = this;
+    return _asyncToGenerator(function* () {
+      _this5.db.addMigrations({
+        namespace: _this5.name,
         directory: (0, _path().resolve)(__dirname, './migrations'),
         context: {
-          plugin: _this4
+          plugin: _this5
         }
       });
-      _this4.app.db.registerModels({
+      _this5.app.db.registerModels({
         RoleResourceActionModel: _RoleResourceActionModel.RoleResourceActionModel,
         RoleResourceModel: _RoleResourceModel.RoleResourceModel,
         RoleModel: _RoleModel.RoleModel
       });
-      _this4.app.acl.registerSnippet({
-        name: `pm.${_this4.name}.roles`,
+      _this5.app.acl.registerSnippet({
+        name: `pm.${_this5.name}.roles`,
         actions: ['roles:*', 'roles.snippets:*', 'availableActions:list', 'roles.collections:list', 'roles.resources:*', 'uiSchemas:getProperties', 'roles.menuUiSchemas:*']
       });
       // change resource fields to association fields
-      _this4.app.acl.beforeGrantAction(ctx => {
-        const actionName = _this4.app.acl.resolveActionAlias(ctx.actionName);
-        const collection = _this4.app.db.getCollection(ctx.resourceName);
+      _this5.app.acl.beforeGrantAction(ctx => {
+        const actionName = _this5.app.acl.resolveActionAlias(ctx.actionName);
+        const collection = _this5.app.db.getCollection(ctx.resourceName);
         if (!collection) {
           return;
         }
@@ -237,15 +249,15 @@ class PluginACL extends _server().Plugin {
           });
         }
       });
-      _this4.registerAssociationFieldsActions();
-      _this4.app.resourcer.define(_availableActions.availableActionResource);
-      _this4.app.resourcer.define(_roleCollections.roleCollectionsResource);
-      _this4.app.resourcer.registerActionHandler('roles:check', _roleCheck.checkAction);
-      _this4.app.resourcer.registerActionHandler(`users:setDefaultRole`, _userSetDefaultRole.setDefaultRole);
-      _this4.db.on('users.afterCreateWithAssociations', /*#__PURE__*/function () {
+      _this5.registerAssociationFieldsActions();
+      _this5.app.resourcer.define(_availableActions.availableActionResource);
+      _this5.app.resourcer.define(_roleCollections.roleCollectionsResource);
+      _this5.app.resourcer.registerActionHandler('roles:check', _roleCheck.checkAction);
+      _this5.app.resourcer.registerActionHandler(`users:setDefaultRole`, _userSetDefaultRole.setDefaultRole);
+      _this5.db.on('users.afterCreateWithAssociations', /*#__PURE__*/function () {
         var _ref = _asyncToGenerator(function* (model, options) {
           const transaction = options.transaction;
-          const repository = _this4.app.db.getRepository('roles');
+          const repository = _this5.app.db.getRepository('roles');
           const defaultRole = yield repository.findOne({
             filter: {
               default: true
@@ -264,29 +276,21 @@ class PluginACL extends _server().Plugin {
           return _ref.apply(this, arguments);
         };
       }());
-      _this4.app.db.on('roles.afterSaveWithAssociations', /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator(function* (model, options) {
+      _this5.app.on('acl:writeRoleToACL', /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator(function* (roleModel) {
+          yield _this5.writeRoleToACL(roleModel);
+        });
+        return function (_x3) {
+          return _ref2.apply(this, arguments);
+        };
+      }());
+      _this5.app.db.on('roles.afterSaveWithAssociations', /*#__PURE__*/function () {
+        var _ref3 = _asyncToGenerator(function* (model, options) {
           const transaction = options.transaction;
-          model.writeToAcl({
-            acl: _this4.acl
-          });
-          var _iterator3 = _createForOfIteratorHelper(yield model.getResources({
-              transaction
-            })),
-            _step3;
-          try {
-            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-              const resource = _step3.value;
-              yield _this4.writeResourceToACL(resource, transaction);
-            }
-            // model is default
-          } catch (err) {
-            _iterator3.e(err);
-          } finally {
-            _iterator3.f();
-          }
+          yield _this5.writeRoleToACL(model, transaction);
+          // model is default
           if (model.get('default')) {
-            yield _this4.app.db.getRepository('roles').update({
+            yield _this5.app.db.getRepository('roles').update({
               values: {
                 default: false
               },
@@ -298,79 +302,79 @@ class PluginACL extends _server().Plugin {
             });
           }
         });
-        return function (_x3, _x4) {
-          return _ref2.apply(this, arguments);
+        return function (_x4, _x5) {
+          return _ref3.apply(this, arguments);
         };
       }());
-      _this4.app.db.on('roles.afterDestroy', model => {
+      _this5.app.db.on('roles.afterDestroy', model => {
         const roleName = model.get('name');
-        _this4.acl.removeRole(roleName);
+        _this5.acl.removeRole(roleName);
       });
-      _this4.app.db.on('rolesResources.afterSaveWithAssociations', /*#__PURE__*/function () {
-        var _ref3 = _asyncToGenerator(function* (model, options) {
-          yield _this4.writeResourceToACL(model, options.transaction);
+      _this5.app.db.on('rolesResources.afterSaveWithAssociations', /*#__PURE__*/function () {
+        var _ref4 = _asyncToGenerator(function* (model, options) {
+          yield _this5.writeResourceToACL(model, options.transaction);
         });
-        return function (_x5, _x6) {
-          return _ref3.apply(this, arguments);
+        return function (_x6, _x7) {
+          return _ref4.apply(this, arguments);
         };
       }());
-      _this4.app.db.on('rolesResourcesActions.afterUpdateWithAssociations', /*#__PURE__*/function () {
-        var _ref4 = _asyncToGenerator(function* (model, options) {
+      _this5.app.db.on('rolesResourcesActions.afterUpdateWithAssociations', /*#__PURE__*/function () {
+        var _ref5 = _asyncToGenerator(function* (model, options) {
           const transaction = options.transaction;
           const resource = yield model.getResource({
             transaction
           });
-          yield _this4.writeResourceToACL(resource, transaction);
+          yield _this5.writeResourceToACL(resource, transaction);
         });
-        return function (_x7, _x8) {
-          return _ref4.apply(this, arguments);
+        return function (_x8, _x9) {
+          return _ref5.apply(this, arguments);
         };
       }());
-      _this4.app.db.on('rolesResources.afterDestroy', /*#__PURE__*/function () {
-        var _ref5 = _asyncToGenerator(function* (model, options) {
-          const role = _this4.acl.getRole(model.get('roleName'));
+      _this5.app.db.on('rolesResources.afterDestroy', /*#__PURE__*/function () {
+        var _ref6 = _asyncToGenerator(function* (model, options) {
+          const role = _this5.acl.getRole(model.get('roleName'));
           if (role) {
             role.revokeResource(model.get('name'));
           }
         });
-        return function (_x9, _x10) {
-          return _ref5.apply(this, arguments);
+        return function (_x10, _x11) {
+          return _ref6.apply(this, arguments);
         };
       }());
-      _this4.app.db.on('collections.afterDestroy', /*#__PURE__*/function () {
-        var _ref6 = _asyncToGenerator(function* (model, options) {
+      _this5.app.db.on('collections.afterDestroy', /*#__PURE__*/function () {
+        var _ref7 = _asyncToGenerator(function* (model, options) {
           const transaction = options.transaction;
-          yield _this4.app.db.getRepository('rolesResources').destroy({
+          yield _this5.app.db.getRepository('rolesResources').destroy({
             filter: {
               name: model.get('name')
             },
             transaction
           });
         });
-        return function (_x11, _x12) {
-          return _ref6.apply(this, arguments);
+        return function (_x12, _x13) {
+          return _ref7.apply(this, arguments);
         };
       }());
-      _this4.app.db.on('fields.afterCreate', /*#__PURE__*/function () {
-        var _ref7 = _asyncToGenerator(function* (model, options) {
+      _this5.app.db.on('fields.afterCreate', /*#__PURE__*/function () {
+        var _ref8 = _asyncToGenerator(function* (model, options) {
           const transaction = options.transaction;
           const collectionName = model.get('collectionName');
           const fieldName = model.get('name');
-          const resourceActions = yield _this4.app.db.getRepository('rolesResourcesActions').find({
+          const resourceActions = yield _this5.app.db.getRepository('rolesResourcesActions').find({
             filter: {
               'resource.name': collectionName
             },
             transaction,
             appends: ['resource']
           });
-          var _iterator4 = _createForOfIteratorHelper(resourceActions),
-            _step4;
+          var _iterator3 = _createForOfIteratorHelper(resourceActions),
+            _step3;
           try {
-            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-              const resourceAction = _step4.value;
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              const resourceAction = _step3.value;
               const fields = resourceAction.get('fields');
               const newFields = [...fields, fieldName];
-              yield _this4.app.db.getRepository('rolesResourcesActions').update({
+              yield _this5.app.db.getRepository('rolesResourcesActions').update({
                 filterByTk: resourceAction.get('id'),
                 values: {
                   fields: newFields
@@ -379,34 +383,34 @@ class PluginACL extends _server().Plugin {
               });
             }
           } catch (err) {
-            _iterator4.e(err);
+            _iterator3.e(err);
           } finally {
-            _iterator4.f();
+            _iterator3.f();
           }
         });
-        return function (_x13, _x14) {
-          return _ref7.apply(this, arguments);
+        return function (_x14, _x15) {
+          return _ref8.apply(this, arguments);
         };
       }());
-      _this4.app.db.on('fields.afterDestroy', /*#__PURE__*/function () {
-        var _ref8 = _asyncToGenerator(function* (model, options) {
+      _this5.app.db.on('fields.afterDestroy', /*#__PURE__*/function () {
+        var _ref9 = _asyncToGenerator(function* (model, options) {
           const collectionName = model.get('collectionName');
           const fieldName = model.get('name');
-          const resourceActions = yield _this4.app.db.getRepository('rolesResourcesActions').find({
+          const resourceActions = yield _this5.app.db.getRepository('rolesResourcesActions').find({
             filter: {
               'resource.name': collectionName,
               'fields.$anyOf': [fieldName]
             },
             transaction: options.transaction
           });
-          var _iterator5 = _createForOfIteratorHelper(resourceActions),
-            _step5;
+          var _iterator4 = _createForOfIteratorHelper(resourceActions),
+            _step4;
           try {
-            for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-              const resourceAction = _step5.value;
+            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+              const resourceAction = _step4.value;
               const fields = resourceAction.get('fields');
               const newFields = fields.filter(field => field != fieldName);
-              yield _this4.app.db.getRepository('rolesResourcesActions').update({
+              yield _this5.app.db.getRepository('rolesResourcesActions').update({
                 filterByTk: resourceAction.get('id'),
                 values: {
                   fields: newFields
@@ -415,54 +419,54 @@ class PluginACL extends _server().Plugin {
               });
             }
           } catch (err) {
-            _iterator5.e(err);
+            _iterator4.e(err);
           } finally {
-            _iterator5.f();
+            _iterator4.f();
           }
         });
-        return function (_x15, _x16) {
-          return _ref8.apply(this, arguments);
+        return function (_x16, _x17) {
+          return _ref9.apply(this, arguments);
         };
       }());
       // sync database role data to acl
-      _this4.app.on('afterLoad', /*#__PURE__*/function () {
-        var _ref9 = _asyncToGenerator(function* (app, options) {
+      _this5.app.on('afterLoad', /*#__PURE__*/function () {
+        var _ref10 = _asyncToGenerator(function* (app, options) {
           if ((options === null || options === void 0 ? void 0 : options.method) === 'install' || (options === null || options === void 0 ? void 0 : options.method) === 'upgrade') {
             return;
           }
-          const exists = yield _this4.app.db.collectionExistsInDb('roles');
+          const exists = yield _this5.app.db.collectionExistsInDb('roles');
           if (exists) {
-            yield _this4.writeRolesToACL();
+            yield _this5.writeRolesToACL();
           }
         });
-        return function (_x17, _x18) {
-          return _ref9.apply(this, arguments);
+        return function (_x18, _x19) {
+          return _ref10.apply(this, arguments);
         };
       }());
-      _this4.app.on('afterInstall', /*#__PURE__*/function () {
-        var _ref10 = _asyncToGenerator(function* (app, options) {
-          const exists = yield _this4.app.db.collectionExistsInDb('roles');
+      _this5.app.on('afterInstall', /*#__PURE__*/function () {
+        var _ref11 = _asyncToGenerator(function* (app, options) {
+          const exists = yield _this5.app.db.collectionExistsInDb('roles');
           if (exists) {
-            yield _this4.writeRolesToACL();
+            yield _this5.writeRolesToACL();
           }
         });
-        return function (_x19, _x20) {
-          return _ref10.apply(this, arguments);
+        return function (_x20, _x21) {
+          return _ref11.apply(this, arguments);
         };
       }());
-      _this4.app.on('afterInstallPlugin', /*#__PURE__*/function () {
-        var _ref11 = _asyncToGenerator(function* (plugin) {
+      _this5.app.on('afterInstallPlugin', /*#__PURE__*/function () {
+        var _ref12 = _asyncToGenerator(function* (plugin) {
           if (plugin.getName() !== 'users') {
             return;
           }
-          const User = _this4.db.getCollection('users');
+          const User = _this5.db.getCollection('users');
           yield User.repository.update({
             values: {
               roles: ['root', 'admin', 'member']
             },
             forceUpdate: true
           });
-          const RolesUsers = _this4.db.getCollection('rolesUsers');
+          const RolesUsers = _this5.db.getCollection('rolesUsers');
           yield RolesUsers.repository.update({
             filter: {
               userId: 1,
@@ -473,16 +477,16 @@ class PluginACL extends _server().Plugin {
             }
           });
         });
-        return function (_x21) {
-          return _ref11.apply(this, arguments);
+        return function (_x22) {
+          return _ref12.apply(this, arguments);
         };
       }());
-      _this4.app.on('beforeInstallPlugin', /*#__PURE__*/function () {
-        var _ref12 = _asyncToGenerator(function* (plugin) {
+      _this5.app.on('beforeInstallPlugin', /*#__PURE__*/function () {
+        var _ref13 = _asyncToGenerator(function* (plugin) {
           if (plugin.getName() !== 'users') {
             return;
           }
-          const roles = _this4.app.db.getRepository('roles');
+          const roles = _this5.app.db.getRepository('roles');
           yield roles.createMany({
             records: [{
               name: 'root',
@@ -509,7 +513,7 @@ class PluginACL extends _server().Plugin {
               snippets: ['!ui.*', '!pm', '!pm.*']
             }]
           });
-          const rolesResourcesScopes = _this4.app.db.getRepository('rolesResourcesScopes');
+          const rolesResourcesScopes = _this5.app.db.getRepository('rolesResourcesScopes');
           yield rolesResourcesScopes.createMany({
             records: [{
               key: 'all',
@@ -524,21 +528,21 @@ class PluginACL extends _server().Plugin {
             }]
           });
         });
-        return function (_x22) {
-          return _ref12.apply(this, arguments);
+        return function (_x23) {
+          return _ref13.apply(this, arguments);
         };
       }());
-      _this4.app.resourcer.use(_setCurrentRole.setCurrentRole, {
+      _this5.app.resourcer.use(_setCurrentRole.setCurrentRole, {
         tag: 'setCurrentRole',
         before: 'acl',
-        after: 'parseToken'
+        after: 'auth'
       });
-      _this4.app.acl.allow('users', 'setDefaultRole', 'loggedIn');
-      _this4.app.acl.allow('roles', 'check', 'loggedIn');
-      _this4.app.acl.allow('*', '*', ctx => {
+      _this5.app.acl.allow('users', 'setDefaultRole', 'loggedIn');
+      _this5.app.acl.allow('roles', 'check', 'loggedIn');
+      _this5.app.acl.allow('*', '*', ctx => {
         return ctx.state.currentRole === 'root';
       });
-      _this4.app.acl.addFixedParams('collections', 'destroy', () => {
+      _this5.app.acl.addFixedParams('collections', 'destroy', () => {
         return {
           filter: {
             $and: [{
@@ -549,7 +553,7 @@ class PluginACL extends _server().Plugin {
           }
         };
       });
-      _this4.app.acl.addFixedParams('rolesResourcesScopes', 'destroy', () => {
+      _this5.app.acl.addFixedParams('rolesResourcesScopes', 'destroy', () => {
         return {
           filter: {
             $and: [{
@@ -560,7 +564,7 @@ class PluginACL extends _server().Plugin {
           }
         };
       });
-      _this4.app.acl.addFixedParams('rolesResourcesScopes', 'update', () => {
+      _this5.app.acl.addFixedParams('rolesResourcesScopes', 'update', () => {
         return {
           filter: {
             $and: [{
@@ -571,7 +575,7 @@ class PluginACL extends _server().Plugin {
           }
         };
       });
-      _this4.app.acl.addFixedParams('roles', 'destroy', () => {
+      _this5.app.acl.addFixedParams('roles', 'destroy', () => {
         return {
           filter: {
             $and: [{
@@ -584,14 +588,14 @@ class PluginACL extends _server().Plugin {
           }
         };
       });
-      _this4.app.resourcer.use( /*#__PURE__*/function () {
-        var _ref13 = _asyncToGenerator(function* (ctx, next) {
+      _this5.app.resourcer.use( /*#__PURE__*/function () {
+        var _ref14 = _asyncToGenerator(function* (ctx, next) {
           const _ctx$action = ctx.action,
             actionName = _ctx$action.actionName,
             resourceName = _ctx$action.resourceName,
             params = _ctx$action.params;
-          const _ref14 = params || {},
-            showAnonymous = _ref14.showAnonymous;
+          const _ref15 = params || {},
+            showAnonymous = _ref15.showAnonymous;
           if (actionName === 'list' && resourceName === 'roles') {
             if (!showAnonymous) {
               ctx.action.mergeParams({
@@ -608,12 +612,12 @@ class PluginACL extends _server().Plugin {
           }
           yield next();
         });
-        return function (_x23, _x24) {
-          return _ref13.apply(this, arguments);
+        return function (_x24, _x25) {
+          return _ref14.apply(this, arguments);
         };
       }());
-      _this4.app.acl.use( /*#__PURE__*/function () {
-        var _ref15 = _asyncToGenerator(function* (ctx, next) {
+      _this5.app.acl.use( /*#__PURE__*/function () {
+        var _ref16 = _asyncToGenerator(function* (ctx, next) {
           const _ctx$action2 = ctx.action,
             actionName = _ctx$action2.actionName,
             resourceName = _ctx$action2.resourceName;
@@ -642,13 +646,13 @@ class PluginACL extends _server().Plugin {
           }
           return next();
         });
-        return function (_x25, _x26) {
-          return _ref15.apply(this, arguments);
+        return function (_x26, _x27) {
+          return _ref16.apply(this, arguments);
         };
       }());
-      const parseJsonTemplate = _this4.app.acl.parseJsonTemplate;
-      _this4.app.acl.use( /*#__PURE__*/function () {
-        var _ref16 = _asyncToGenerator(function* (ctx, next) {
+      const parseJsonTemplate = _this5.app.acl.parseJsonTemplate;
+      _this5.app.acl.use( /*#__PURE__*/function () {
+        var _ref17 = _asyncToGenerator(function* (ctx, next) {
           const _ctx$action3 = ctx.action,
             actionName = _ctx$action3.actionName,
             resourceName = _ctx$action3.resourceName,
@@ -669,7 +673,7 @@ class PluginACL extends _server().Plugin {
               resource: collectionName,
               action: actionName
             });
-            const availableAction = _this4.app.acl.getAvailableAction(actionName);
+            const availableAction = _this5.app.acl.getAvailableAction(actionName);
             if (availableAction === null || availableAction === void 0 ? void 0 : (_availableAction$opti = availableAction.options) === null || _availableAction$opti === void 0 ? void 0 : _availableAction$opti.onNewRecord) {
               if (action) {
                 ctx.permission.skip = true;
@@ -690,15 +694,15 @@ class PluginACL extends _server().Plugin {
           }
           yield next();
         });
-        return function (_x27, _x28) {
-          return _ref16.apply(this, arguments);
+        return function (_x28, _x29) {
+          return _ref17.apply(this, arguments);
         };
       }(), {
         before: 'core'
       });
       // throw error when user has no fixed params permissions
-      _this4.app.acl.use( /*#__PURE__*/function () {
-        var _ref17 = _asyncToGenerator(function* (ctx, next) {
+      _this5.app.acl.use( /*#__PURE__*/function () {
+        var _ref18 = _asyncToGenerator(function* (ctx, next) {
           var _ctx$permission3, _ctx$permission3$can;
           const action = (_ctx$permission3 = ctx.permission) === null || _ctx$permission3 === void 0 ? void 0 : (_ctx$permission3$can = _ctx$permission3.can) === null || _ctx$permission3$can === void 0 ? void 0 : _ctx$permission3$can.action;
           if (action == 'destroy' && !ctx.action.resourceName.includes('.')) {
@@ -714,15 +718,15 @@ class PluginACL extends _server().Plugin {
           }
           yield next();
         });
-        return function (_x29, _x30) {
-          return _ref17.apply(this, arguments);
+        return function (_x30, _x31) {
+          return _ref18.apply(this, arguments);
         };
       }(), {
         after: 'core',
         group: 'after'
       });
       const withACLMeta = /*#__PURE__*/function () {
-        var _ref18 = _asyncToGenerator(function* (ctx, next) {
+        var _ref19 = _asyncToGenerator(function* (ctx, next) {
           var _ctx$body;
           yield next();
           if (!ctx.action || !ctx.get('X-With-ACL-Meta') || ctx.status !== 200) {
@@ -779,7 +783,7 @@ class PluginACL extends _server().Plugin {
               }
             };
             try {
-              yield _this4.app.acl.getActionParams(actionCtx);
+              yield _this5.app.acl.getActionParams(actionCtx);
             } catch (e) {
               if (e instanceof _acl().NoPermissionError) {
                 continue;
@@ -816,7 +820,7 @@ class PluginACL extends _server().Plugin {
             const actionSql = ctx.db.sequelize.queryInterface.queryGenerator.selectQuery(Model.getTableName(), {
               where: (() => {
                 const filterObj = queryParams.where;
-                if (!_this4.db.options.underscored) {
+                if (!_this5.db.options.underscored) {
                   return filterObj;
                 }
                 const isAssociationKey = key => {
@@ -896,21 +900,21 @@ class PluginACL extends _server().Plugin {
             ctx.body.allowedActions = allowedActions;
           }
         });
-        return function withACLMeta(_x31, _x32) {
-          return _ref18.apply(this, arguments);
+        return function withACLMeta(_x32, _x33) {
+          return _ref19.apply(this, arguments);
         };
       }();
       // append allowedActions to list & get response
-      _this4.app.use( /*#__PURE__*/function () {
-        var _ref19 = _asyncToGenerator(function* (ctx, next) {
+      _this5.app.use( /*#__PURE__*/function () {
+        var _ref20 = _asyncToGenerator(function* (ctx, next) {
           try {
             yield withACLMeta(ctx, next);
           } catch (error) {
             ctx.logger.error(error);
           }
         });
-        return function (_x33, _x34) {
-          return _ref19.apply(this, arguments);
+        return function (_x34, _x35) {
+          return _ref20.apply(this, arguments);
         };
       }(), {
         after: 'restApi',
@@ -919,19 +923,19 @@ class PluginACL extends _server().Plugin {
     })();
   }
   install() {
-    var _this5 = this;
+    var _this6 = this;
     return _asyncToGenerator(function* () {
-      const repo = _this5.db.getRepository('collections');
+      const repo = _this6.db.getRepository('collections');
       if (repo) {
         yield repo.db2cm('roles');
       }
     })();
   }
   load() {
-    var _this6 = this;
+    var _this7 = this;
     return _asyncToGenerator(function* () {
-      yield _this6.importCollections((0, _path().resolve)(__dirname, 'collections'));
-      _this6.db.extendCollection({
+      yield _this7.importCollections((0, _path().resolve)(__dirname, 'collections'));
+      _this7.db.extendCollection({
         name: 'rolesUischemas',
         namespace: 'acl.acl',
         duplicator: 'required'

package/package.json

@@ -3,21 +3,21 @@
   "displayName": "ACL",
   "displayName.zh-CN": "权限控制",
   "description": "A simple access control based on roles, resources and actions",
-  "description.zh-CN": "基于角色、资源和操作的权限控制插件",
-  "version": "0.9.4-alpha.2",
+  "description.zh-CN": "基于角色、资源和操作的权限控制。",
+  "version": "0.10.0-alpha.3",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/acl": "0.9.4-alpha.2",
-    "@nocobase/database": "0.9.4-alpha.2",
-    "@nocobase/plugin-users": "0.9.4-alpha.2",
-    "@nocobase/server": "0.9.4-alpha.2"
+    "@nocobase/acl": "0.10.0-alpha.3",
+    "@nocobase/database": "0.10.0-alpha.3",
+    "@nocobase/plugin-users": "0.10.0-alpha.3",
+    "@nocobase/server": "0.10.0-alpha.3"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "2bc19a85bf9425aa220b6c467315c8087f333a7e"
+  "gitHead": "1f0b27fc9ab2398cd41c308a6b01a986e025cd20"
 }