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

package/lib/actions/users.d.ts

@@ -8,4 +8,3 @@ export declare function resetpassword(ctx: Context, next: Next): Promise<void>;
 export declare function getUserByResetToken(ctx: Context, next: Next): Promise<void>;
 export declare function updateProfile(ctx: Context, next: Next): Promise<void>;
 export declare function changePassword(ctx: Context, next: Next): Promise<void>;
-export declare function setDefaultRole(ctx: Context, next: Next): Promise<void>;

package/lib/actions/users.js

@@ -8,7 +8,6 @@ exports.check = check;
 exports.getUserByResetToken = getUserByResetToken;
 exports.lostpassword = lostpassword;
 exports.resetpassword = resetpassword;
-exports.setDefaultRole = setDefaultRole;
 exports.signin = signin;
 exports.signout = signout;
 exports.signup = signup;
@@ -280,18 +279,4 @@ function _changePassword() {
     yield next();
   });
   return _changePassword.apply(this, arguments);
-}
-
-function setDefaultRole(_x19, _x20) {
-  return _setDefaultRole.apply(this, arguments);
-}
-
-function _setDefaultRole() {
-  _setDefaultRole = _asyncToGenerator(function* (ctx, next) {
-    const roleName = ctx.action.params.values.roleName;
-    yield ctx.state.currentUser.setDefaultRole(roleName);
-    ctx.body = 'ok';
-    yield next();
-  });
-  return _setDefaultRole.apply(this, arguments);
 }

package/lib/collections/users.js

@@ -43,6 +43,7 @@ var _default = {
       type: 'string',
       title: '{{t("Email")}}',
       'x-component': 'Input',
+      'x-validator': 'email',
       require: true
     }
   }, {
@@ -55,28 +56,6 @@ var _default = {
       title: '{{t("Password")}}',
       'x-component': 'Password'
     }
-  }, {
-    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'
-        }
-      }
-    }
   }, {
     type: 'string',
     name: 'appLang'

package/lib/jwt-service.js

@@ -24,7 +24,7 @@ class JwtService {
   }
 
   expiresIn() {
-    return this.options.expiresIn || '7d';
+    return this.options.expiresIn || process.env.JWT_EXPIRES_IN || '7d';
   }
 
   secret() {

package/lib/middlewares/parseToken.d.ts

@@ -1,6 +1,5 @@
-import { Context, Next } from '@nocobase/actions';
+import { MiddlewareManager } from '@nocobase/resourcer';
 import UsersPlugin from '../server';
 export declare function parseToken(options?: {
     plugin: UsersPlugin;
-}): (ctx: Context, next: Next) => Promise<any>;
-export declare function setCurrentRole(ctx: any): void;
+}): MiddlewareManager;

package/lib/middlewares/parseToken.js

@@ -4,7 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.parseToken = parseToken;
-exports.setCurrentRole = setCurrentRole;
+
+function _resourcer() {
+  const data = require("@nocobase/resourcer");
+
+  _resourcer = function _resourcer() {
+    return data;
+  };
+
+  return data;
+}
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -25,56 +34,23 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 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 parseToken(options) {
-  return /*#__PURE__*/function () {
-    var _parseToken = _asyncToGenerator(function* (ctx, next) {
+  const middleware = new (_resourcer().MiddlewareManager)();
+  middleware.use( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(function* (ctx, next) {
       const user = yield findUserByToken(ctx, options.plugin);
 
       if (user) {
         ctx.state.currentUser = user;
-        setCurrentRole(ctx);
       }
 
       return next();
     });
 
-    function parseToken(_x, _x2) {
-      return _parseToken.apply(this, arguments);
-    }
-
-    return parseToken;
-  }();
-}
-
-function setCurrentRole(ctx) {
-  let currentRole = ctx.get('X-Role');
-
-  if (currentRole === 'anonymous') {
-    ctx.state.currentRole = currentRole;
-    return;
-  }
-
-  const userRoles = ctx.state.currentUser.roles;
-
-  if (userRoles.length == 1) {
-    currentRole = userRoles[0].name;
-  } else if (userRoles.length > 1) {
-    const role = userRoles.find(role => role.name === currentRole);
-
-    if (!role) {
-      var _ref;
-
-      const defaultRole = userRoles.find(role => {
-        var _role$rolesUsers;
-
-        return role === null || role === void 0 ? void 0 : (_role$rolesUsers = role.rolesUsers) === null || _role$rolesUsers === void 0 ? void 0 : _role$rolesUsers.default;
-      });
-      currentRole = (_ref = defaultRole || userRoles[0]) === null || _ref === void 0 ? void 0 : _ref.name;
-    }
-  }
-
-  if (currentRole) {
-    ctx.state.currentRole = currentRole;
-  }
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }());
+  return middleware;
 }
 
 function findUserByToken(_x3, _x4) {
@@ -94,7 +70,7 @@ function _findUserByToken() {
             userId = _yield$plugin$jwtServ.userId;
 
       const collection = ctx.db.getCollection('users');
-      const appends = ['roles'];
+      ctx.state.currentUserAppends = ctx.state.currentUserAppends || [];
 
       var _iterator = _createForOfIteratorHelper(collection.fields),
           _step;
@@ -105,7 +81,7 @@ function _findUserByToken() {
                 field = _step$value[1];
 
           if (field.type === 'belongsTo') {
-            appends.push(field.name);
+            ctx.state.currentUserAppends.push(field.name);
           }
         }
       } catch (err) {
@@ -115,7 +91,7 @@ function _findUserByToken() {
       }
 
       return yield ctx.db.getRepository('users').findOne({
-        appends,
+        appends: ctx.state.currentUserAppends,
         filter: {
           id: userId
         }

package/lib/server.d.ts

@@ -5,6 +5,7 @@ export interface UserPluginConfig {
 }
 export default class UsersPlugin extends Plugin<UserPluginConfig> {
     jwtService: JwtService;
+    tokenMiddleware: any;
     constructor(app: any, options: any);
     beforeLoad(): Promise<void>;
     load(): Promise<void>;

package/lib/server.js

@@ -55,8 +55,6 @@ var _locale = require("./locale");
 
 var middlewares = _interopRequireWildcard(require("./middlewares"));
 
-var _UserModel = require("./models/UserModel");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -83,7 +81,11 @@ class UsersPlugin extends _server().Plugin {
   constructor(app, options) {
     super(app, options);
     this.jwtService = void 0;
+    this.tokenMiddleware = void 0;
     this.jwtService = new _jwtService.JwtService((options === null || options === void 0 ? void 0 : options.jwt) || {});
+    this.tokenMiddleware = middlewares.parseToken({
+      plugin: this
+    });
   }
 
   beforeLoad() {
@@ -124,41 +126,6 @@ class UsersPlugin extends _server().Plugin {
 
       });
 
-      _this.db.registerModels({
-        UserModel: _UserModel.UserModel
-      });
-
-      _this.db.on('users.afterCreateWithAssociations', /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator(function* (model, options) {
-          const transaction = options.transaction;
-
-          const repository = _this.app.db.getRepository('roles');
-
-          if (!repository) {
-            return;
-          }
-
-          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);
-        };
-      }());
-
       _this.db.on('afterDefineCollection', collection => {
         let _collection$options = collection.options,
             createdBy = _collection$options.createdBy,
@@ -206,12 +173,10 @@ class UsersPlugin extends _server().Plugin {
         _this.app.resourcer.registerActionHandler(`users:${key}`, action);
       }
 
-      _this.app.resourcer.use(middlewares.parseToken({
-        plugin: _this
-      }));
+      _this.app.resourcer.use(_this.tokenMiddleware.compose());
 
       const publicActions = ['check', 'signin', 'signup', 'lostpassword', 'resetpassword', 'getUserByResetToken'];
-      const loggedInActions = ['signout', 'updateProfile', 'changePassword', 'setDefaultRole'];
+      const loggedInActions = ['signout', 'updateProfile', 'changePassword'];
       publicActions.forEach(action => _this.app.acl.allow('users', action));
       loggedInActions.forEach(action => _this.app.acl.allow('users', action, 'loggedIn'));
     })();
@@ -235,13 +200,13 @@ class UsersPlugin extends _server().Plugin {
           INIT_ROOT_PASSWORD = _process$env.INIT_ROOT_PASSWORD,
           INIT_ROOT_EMAIL = _process$env.INIT_ROOT_EMAIL;
 
-    const _ref2 = options.users || (options === null || options === void 0 ? void 0 : (_options$cliArgs = options.cliArgs) === null || _options$cliArgs === void 0 ? void 0 : _options$cliArgs[0]) || {},
-          _ref2$rootEmail = _ref2.rootEmail,
-          rootEmail = _ref2$rootEmail === void 0 ? INIT_ROOT_EMAIL : _ref2$rootEmail,
-          _ref2$rootPassword = _ref2.rootPassword,
-          rootPassword = _ref2$rootPassword === void 0 ? INIT_ROOT_PASSWORD : _ref2$rootPassword,
-          _ref2$rootNickname = _ref2.rootNickname,
-          rootNickname = _ref2$rootNickname === void 0 ? INIT_ROOT_NICKNAME || 'Super Admin' : _ref2$rootNickname;
+    const _ref = options.users || (options === null || options === void 0 ? void 0 : (_options$cliArgs = options.cliArgs) === null || _options$cliArgs === void 0 ? void 0 : _options$cliArgs[0]) || {},
+          _ref$rootEmail = _ref.rootEmail,
+          rootEmail = _ref$rootEmail === void 0 ? INIT_ROOT_EMAIL : _ref$rootEmail,
+          _ref$rootPassword = _ref.rootPassword,
+          rootPassword = _ref$rootPassword === void 0 ? INIT_ROOT_PASSWORD : _ref$rootPassword,
+          _ref$rootNickname = _ref.rootNickname,
+          rootNickname = _ref$rootNickname === void 0 ? INIT_ROOT_NICKNAME || 'Super Admin' : _ref$rootNickname;
 
     return {
       rootEmail,
@@ -265,11 +230,9 @@ class UsersPlugin extends _server().Plugin {
         values: {
           email: rootEmail,
           password: rootPassword,
-          nickname: rootNickname,
-          roles: ['root', 'admin', 'member']
+          nickname: rootNickname
         }
       });
-      yield user.setDefaultRole('root');
 
       const repo = _this3.db.getRepository('collections');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-users",
-  "version": "0.7.2-alpha.6",
+  "version": "0.7.4-alpha.1",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -13,9 +13,9 @@
     "jsonwebtoken": "^8.5.1"
   },
   "devDependencies": {
-    "@nocobase/test": "0.7.2-alpha.6",
+    "@nocobase/test": "0.7.4-alpha.1",
     "@types/jsonwebtoken": "^8.5.8",
     "json-templates": "^4.2.0"
   },
-  "gitHead": "c5f7034351f0c85857d0756f033566570a53df54"
+  "gitHead": "543eb1c0308bb72a5ba54f208586cd78bfda8fa9"
 }

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

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

package/lib/collections/roles-users.js

@@ -1,14 +0,0 @@
-"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/models/UserModel.d.ts

@@ -1,4 +0,0 @@
-import { Model, Transactionable } from '@nocobase/database';
-export declare class UserModel extends Model {
-    setDefaultRole(roleName: string, options?: Transactionable): Promise<boolean>;
-}

package/lib/models/UserModel.js

@@ -1,72 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.UserModel = void 0;
-
-function _database() {
-  const data = require("@nocobase/database");
-
-  _database = function _database() {
-    return data;
-  };
-
-  return data;
-}
-
-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); }); }; }
-
-class UserModel extends _database().Model {
-  setDefaultRole(roleName, options = {}) {
-    var _this = this;
-
-    return _asyncToGenerator(function* () {
-      if (roleName == 'anonymous') {
-        return false;
-      }
-
-      const db = _this.constructor.database;
-      const repository = db.getRepository('rolesUsers');
-
-      if (!repository) {
-        return false;
-      }
-
-      const transaction = options.transaction || (yield db.sequelize.transaction());
-
-      try {
-        yield repository.update({
-          filter: {
-            userId: _this.get('id')
-          },
-          values: {
-            default: false
-          },
-          transaction
-        });
-        yield repository.update({
-          filter: {
-            userId: _this.get('id'),
-            roleName
-          },
-          values: {
-            default: true
-          },
-          transaction
-        });
-        yield transaction.commit();
-      } catch (error) {
-        yield transaction.rollback();
-        throw error;
-      }
-
-      return true;
-    })();
-  }
-
-}
-
-exports.UserModel = UserModel;