@nocobase/plugin-acl 0.7.2-alpha.6 → 0.7.4-alpha.1

package/lib/actions/user-setDefaultRole.d.ts

@@ -0,0 +1,2 @@
+import { Context, Next } from '@nocobase/actions';
+export declare function setDefaultRole(ctx: Context, next: Next): Promise<any>;

package/lib/actions/user-setDefaultRole.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setDefaultRole = setDefaultRole;
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function setDefaultRole(_x, _x2) {
+  return _setDefaultRole.apply(this, arguments);
+}
+
+function _setDefaultRole() {
+  _setDefaultRole = _asyncToGenerator(function* (ctx, next) {
+    const roleName = ctx.action.params.values.roleName;
+    const db = ctx.db,
+          currentUser = ctx.state.currentUser,
+          values = ctx.action.params.values;
+
+    if (values.roleName == 'anonymous') {
+      return next();
+    }
+
+    const repository = db.getRepository('rolesUsers');
+    yield db.sequelize.transaction( /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator(function* (transaction) {
+        yield repository.update({
+          filter: {
+            userId: currentUser.get('id')
+          },
+          values: {
+            default: false
+          },
+          transaction
+        });
+        yield repository.update({
+          filter: {
+            userId: currentUser.get('id'),
+            roleName
+          },
+          values: {
+            default: true
+          },
+          transaction
+        });
+      });
+
+      return function (_x3) {
+        return _ref.apply(this, arguments);
+      };
+    }());
+    ctx.body = 'ok';
+    yield next();
+  });
+  return _setDefaultRole.apply(this, arguments);
+}

package/lib/collections/roles-users.d.ts

@@ -0,0 +1,3 @@
+import { CollectionOptions } from '@nocobase/database';
+declare const _default: CollectionOptions;
+export default _default;

package/lib/collections/roles-users.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  name: 'rolesUsers',
+  fields: [{
+    type: 'boolean',
+    name: 'default'
+  }]
+};
+exports.default = _default;

package/lib/collections/users.d.ts

@@ -0,0 +1,6 @@
+declare const _default: {
+    collectionOptions: import("@nocobase/database").CollectionOptions;
+    mergeOptions: import("@nocobase/database").MergeOptions;
+    extend: boolean;
+};
+export default _default;

package/lib/collections/users.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+function _database() {
+  const data = require("@nocobase/database");
+
+  _database = function _database() {
+    return data;
+  };
+
+  return data;
+}
+
+var _default = (0, _database().extend)({
+  name: 'users',
+  fields: [{
+    interface: 'm2m',
+    type: 'belongsToMany',
+    name: 'roles',
+    target: 'roles',
+    foreignKey: 'userId',
+    otherKey: 'roleName',
+    sourceKey: 'id',
+    targetKey: 'name',
+    through: 'rolesUsers',
+    uiSchema: {
+      type: 'array',
+      title: '{{t("Roles")}}',
+      'x-component': 'RecordPicker',
+      'x-component-props': {
+        multiple: true,
+        fieldNames: {
+          label: 'title',
+          value: 'name'
+        }
+      }
+    }
+  }]
+});
+
+exports.default = _default;

package/lib/middlewares/setCurrentRole.d.ts

@@ -0,0 +1 @@
+export declare function setCurrentRole(ctx: any, next: any): Promise<any>;

package/lib/middlewares/setCurrentRole.js

@@ -0,0 +1,57 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setCurrentRole = setCurrentRole;
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function setCurrentRole(_x, _x2) {
+  return _setCurrentRole.apply(this, arguments);
+}
+
+function _setCurrentRole() {
+  _setCurrentRole = _asyncToGenerator(function* (ctx, next) {
+    let currentRole = ctx.get('X-Role');
+
+    if (currentRole === 'anonymous') {
+      ctx.state.currentRole = currentRole;
+      return next();
+    }
+
+    if (!ctx.state.currentUser) {
+      return next();
+    }
+
+    const repository = ctx.db.getRepository('users.roles', ctx.state.currentUser.id);
+    const roles = yield repository.find();
+    ctx.state.currentUser.setDataValue('roles', roles);
+
+    if (roles.length == 1) {
+      currentRole = roles[0].name;
+    } else if (roles.length > 1) {
+      const role = roles.find(item => item.name === currentRole);
+
+      if (!role) {
+        var _ref;
+
+        const defaultRole = roles.find(item => {
+          var _item$rolesUsers;
+
+          return item === null || item === void 0 ? void 0 : (_item$rolesUsers = item.rolesUsers) === null || _item$rolesUsers === void 0 ? void 0 : _item$rolesUsers.default;
+        });
+        currentRole = (_ref = defaultRole || roles[0]) === null || _ref === void 0 ? void 0 : _ref.name;
+      }
+    }
+
+    if (currentRole) {
+      ctx.state.currentRole = currentRole;
+    }
+
+    yield next();
+  });
+  return _setCurrentRole.apply(this, arguments);
+}

package/lib/server.js

@@ -31,6 +31,10 @@ var _roleCheck = require("./actions/role-check");
 
 var _roleCollections = require("./actions/role-collections");
 
+var _userSetDefaultRole = require("./actions/user-setDefaultRole");
+
+var _setCurrentRole = require("./middlewares/setCurrentRole");
+
 var _RoleModel = require("./model/RoleModel");
 
 var _RoleResourceActionModel = require("./model/RoleResourceActionModel");
@@ -209,9 +213,38 @@ class PluginACL extends _server().Plugin {
 
       _this4.app.resourcer.registerActionHandler('roles:check', _roleCheck.checkAction);
 
-      _this4.app.db.on('roles.afterSaveWithAssociations', /*#__PURE__*/function () {
+      _this4.app.resourcer.registerActionHandler(`users:setDefaultRole`, _userSetDefaultRole.setDefaultRole);
+
+      _this4.db.on('users.afterCreateWithAssociations', /*#__PURE__*/function () {
         var _ref = _asyncToGenerator(function* (model, options) {
           const transaction = options.transaction;
+
+          const repository = _this4.app.db.getRepository('roles');
+
+          const defaultRole = yield repository.findOne({
+            filter: {
+              default: true
+            },
+            transaction
+          });
+
+          if (defaultRole && (yield model.countRoles({
+            transaction
+          })) == 0) {
+            yield model.addRoles(defaultRole, {
+              transaction
+            });
+          }
+        });
+
+        return function (_x, _x2) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+
+      _this4.app.db.on('roles.afterSaveWithAssociations', /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator(function* (model, options) {
+          const transaction = options.transaction;
           model.writeToAcl({
             acl: _this4.acl
           });
@@ -247,8 +280,8 @@ class PluginACL extends _server().Plugin {
           }
         });
 
-        return function (_x, _x2) {
-          return _ref.apply(this, arguments);
+        return function (_x3, _x4) {
+          return _ref2.apply(this, arguments);
         };
       }());
 
@@ -259,17 +292,17 @@ class PluginACL extends _server().Plugin {
       });
 
       _this4.app.db.on('rolesResources.afterSaveWithAssociations', /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator(function* (model, options) {
+        var _ref3 = _asyncToGenerator(function* (model, options) {
           yield _this4.writeResourceToACL(model, options.transaction);
         });
 
-        return function (_x3, _x4) {
-          return _ref2.apply(this, arguments);
+        return function (_x5, _x6) {
+          return _ref3.apply(this, arguments);
         };
       }());
 
       _this4.app.db.on('rolesResourcesActions.afterUpdateWithAssociations', /*#__PURE__*/function () {
-        var _ref3 = _asyncToGenerator(function* (model, options) {
+        var _ref4 = _asyncToGenerator(function* (model, options) {
           const transaction = options.transaction;
           const resource = yield model.getResource({
             transaction
@@ -277,13 +310,13 @@ class PluginACL extends _server().Plugin {
           yield _this4.writeResourceToACL(resource, transaction);
         });
 
-        return function (_x5, _x6) {
-          return _ref3.apply(this, arguments);
+        return function (_x7, _x8) {
+          return _ref4.apply(this, arguments);
         };
       }());
 
       _this4.app.db.on('rolesResources.afterDestroy', /*#__PURE__*/function () {
-        var _ref4 = _asyncToGenerator(function* (model, options) {
+        var _ref5 = _asyncToGenerator(function* (model, options) {
           const role = _this4.acl.getRole(model.get('roleName'));
 
           if (role) {
@@ -291,13 +324,13 @@ class PluginACL extends _server().Plugin {
           }
         });
 
-        return function (_x7, _x8) {
-          return _ref4.apply(this, arguments);
+        return function (_x9, _x10) {
+          return _ref5.apply(this, arguments);
         };
       }());
 
       _this4.app.db.on('collections.afterDestroy', /*#__PURE__*/function () {
-        var _ref5 = _asyncToGenerator(function* (model, options) {
+        var _ref6 = _asyncToGenerator(function* (model, options) {
           const transaction = options.transaction;
           yield _this4.app.db.getRepository('rolesResources').destroy({
             filter: {
@@ -307,13 +340,13 @@ class PluginACL extends _server().Plugin {
           });
         });
 
-        return function (_x9, _x10) {
-          return _ref5.apply(this, arguments);
+        return function (_x11, _x12) {
+          return _ref6.apply(this, arguments);
         };
       }());
 
       _this4.app.db.on('fields.afterCreate', /*#__PURE__*/function () {
-        var _ref6 = _asyncToGenerator(function* (model, options) {
+        var _ref7 = _asyncToGenerator(function* (model, options) {
           const transaction = options.transaction;
           const collectionName = model.get('collectionName');
           const fieldName = model.get('name');
@@ -348,13 +381,13 @@ class PluginACL extends _server().Plugin {
           }
         });
 
-        return function (_x11, _x12) {
-          return _ref6.apply(this, arguments);
+        return function (_x13, _x14) {
+          return _ref7.apply(this, arguments);
         };
       }());
 
       _this4.app.db.on('fields.afterDestroy', /*#__PURE__*/function () {
-        var _ref7 = _asyncToGenerator(function* (model, options) {
+        var _ref8 = _asyncToGenerator(function* (model, options) {
           const collectionName = model.get('collectionName');
           const fieldName = model.get('name');
           const resourceActions = yield _this4.app.db.getRepository('rolesResourcesActions').find({
@@ -388,8 +421,8 @@ class PluginACL extends _server().Plugin {
           }
         });
 
-        return function (_x13, _x14) {
-          return _ref7.apply(this, arguments);
+        return function (_x15, _x16) {
+          return _ref8.apply(this, arguments);
         };
       }()); // sync database role data to acl
 
@@ -399,7 +432,7 @@ class PluginACL extends _server().Plugin {
       }));
 
       _this4.app.on('beforeInstallPlugin', /*#__PURE__*/function () {
-        var _ref9 = _asyncToGenerator(function* (plugin) {
+        var _ref10 = _asyncToGenerator(function* (plugin) {
           if (plugin.constructor.name !== 'UsersPlugin') {
             return;
           }
@@ -417,7 +450,7 @@ class PluginACL extends _server().Plugin {
               allowConfigure: true,
               allowNewMenu: true,
               strategy: {
-                actions: ['create', 'export', 'view', 'update', 'destroy']
+                actions: ['create', 'view', 'update', 'destroy']
               }
             }, {
               name: 'member',
@@ -447,11 +480,17 @@ class PluginACL extends _server().Plugin {
           });
         });
 
-        return function (_x15) {
-          return _ref9.apply(this, arguments);
+        return function (_x17) {
+          return _ref10.apply(this, arguments);
         };
       }());
 
+      const usersPlugin = _this4.app.pm.get('@nocobase/plugin-users');
+
+      usersPlugin.tokenMiddleware.use(_setCurrentRole.setCurrentRole);
+
+      _this4.app.acl.allow('users', 'setDefaultRole', 'loggedIn');
+
       _this4.app.acl.allow('roles', 'check', 'loggedIn');
 
       _this4.app.acl.allow('roles', ['create', 'update', 'destroy'], 'allowConfigure');
@@ -463,14 +502,14 @@ class PluginACL extends _server().Plugin {
       });
 
       _this4.app.resourcer.use( /*#__PURE__*/function () {
-        var _ref10 = _asyncToGenerator(function* (ctx, next) {
+        var _ref11 = _asyncToGenerator(function* (ctx, next) {
           const _ctx$action = ctx.action,
                 actionName = _ctx$action.actionName,
                 resourceName = _ctx$action.resourceName,
                 params = _ctx$action.params;
 
-          const _ref11 = params || {},
-                showAnonymous = _ref11.showAnonymous;
+          const _ref12 = params || {},
+                showAnonymous = _ref12.showAnonymous;
 
           if (actionName === 'list' && resourceName === 'roles') {
             if (!showAnonymous) {
@@ -491,13 +530,13 @@ class PluginACL extends _server().Plugin {
           yield next();
         });
 
-        return function (_x16, _x17) {
-          return _ref10.apply(this, arguments);
+        return function (_x18, _x19) {
+          return _ref11.apply(this, arguments);
         };
       }());
 
       _this4.app.acl.use( /*#__PURE__*/function () {
-        var _ref12 = _asyncToGenerator(function* (ctx, next) {
+        var _ref13 = _asyncToGenerator(function* (ctx, next) {
           const _ctx$action2 = ctx.action,
                 actionName = _ctx$action2.actionName,
                 resourceName = _ctx$action2.resourceName;
@@ -536,15 +575,15 @@ class PluginACL extends _server().Plugin {
           return next();
         });
 
-        return function (_x18, _x19) {
-          return _ref12.apply(this, arguments);
+        return function (_x20, _x21) {
+          return _ref13.apply(this, arguments);
         };
       }());
 
       const parseJsonTemplate = _this4.app.acl.parseJsonTemplate;
 
       _this4.app.acl.use( /*#__PURE__*/function () {
-        var _ref13 = _asyncToGenerator(function* (ctx, next) {
+        var _ref14 = _asyncToGenerator(function* (ctx, next) {
           const _ctx$action3 = ctx.action,
                 actionName = _ctx$action3.actionName,
                 resourceName = _ctx$action3.resourceName,
@@ -595,8 +634,8 @@ class PluginACL extends _server().Plugin {
           yield next();
         });
 
-        return function (_x20, _x21) {
-          return _ref13.apply(this, arguments);
+        return function (_x22, _x23) {
+          return _ref14.apply(this, arguments);
         };
       }());
     })();
@@ -611,6 +650,26 @@ 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']
+        }
+      });
+
+      const RolesUsers = _this5.db.getCollection('rolesUsers');
+
+      yield RolesUsers.repository.update({
+        filter: {
+          userId: 1,
+          roleName: 'root'
+        },
+        values: {
+          default: true
+        }
+      });
     })();
   }
 

package/package.json

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