@nocobase/plugin-acl 0.7.7-alpha.1 → 0.8.0-alpha.4

package/lib/server.d.ts

@@ -28,6 +28,5 @@ export declare class PluginACL extends Plugin {
     beforeLoad(): Promise<void>;
     install(): Promise<void>;
     load(): Promise<void>;
-    getName(): string;
 }
 export default PluginACL;

package/lib/server.js

@@ -427,13 +427,74 @@ class PluginACL extends _server().Plugin {
       }()); // sync database role data to acl
 
 
-      _this4.app.on('beforeStart', /*#__PURE__*/_asyncToGenerator(function* () {
-        yield _this4.writeRolesToACL();
-      }));
+      _this4.app.on('afterLoad', /*#__PURE__*/function () {
+        var _ref9 = _asyncToGenerator(function* (app, options) {
+          if ((options === null || options === void 0 ? void 0 : options.method) === 'install') {
+            return;
+          }
+
+          const exists = yield _this4.app.db.collectionExistsInDb('roles');
+
+          if (exists) {
+            yield _this4.writeRolesToACL();
+          }
+        });
+
+        return function (_x17, _x18) {
+          return _ref9.apply(this, arguments);
+        };
+      }());
+
+      _this4.app.on('afterInstall', /*#__PURE__*/function () {
+        var _ref10 = _asyncToGenerator(function* (app, options) {
+          const exists = yield _this4.app.db.collectionExistsInDb('roles');
+
+          if (exists) {
+            yield _this4.writeRolesToACL();
+          }
+        });
+
+        return function (_x19, _x20) {
+          return _ref10.apply(this, arguments);
+        };
+      }());
+
+      _this4.app.on('afterInstallPlugin', /*#__PURE__*/function () {
+        var _ref11 = _asyncToGenerator(function* (plugin) {
+          if (plugin.getName() !== 'users') {
+            return;
+          }
+
+          const User = _this4.db.getCollection('users');
+
+          yield User.repository.update({
+            values: {
+              roles: ['root', 'admin', 'member']
+            },
+            forceUpdate: true
+          });
+
+          const RolesUsers = _this4.db.getCollection('rolesUsers');
+
+          yield RolesUsers.repository.update({
+            filter: {
+              userId: 1,
+              roleName: 'root'
+            },
+            values: {
+              default: true
+            }
+          });
+        });
+
+        return function (_x21) {
+          return _ref11.apply(this, arguments);
+        };
+      }());
 
       _this4.app.on('beforeInstallPlugin', /*#__PURE__*/function () {
-        var _ref10 = _asyncToGenerator(function* (plugin) {
-          if (plugin.constructor.name !== 'UsersPlugin') {
+        var _ref12 = _asyncToGenerator(function* (plugin) {
+          if (plugin.getName() !== 'users') {
             return;
           }
 
@@ -480,14 +541,16 @@ class PluginACL extends _server().Plugin {
           });
         });
 
-        return function (_x17) {
-          return _ref10.apply(this, arguments);
+        return function (_x22) {
+          return _ref12.apply(this, arguments);
         };
       }());
 
-      const usersPlugin = _this4.app.pm.get('@nocobase/plugin-users');
-
-      usersPlugin.tokenMiddleware.use(_setCurrentRole.setCurrentRole);
+      _this4.app.resourcer.use(_setCurrentRole.setCurrentRole, {
+        tag: 'setCurrentRole',
+        before: 'acl',
+        after: 'parseToken'
+      });
 
       _this4.app.acl.allow('users', 'setDefaultRole', 'loggedIn');
 
@@ -502,14 +565,14 @@ class PluginACL extends _server().Plugin {
       });
 
       _this4.app.resourcer.use( /*#__PURE__*/function () {
-        var _ref11 = _asyncToGenerator(function* (ctx, next) {
+        var _ref13 = _asyncToGenerator(function* (ctx, next) {
           const _ctx$action = ctx.action,
                 actionName = _ctx$action.actionName,
                 resourceName = _ctx$action.resourceName,
                 params = _ctx$action.params;
 
-          const _ref12 = params || {},
-                showAnonymous = _ref12.showAnonymous;
+          const _ref14 = params || {},
+                showAnonymous = _ref14.showAnonymous;
 
           if (actionName === 'list' && resourceName === 'roles') {
             if (!showAnonymous) {
@@ -530,13 +593,13 @@ class PluginACL extends _server().Plugin {
           yield next();
         });
 
-        return function (_x18, _x19) {
-          return _ref11.apply(this, arguments);
+        return function (_x23, _x24) {
+          return _ref13.apply(this, arguments);
         };
       }());
 
       _this4.app.acl.use( /*#__PURE__*/function () {
-        var _ref13 = _asyncToGenerator(function* (ctx, next) {
+        var _ref15 = _asyncToGenerator(function* (ctx, next) {
           const _ctx$action2 = ctx.action,
                 actionName = _ctx$action2.actionName,
                 resourceName = _ctx$action2.resourceName;
@@ -575,15 +638,15 @@ class PluginACL extends _server().Plugin {
           return next();
         });
 
-        return function (_x20, _x21) {
-          return _ref13.apply(this, arguments);
+        return function (_x25, _x26) {
+          return _ref15.apply(this, arguments);
         };
       }());
 
       const parseJsonTemplate = _this4.app.acl.parseJsonTemplate;
 
       _this4.app.acl.use( /*#__PURE__*/function () {
-        var _ref14 = _asyncToGenerator(function* (ctx, next) {
+        var _ref16 = _asyncToGenerator(function* (ctx, next) {
           const _ctx$action3 = ctx.action,
                 actionName = _ctx$action3.actionName,
                 resourceName = _ctx$action3.resourceName,
@@ -634,8 +697,8 @@ class PluginACL extends _server().Plugin {
           yield next();
         });
 
-        return function (_x22, _x23) {
-          return _ref14.apply(this, arguments);
+        return function (_x27, _x28) {
+          return _ref16.apply(this, arguments);
         };
       }());
     })();
@@ -650,27 +713,6 @@ class PluginACL extends _server().Plugin {
       if (repo) {
         yield repo.db2cm('roles');
       }
-
-      const User = _this5.db.getCollection('users');
-
-      yield User.repository.update({
-        values: {
-          roles: ['root', 'admin', 'member']
-        },
-        forceUpdate: true
-      });
-
-      const RolesUsers = _this5.db.getCollection('rolesUsers');
-
-      yield RolesUsers.repository.update({
-        filter: {
-          userId: 1,
-          roleName: 'root'
-        },
-        values: {
-          default: true
-        }
-      });
     })();
   }
 
@@ -681,15 +723,9 @@ class PluginACL extends _server().Plugin {
       yield _this6.app.db.import({
         directory: (0, _path().resolve)(__dirname, 'collections')
       });
-
-      _this6.app.resourcer.use(_this6.acl.middleware());
     })();
   }
 
-  getName() {
-    return this.getPackageName(__dirname);
-  }
-
 }
 
 exports.PluginACL = PluginACL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-acl",
-  "version": "0.7.7-alpha.1",
+  "version": "0.8.0-alpha.4",
   "description": "",
   "license": "Apache-2.0",
   "licenses": [
@@ -12,15 +12,15 @@
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/acl": "0.7.7-alpha.1",
-    "@nocobase/database": "0.7.7-alpha.1",
-    "@nocobase/plugin-users": "0.7.7-alpha.1",
-    "@nocobase/server": "0.7.7-alpha.1"
+    "@nocobase/acl": "0.8.0-alpha.4",
+    "@nocobase/database": "0.8.0-alpha.4",
+    "@nocobase/plugin-users": "0.8.0-alpha.4",
+    "@nocobase/server": "0.8.0-alpha.4"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "f82374e6f9daaf71ba63eaf156468ea7ddc042da"
+  "gitHead": "433f068ce4479a53f51d3ceac3f22b710e7bb13e"
 }

package/src/__tests__/acl.test.ts

@@ -1,8 +1,8 @@
 import { ACL } from '@nocobase/acl';
 import { Database } from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
-import UsersPlugin from '@nocobase/plugin-users';
 import { UiSchemaRepository } from '@nocobase/plugin-ui-schema-storage';
+import UsersPlugin from '@nocobase/plugin-users';
+import { MockServer } from '@nocobase/test';
 import { prepareApp } from './prepare';
 
 describe('acl', () => {
@@ -30,7 +30,7 @@ describe('acl', () => {
       },
     });
 
-    const userPlugin = app.getPlugin('@nocobase/plugin-users') as UsersPlugin;
+    const userPlugin = app.getPlugin('users') as UsersPlugin;
 
     adminAgent = app.agent().auth(
       userPlugin.jwtService.sign({
@@ -483,7 +483,7 @@ describe('acl', () => {
       },
     });
 
-    const userPlugin = app.getPlugin('@nocobase/plugin-users') as UsersPlugin;
+    const userPlugin = app.getPlugin('users') as UsersPlugin;
     const userAgent = app.agent().auth(
       userPlugin.jwtService.sign({
         userId: user.get('id'),
@@ -507,7 +507,7 @@ describe('acl', () => {
     expect(response.statusCode).toEqual(200);
   });
 
-  it('should sync data to acl before app start', async () => {
+  it('should sync data to acl after app reload', async () => {
     const role = await db.getRepository('roles').create({
       values: {
         name: 'new',
@@ -527,14 +527,14 @@ describe('acl', () => {
       hooks: false,
     });
 
-    expect(acl.getRole('new')).toBeUndefined();
+    expect(app.acl.getRole('new')).toBeUndefined();
 
-    await app.start();
+    await app.reload();
 
-    expect(acl.getRole('new')).toBeDefined();
+    expect(app.acl.getRole('new')).toBeDefined();
 
     expect(
-      acl.can({
+      app.acl.can({
         role: 'new',
         resource: 'posts',
         action: 'view',

package/src/__tests__/association-field.test.ts

@@ -48,7 +48,7 @@ describe('association field acl', () => {
       },
     });
 
-    const userPlugin = app.getPlugin('@nocobase/plugin-users') as UsersPlugin;
+    const userPlugin = app.getPlugin('users') as UsersPlugin;
     userAgent = app.agent().auth(
       userPlugin.jwtService.sign({
         userId: user.get('id'),

package/src/__tests__/configuration.test.ts

@@ -45,7 +45,7 @@ describe('configuration', () => {
       }
     });
 
-    const userPlugin = app.getPlugin('@nocobase/plugin-users') as UsersPlugin;
+    const userPlugin = app.getPlugin('users') as UsersPlugin;
     adminAgent = app.agent().auth(userPlugin.jwtService.sign({
       userId: admin.get('id'),
     }), { type: 'bearer' });

package/src/__tests__/middleware.test.ts

@@ -1,7 +1,7 @@
 import { ACL } from '@nocobase/acl';
 import { Database, Model } from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
 import UsersPlugin from '@nocobase/plugin-users';
+import { MockServer } from '@nocobase/test';
 import { prepareApp } from './prepare';
 
 describe('middleware', () => {
@@ -30,7 +30,7 @@ describe('middleware', () => {
       }
     });
 
-    const userPlugin = app.getPlugin('@nocobase/plugin-users') as UsersPlugin;
+    const userPlugin = app.getPlugin('users') as UsersPlugin;
     adminAgent = app.agent().auth(userPlugin.jwtService.sign({
       userId: admin.get('id'),
     }), { type: 'bearer' });

package/src/__tests__/own.test.ts

@@ -67,7 +67,7 @@ describe('own test', () => {
 
     admin = await db.getRepository('users').findOne();
 
-    pluginUser = app.getPlugin('@nocobase/plugin-users');
+    pluginUser = app.getPlugin('users');
 
     adminToken = pluginUser.jwtService.sign({ userId: admin.get('id') });
 

package/src/__tests__/prepare.ts

@@ -1,23 +1,18 @@
-import PluginUsers from '@nocobase/plugin-users';
-import PluginErrorHandler from '@nocobase/plugin-error-handler';
-import PluginCollectionManager from '@nocobase/plugin-collection-manager';
-import PluginUiSchema from '@nocobase/plugin-ui-schema-storage';
 import { mockServer } from '@nocobase/test';
 import PluginACL from '../server';
 
 export async function prepareApp() {
   const app = mockServer({
     registerActions: true,
+    acl: true,
+    plugins: ['error-handler', 'users', 'ui-schema-storage', 'collection-manager'],
   });
 
-  await app.cleanDb();
+  app.plugin(PluginACL, {
+    name: 'acl',
+  });
 
-  app.plugin(PluginUsers);
-  app.plugin(PluginUiSchema);
-  app.plugin(PluginErrorHandler);
-  app.plugin(PluginCollectionManager);
-  app.plugin(PluginACL);
-  await app.loadAndInstall();
+  await app.loadAndInstall({ clean: true });
 
   await app.db.sync();
 

package/src/__tests__/role-check.test.ts

@@ -1,6 +1,6 @@
-import { MockServer } from '@nocobase/test';
 import { Database } from '@nocobase/database';
 import UsersPlugin from '@nocobase/plugin-users';
+import { MockServer } from '@nocobase/test';
 
 import { prepareApp } from './prepare';
 
@@ -28,7 +28,7 @@ describe('role check action', () => {
         roles: ['test']
       }
     });
-    const userPlugin = app.getPlugin('@nocobase/plugin-users') as UsersPlugin;
+    const userPlugin = app.getPlugin('users') as UsersPlugin;
     const agent = app.agent().auth(userPlugin.jwtService.sign({
       userId: user.get('id'),
     }), { type: 'bearer' });

package/src/__tests__/role-resource.test.ts

@@ -1,6 +1,6 @@
 import { Database, Model } from '@nocobase/database';
-import UsersPlugin from '@nocobase/plugin-users';
 import { CollectionRepository } from '@nocobase/plugin-collection-manager';
+import UsersPlugin from '@nocobase/plugin-users';
 import { MockServer } from '@nocobase/test';
 import { prepareApp } from './prepare';
 
@@ -32,7 +32,7 @@ describe('role resource api', () => {
       }
     });
 
-    const userPlugin = app.getPlugin('@nocobase/plugin-users') as UsersPlugin;
+    const userPlugin = app.getPlugin('users') as UsersPlugin;
     adminAgent = app.agent().auth(userPlugin.jwtService.sign({
       userId: admin.get('id'),
     }), { type: 'bearer' });

package/src/__tests__/role-user.test.ts

@@ -12,12 +12,12 @@ describe('role', () => {
   beforeEach(async () => {
     api = mockServer();
     await api.cleanDb();
-    api.plugin(UsersPlugin);
-    api.plugin(PluginACL);
+    api.plugin(UsersPlugin, { name: 'users' });
+    api.plugin(PluginACL, { name: 'acl' });
     await api.loadAndInstall();
 
     db = api.db;
-    usersPlugin = api.getPlugin('@nocobase/plugin-users');
+    usersPlugin = api.getPlugin('users');
   });
 
   afterEach(async () => {

package/src/__tests__/role.test.ts

@@ -1,6 +1,6 @@
-import { MockServer } from '@nocobase/test';
 import { Database, Model } from '@nocobase/database';
 import UsersPlugin from '@nocobase/plugin-users';
+import { MockServer } from '@nocobase/test';
 
 import { prepareApp } from './prepare';
 
@@ -36,7 +36,7 @@ describe('role api', () => {
         },
       });
 
-      const userPlugin = app.getPlugin('@nocobase/plugin-users') as UsersPlugin;
+      const userPlugin = app.getPlugin('users') as UsersPlugin;
       adminAgent = app.agent().auth(
         userPlugin.jwtService.sign({
           userId: admin.get('id'),

package/src/__tests__/scope.test.ts

@@ -1,7 +1,7 @@
-import { prepareApp } from './prepare';
-import { MockServer } from '@nocobase/test';
 import { Database } from '@nocobase/database';
 import UsersPlugin from '@nocobase/plugin-users';
+import { MockServer } from '@nocobase/test';
+import { prepareApp } from './prepare';
 
 describe('scope api', () => {
   let app: MockServer;
@@ -25,7 +25,7 @@ describe('scope api', () => {
       }
     });
 
-    const userPlugin = app.getPlugin('@nocobase/plugin-users') as UsersPlugin;
+    const userPlugin = app.getPlugin('users') as UsersPlugin;
     adminAgent = app.agent().auth(userPlugin.jwtService.sign({
       userId: admin.get('id'),
     }), { type: 'bearer' });

package/src/__tests__/setCurrentRole.test.ts

@@ -15,7 +15,7 @@ describe('role', () => {
     api = await prepareApp();
 
     db = api.db;
-    usersPlugin = api.getPlugin('@nocobase/plugin-users');
+    usersPlugin = api.getPlugin('users');
 
     ctx = {
       db,

package/src/__tests__/users.test.ts

@@ -18,7 +18,7 @@ describe('actions', () => {
     app = await prepareApp();
     db = app.db;
 
-    pluginUser = app.getPlugin('@nocobase/plugin-users');
+    pluginUser = app.getPlugin('users');
     adminUser = await db.getRepository('users').findOne({
       filter: {
         email: process.env.INIT_ROOT_EMAIL

package/src/server.ts

@@ -1,6 +1,5 @@
 import { Context } from '@nocobase/actions';
 import { Collection } from '@nocobase/database';
-import UsersPlugin from '@nocobase/plugin-users';
 import { Plugin } from '@nocobase/server';
 import { resolve } from 'path';
 import { availableActionResource } from './actions/available-actions';
@@ -269,12 +268,49 @@ export class PluginACL extends Plugin {
     });
 
     // sync database role data to acl
-    this.app.on('beforeStart', async () => {
-      await this.writeRolesToACL();
+    this.app.on('afterLoad', async (app, options) => {
+      if (options?.method === 'install') {
+        return;
+      }
+      const exists = await this.app.db.collectionExistsInDb('roles');
+      if (exists) {
+        await this.writeRolesToACL();
+      }
+    });
+
+    this.app.on('afterInstall', async (app, options) => {
+      const exists = await this.app.db.collectionExistsInDb('roles');
+      if (exists) {
+        await this.writeRolesToACL();
+      }
+    });
+
+    this.app.on('afterInstallPlugin', async (plugin) => {
+      if (plugin.getName() !== 'users') {
+        return;
+      }
+      const User = this.db.getCollection('users');
+      await User.repository.update({
+        values: {
+          roles: ['root', 'admin', 'member'],
+        },
+        forceUpdate: true,
+      });
+
+      const RolesUsers = this.db.getCollection('rolesUsers');
+      await RolesUsers.repository.update({
+        filter: {
+          userId: 1,
+          roleName: 'root',
+        },
+        values: {
+          default: true,
+        },
+      });
     });
 
     this.app.on('beforeInstallPlugin', async (plugin) => {
-      if (plugin.constructor.name !== 'UsersPlugin') {
+      if (plugin.getName() !== 'users') {
         return;
       }
       const roles = this.app.db.getRepository('roles');
@@ -320,8 +356,7 @@ export class PluginACL extends Plugin {
       });
     });
 
-    const usersPlugin = this.app.pm.get('@nocobase/plugin-users') as UsersPlugin;
-    usersPlugin.tokenMiddleware.use(setCurrentRole);
+    this.app.resourcer.use(setCurrentRole, { tag: 'setCurrentRole', before: 'acl', after: 'parseToken' });
 
     this.app.acl.allow('users', 'setDefaultRole', 'loggedIn');
 
@@ -416,38 +451,12 @@ export class PluginACL extends Plugin {
     if (repo) {
       await repo.db2cm('roles');
     }
-
-    const User = this.db.getCollection('users');
-
-    await User.repository.update({
-      values: {
-        roles: ['root', 'admin', 'member'],
-      },
-      forceUpdate: true,
-    });
-
-    const RolesUsers = this.db.getCollection('rolesUsers');
-    await RolesUsers.repository.update({
-      filter: {
-        userId: 1,
-        roleName: 'root',
-      },
-      values: {
-        default: true,
-      },
-    });
   }
 
   async load() {
     await this.app.db.import({
       directory: resolve(__dirname, 'collections'),
     });
-
-    this.app.resourcer.use(this.acl.middleware());
-  }
-
-  getName(): string {
-    return this.getPackageName(__dirname);
   }
 }