@nocobase/plugin-users 0.9.1-alpha.1 → 0.9.2-alpha.1

package/lib/actions/users.js

@@ -12,53 +12,34 @@ exports.signin = signin;
 exports.signout = signout;
 exports.signup = signup;
 exports.updateProfile = updateProfile;
-
 function _resourcer() {
   const data = require("@nocobase/resourcer");
-
   _resourcer = function _resourcer() {
     return data;
   };
-
   return data;
 }
-
 function _crypto() {
   const data = _interopRequireDefault(require("crypto"));
-
   _crypto = function _crypto() {
     return data;
   };
-
   return data;
 }
-
 var _ = require("../");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-
 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 check(_x, _x2) {
   return _check.apply(this, arguments);
 }
-
 function _check() {
   _check = _asyncToGenerator(function* (ctx, next) {
     if (ctx.state.currentUser) {
@@ -67,33 +48,26 @@ function _check() {
     } else {
       ctx.body = {};
     }
-
     yield next();
   });
   return _check.apply(this, arguments);
 }
-
 function signin(_x3, _x4) {
   return _signin.apply(this, arguments);
 }
-
 function _signin() {
   _signin = _asyncToGenerator(function* (ctx, next) {
     const _ctx$app$getPlugin = ctx.app.getPlugin('users'),
-          authenticators = _ctx$app$getPlugin.authenticators,
-          jwtService = _ctx$app$getPlugin.jwtService;
-
+      authenticators = _ctx$app$getPlugin.authenticators,
+      jwtService = _ctx$app$getPlugin.jwtService;
     const branches = {};
-
     var _iterator = _createForOfIteratorHelper(authenticators.getEntities()),
-        _step;
-
+      _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         const _step$value = _slicedToArray(_step.value, 2),
-              name = _step$value[0],
-              authenticator = _step$value[1];
-
+          name = _step$value[0],
+          authenticator = _step$value[1];
         branches[name] = authenticator;
       }
     } catch (err) {
@@ -101,10 +75,8 @@ function _signin() {
     } finally {
       _iterator.f();
     }
-
     return (0, _resourcer().branch)(branches, context => {
       var _context$action$param;
-
       return (_context$action$param = context.action.params.authenticator) !== null && _context$action$param !== void 0 ? _context$action$param : 'password';
     })(ctx, () => {
       const user = ctx.state.currentUser.toJSON();
@@ -120,11 +92,9 @@ function _signin() {
   });
   return _signin.apply(this, arguments);
 }
-
 function signout(_x5, _x6) {
   return _signout.apply(this, arguments);
 }
-
 function _signout() {
   _signout = _asyncToGenerator(function* (ctx, next) {
     ctx.body = ctx.state.currentUser;
@@ -132,11 +102,9 @@ function _signout() {
   });
   return _signout.apply(this, arguments);
 }
-
 function signup(_x7, _x8) {
   return _signup.apply(this, arguments);
 }
-
 function _signup() {
   _signup = _asyncToGenerator(function* (ctx, next) {
     const User = ctx.db.getRepository('users');
@@ -149,15 +117,12 @@ function _signup() {
   });
   return _signup.apply(this, arguments);
 }
-
 function lostpassword(_x9, _x10) {
   return _lostpassword.apply(this, arguments);
 }
-
 function _lostpassword() {
   _lostpassword = _asyncToGenerator(function* (ctx, next) {
     const email = ctx.action.params.values.email;
-
     if (!email) {
       ctx.throw(400, {
         code: 'InvalidUserData',
@@ -166,14 +131,12 @@ function _lostpassword() {
         })
       });
     }
-
     const User = ctx.db.getCollection('users');
     const user = yield User.model.findOne({
       where: {
         email
       }
     });
-
     if (!user) {
       ctx.throw(404, {
         code: 'InvalidUserData',
@@ -182,7 +145,6 @@ function _lostpassword() {
         })
       });
     }
-
     user.resetToken = _crypto().default.randomBytes(20).toString('hex');
     yield user.save();
     ctx.body = user;
@@ -190,17 +152,15 @@ function _lostpassword() {
   });
   return _lostpassword.apply(this, arguments);
 }
-
 function resetpassword(_x11, _x12) {
   return _resetpassword.apply(this, arguments);
 }
-
 function _resetpassword() {
   _resetpassword = _asyncToGenerator(function* (ctx, next) {
     const _ctx$action$params$va = ctx.action.params.values,
-          email = _ctx$action$params$va.email,
-          password = _ctx$action$params$va.password,
-          resetToken = _ctx$action$params$va.resetToken;
+      email = _ctx$action$params$va.email,
+      password = _ctx$action$params$va.password,
+      resetToken = _ctx$action$params$va.resetToken;
     const User = ctx.db.getCollection('users');
     const user = yield User.model.findOne({
       where: {
@@ -208,11 +168,9 @@ function _resetpassword() {
         resetToken
       }
     });
-
     if (!user) {
       ctx.throw(404);
     }
-
     user.token = null;
     user.resetToken = null;
     user.password = password;
@@ -222,11 +180,9 @@ function _resetpassword() {
   });
   return _resetpassword.apply(this, arguments);
 }
-
 function getUserByResetToken(_x13, _x14) {
   return _getUserByResetToken.apply(this, arguments);
 }
-
 function _getUserByResetToken() {
   _getUserByResetToken = _asyncToGenerator(function* (ctx, next) {
     const token = ctx.action.params.token;
@@ -236,30 +192,24 @@ function _getUserByResetToken() {
         resetToken: token
       }
     });
-
     if (!user) {
       ctx.throw(401);
     }
-
     ctx.body = user;
     yield next();
   });
   return _getUserByResetToken.apply(this, arguments);
 }
-
 function updateProfile(_x15, _x16) {
   return _updateProfile.apply(this, arguments);
 }
-
 function _updateProfile() {
   _updateProfile = _asyncToGenerator(function* (ctx, next) {
     const values = ctx.action.params.values;
     const currentUser = ctx.state.currentUser;
-
     if (!currentUser) {
       ctx.throw(401);
     }
-
     const UserRepo = ctx.db.getRepository('users');
     const result = yield UserRepo.update({
       filterByTk: currentUser.id,
@@ -270,21 +220,17 @@ function _updateProfile() {
   });
   return _updateProfile.apply(this, arguments);
 }
-
 function changePassword(_x17, _x18) {
   return _changePassword.apply(this, arguments);
 }
-
 function _changePassword() {
   _changePassword = _asyncToGenerator(function* (ctx, next) {
     const _ctx$action$params$va2 = ctx.action.params.values,
-          oldPassword = _ctx$action$params$va2.oldPassword,
-          newPassword = _ctx$action$params$va2.newPassword;
-
+      oldPassword = _ctx$action$params$va2.oldPassword,
+      newPassword = _ctx$action$params$va2.newPassword;
     if (!ctx.state.currentUser) {
       ctx.throw(401);
     }
-
     const User = ctx.db.getCollection('users');
     const user = yield User.model.findOne({
       where: {
@@ -293,13 +239,11 @@ function _changePassword() {
     });
     const pwd = User.getField('password');
     const isValid = yield pwd.verify(oldPassword, user.password);
-
     if (!isValid) {
       ctx.throw(401, ctx.t('The password is incorrect, please re-enter', {
         ns: _.namespace
       }));
     }
-
     user.password = newPassword;
     user.save();
     ctx.body = ctx.state.currentUser.toJSON();

package/lib/authenticators/index.js

@@ -4,60 +4,42 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 function _path() {
   const data = _interopRequireDefault(require("path"));
-
   _path = function _path() {
     return data;
   };
-
   return data;
 }
-
 function _utils() {
   const data = require("@nocobase/utils");
-
   _utils = function _utils() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 ;
-
 function _default(plugin, more = {}) {
   const authenticators = plugin.authenticators;
   const natives = ['password'].reduce((result, key) => Object.assign(result, {
     [key]: (0, _utils().requireModule)(_path().default.isAbsolute(key) ? key : _path().default.join(__dirname, key))
   }), {});
-
   for (var _i = 0, _Object$entries = Object.entries(_objectSpread(_objectSpread({}, more), natives)); _i < _Object$entries.length; _i++) {
     const _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-          name = _Object$entries$_i[0],
-          authenticator = _Object$entries$_i[1];
-
+      name = _Object$entries$_i[0],
+      authenticator = _Object$entries$_i[1];
     authenticators.register(name, authenticator);
   }
 }

package/lib/authenticators/password.js

@@ -4,24 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 var _ = require("..");
-
 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 _default(_x, _x2) {
   return _ref.apply(this, arguments);
 }
-
 function _ref() {
   _ref = _asyncToGenerator(function* (ctx, next) {
     const _ctx$action$params = ctx.action.params,
-          _ctx$action$params$un = _ctx$action$params.uniqueField,
-          uniqueField = _ctx$action$params$un === void 0 ? 'email' : _ctx$action$params$un,
-          values = _ctx$action$params.values;
-
+      _ctx$action$params$un = _ctx$action$params.uniqueField,
+      uniqueField = _ctx$action$params$un === void 0 ? 'email' : _ctx$action$params$un,
+      values = _ctx$action$params.values;
     if (!values[uniqueField]) {
       return ctx.throw(400, {
         code: 'InvalidUserData',
@@ -30,29 +24,24 @@ function _ref() {
         })
       });
     }
-
     const User = ctx.db.getCollection('users');
     const user = yield User.model.findOne({
       where: {
         [uniqueField]: values[uniqueField]
       }
     });
-
     if (!user) {
       return ctx.throw(404, ctx.t('The email is incorrect, please re-enter', {
         ns: _.namespace
       }));
     }
-
     const field = User.getField('password');
     const valid = yield field.verify(values.password, user.password);
-
     if (!valid) {
       return ctx.throw(404, ctx.t('The password is incorrect, please re-enter', {
         ns: _.namespace
       }));
     }
-
     ctx.state.currentUser = user;
     return next();
   });

package/lib/collections/users.js

@@ -5,8 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
-  namespace: 'users',
-  duplicator: 'optional',
+  namespace: 'users.users',
+  duplicator: {
+    dumpable: 'optional',
+    with: 'rolesUsers'
+  },
   name: 'users',
   title: '{{t("Users")}}',
   sortable: 'sort',
@@ -78,6 +81,10 @@ var _default = {
     name: 'resetToken',
     unique: true,
     hidden: true
+  }, {
+    type: 'json',
+    name: 'systemSettings',
+    defaultValue: {}
   }]
 };
 exports.default = _default;

package/lib/index.js

@@ -10,11 +10,7 @@ Object.defineProperty(exports, "default", {
   }
 });
 exports.namespace = void 0;
-
 var _server = _interopRequireDefault(require("./server"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const namespace = require('../package.json').name;
-
 exports.namespace = namespace;

package/lib/jwt-service.js

@@ -4,51 +4,39 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.JwtService = void 0;
-
 function _jsonwebtoken() {
   const data = _interopRequireDefault(require("jsonwebtoken"));
-
   _jsonwebtoken = function _jsonwebtoken() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 class JwtService {
   constructor(options) {
     this.options = void 0;
     this.options = options;
   }
-
   expiresIn() {
     return this.options.expiresIn || process.env.JWT_EXPIRES_IN || '7d';
   }
-
   secret() {
     return this.options.secret || process.env.APP_KEY;
   }
-
   sign(payload) {
     return _jsonwebtoken().default.sign(payload, this.secret(), {
       expiresIn: this.expiresIn()
     });
   }
-
   decode(token) {
     return new Promise((resolve, reject) => {
       _jsonwebtoken().default.verify(token, this.secret(), (err, decoded) => {
         if (err) {
           return reject(err);
         }
-
         resolve(decoded);
       });
     });
   }
-
 }
-
 exports.JwtService = JwtService;

package/lib/locale/index.d.ts

@@ -1,2 +1,3 @@
 export { default as enUS } from './en-US';
 export { default as zhCN } from './zh-CN';
+export { default as ptBR } from './pt-BR';

package/lib/locale/index.js

@@ -9,15 +9,19 @@ Object.defineProperty(exports, "enUS", {
     return _enUS.default;
   }
 });
+Object.defineProperty(exports, "ptBR", {
+  enumerable: true,
+  get: function get() {
+    return _ptBR.default;
+  }
+});
 Object.defineProperty(exports, "zhCN", {
   enumerable: true,
   get: function get() {
     return _zhCN.default;
   }
 });
-
 var _enUS = _interopRequireDefault(require("./en-US"));
-
 var _zhCN = _interopRequireDefault(require("./zh-CN"));
-
+var _ptBR = _interopRequireDefault(require("./pt-BR"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/locale/pt-BR.d.ts

@@ -0,0 +1,9 @@
+declare const _default: {
+    "The email is incorrect, please re-enter": string;
+    "Please fill in your email address": string;
+    "The password is incorrect, please re-enter": string;
+    "Not a valid cellphone number, please re-enter": string;
+    "The phone number has been registered, please login directly": string;
+    "The phone number is not registered, please register first": string;
+};
+export default _default;

package/lib/locale/pt-BR.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  "The email is incorrect, please re-enter": "O e-mail está incorreto, por favor, digite novamente",
+  "Please fill in your email address": "Por favor, preencha o seu endereço de e-mail",
+  "The password is incorrect, please re-enter": "A senha está incorreta, por favor, digite novamente",
+  "Not a valid cellphone number, please re-enter": "Número de celular inválido, por favor, digite novamente",
+  "The phone number has been registered, please login directly": "O número de celular já está registrado, por favor, faça login diretamente",
+  "The phone number is not registered, please register first": "O número de celular não está registrado, por favor, registre-se primeiro"
+};
+exports.default = _default;

package/lib/middlewares/check.js

@@ -4,28 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.check = check;
-
 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); }); }; }
-
 // TODO(usage): 拦截用户的处理暂时作为一个中间件导出，应用需要的时候可以直接使用这个中间件
 function check(options) {
   return /*#__PURE__*/function () {
     var _check = _asyncToGenerator(function* (ctx, next) {
       const currentUser = ctx.state.currentUser;
-
       if (!currentUser) {
         return ctx.throw(401, 'Unauthorized');
       }
-
       return next();
     });
-
     function check(_x, _x2) {
       return _check.apply(this, arguments);
     }
-
     return check;
   }();
 }

package/lib/middlewares/index.js

@@ -15,7 +15,5 @@ Object.defineProperty(exports, "parseToken", {
     return _parseToken.parseToken;
   }
 });
-
 var _check = require("./check");
-
 var _parseToken = require("./parseToken");

package/lib/middlewares/parseToken.js

@@ -4,72 +4,50 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.parseToken = parseToken;
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-
 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 parseToken(_x, _x2) {
   return _parseToken.apply(this, arguments);
 }
-
 function _parseToken() {
   _parseToken = _asyncToGenerator(function* (ctx, next) {
     const user = yield findUserByToken(ctx);
-
     if (user) {
       ctx.state.currentUser = user;
     }
-
     return next();
   });
   return _parseToken.apply(this, arguments);
 }
-
 function findUserByToken(_x3) {
   return _findUserByToken.apply(this, arguments);
 }
-
 function _findUserByToken() {
   _findUserByToken = _asyncToGenerator(function* (ctx) {
     const token = ctx.getBearerToken();
-
     if (!token) {
       return null;
     }
-
     const _ctx$app$getPlugin = ctx.app.getPlugin('users'),
-          jwtService = _ctx$app$getPlugin.jwtService;
-
+      jwtService = _ctx$app$getPlugin.jwtService;
     try {
       const _yield$jwtService$dec = yield jwtService.decode(token),
-            userId = _yield$jwtService$dec.userId;
-
+        userId = _yield$jwtService$dec.userId;
       const collection = ctx.db.getCollection('users');
       ctx.state.currentUserAppends = ctx.state.currentUserAppends || [];
-
       var _iterator = _createForOfIteratorHelper(collection.fields),
-          _step;
-
+        _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           const _step$value = _slicedToArray(_step.value, 2),
-                field = _step$value[1];
-
+            field = _step$value[1];
           if (field.type === 'belongsTo') {
             ctx.state.currentUserAppends.push(field.name);
           }
@@ -79,7 +57,6 @@ function _findUserByToken() {
       } finally {
         _iterator.f();
       }
-
       const user = yield ctx.db.getRepository('users').findOne({
         appends: ctx.state.currentUserAppends,
         filter: {

package/lib/migrations/20220818072639-add-users-phone.js

@@ -4,41 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _server() {
   const data = require("@nocobase/server");
-
   _server = function _server() {
     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 AddUsersPhoneMigration extends _server().Migration {
   up() {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       const match = yield _this.app.version.satisfies('<=0.7.4-alpha.7');
-
       if (!match) {
         return;
       }
-
       const Field = _this.context.db.getRepository('fields');
-
       const existed = yield Field.count({
         filter: {
           name: 'phone',
           collectionName: 'users'
         }
       });
-
       if (!existed) {
         yield Field.create({
           values: {
@@ -61,11 +50,8 @@ class AddUsersPhoneMigration extends _server().Migration {
       }
     })();
   }
-
   down() {
     return _asyncToGenerator(function* () {})();
   }
-
 }
-
 exports.default = AddUsersPhoneMigration;

package/lib/server.js

@@ -4,91 +4,58 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
-
-  _jsonTemplates = function _jsonTemplates() {
-    return data;
-  };
-
-  return data;
-}
-
-function _path() {
-  const data = require("path");
-
-  _path = function _path() {
-    return data;
-  };
-
-  return data;
-}
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   return data;
 }
-
 function _server() {
   const data = require("@nocobase/server");
-
   _server = function _server() {
     return data;
   };
-
   return data;
 }
-
 function _utils() {
   const data = require("@nocobase/utils");
-
   _utils = function _utils() {
     return data;
   };
-
   return data;
 }
-
+function _jsonTemplates() {
+  const data = _interopRequireDefault(require("json-templates"));
+  _jsonTemplates = function _jsonTemplates() {
+    return data;
+  };
+  return data;
+}
+function _path() {
+  const data = require("path");
+  _path = function _path() {
+    return data;
+  };
+  return data;
+}
 var _2 = require("./");
-
 var actions = _interopRequireWildcard(require("./actions/users"));
-
 var _authenticators = _interopRequireDefault(require("./authenticators"));
-
 var _jwtService = require("./jwt-service");
-
 var _locale = require("./locale");
-
 var _middlewares = require("./middlewares");
-
 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; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 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 UsersPlugin extends _server().Plugin {
   constructor(app, options) {
     super(app, options);
@@ -96,43 +63,32 @@ class UsersPlugin extends _server().Plugin {
     this.authenticators = new (_utils().Registry)();
     this.jwtService = new _jwtService.JwtService((options === null || options === void 0 ? void 0 : options.jwt) || {});
   }
-
   beforeLoad() {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       _this.app.i18n.addResources('zh-CN', _2.namespace, _locale.zhCN);
-
       _this.app.i18n.addResources('en-US', _2.namespace, _locale.enUS);
-
       const cmd = _this.app.findCommand('install');
-
       if (cmd) {
         cmd.requiredOption('-e, --root-email <rootEmail>', '', process.env.INIT_ROOT_EMAIL);
         cmd.requiredOption('-p, --root-password <rootPassword>', '', process.env.INIT_ROOT_PASSWORD);
         cmd.option('-n, --root-nickname <rootNickname>');
       }
-
       _this.db.registerOperators({
         $isCurrentUser(_, ctx) {
           var _ctx$app, _ctx$app$ctx, _ctx$app$ctx$state, _ctx$app$ctx$state$cu;
-
           return {
             [_database().Op.eq]: (ctx === null || ctx === void 0 ? void 0 : (_ctx$app = ctx.app) === null || _ctx$app === void 0 ? void 0 : (_ctx$app$ctx = _ctx$app.ctx) === null || _ctx$app$ctx === void 0 ? void 0 : (_ctx$app$ctx$state = _ctx$app$ctx.state) === null || _ctx$app$ctx$state === void 0 ? void 0 : (_ctx$app$ctx$state$cu = _ctx$app$ctx$state.currentUser) === null || _ctx$app$ctx$state$cu === void 0 ? void 0 : _ctx$app$ctx$state$cu.id) || -1
           };
         },
-
         $isNotCurrentUser(_, ctx) {
           var _ctx$app2, _ctx$app2$ctx, _ctx$app2$ctx$state, _ctx$app2$ctx$state$c;
-
           return {
             [_database().Op.ne]: (ctx === null || ctx === void 0 ? void 0 : (_ctx$app2 = ctx.app) === null || _ctx$app2 === void 0 ? void 0 : (_ctx$app2$ctx = _ctx$app2.ctx) === null || _ctx$app2$ctx === void 0 ? void 0 : (_ctx$app2$ctx$state = _ctx$app2$ctx.state) === null || _ctx$app2$ctx$state === void 0 ? void 0 : (_ctx$app2$ctx$state$c = _ctx$app2$ctx$state.currentUser) === null || _ctx$app2$ctx$state$c === void 0 ? void 0 : _ctx$app2$ctx$state$c.id) || -1
           };
         },
-
         $isVar(val, ctx) {
           var _ctx$app3, _ctx$app3$ctx;
-
           const obj = (0, _jsonTemplates().default)({
             val: `{{${val}}}`
           })(JSON.parse(JSON.stringify(ctx === null || ctx === void 0 ? void 0 : (_ctx$app3 = ctx.app) === null || _ctx$app3 === void 0 ? void 0 : (_ctx$app3$ctx = _ctx$app3.ctx) === null || _ctx$app3$ctx === void 0 ? void 0 : _ctx$app3$ctx.state)));
@@ -140,14 +96,11 @@ class UsersPlugin extends _server().Plugin {
             [_database().Op.eq]: obj.val
           };
         }
-
       });
-
       _this.db.on('afterDefineCollection', collection => {
         let _collection$options = collection.options,
-            createdBy = _collection$options.createdBy,
-            updatedBy = _collection$options.updatedBy;
-
+          createdBy = _collection$options.createdBy,
+          updatedBy = _collection$options.updatedBy;
         if (createdBy === true) {
           collection.setField('createdById', {
             type: 'context',
@@ -164,7 +117,6 @@ class UsersPlugin extends _server().Plugin {
             targetKey: 'id'
           });
         }
-
         if (updatedBy === true) {
           collection.setField('updatedById', {
             type: 'context',
@@ -181,19 +133,15 @@ class UsersPlugin extends _server().Plugin {
           });
         }
       });
-
       for (var _i = 0, _Object$entries = Object.entries(actions); _i < _Object$entries.length; _i++) {
         const _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-              key = _Object$entries$_i[0],
-              action = _Object$entries$_i[1];
-
+          key = _Object$entries$_i[0],
+          action = _Object$entries$_i[1];
         _this.app.resourcer.registerActionHandler(`users:${key}`, action);
       }
-
       _this.app.resourcer.use(_middlewares.parseToken, {
         tag: 'parseToken'
       });
-
       _this.app.acl.addFixedParams('users', 'destroy', () => {
         return {
           filter: {
@@ -201,7 +149,6 @@ class UsersPlugin extends _server().Plugin {
           }
         };
       });
-
       _this.app.acl.addFixedParams('collections', 'destroy', () => {
         return {
           filter: {
@@ -209,24 +156,19 @@ class UsersPlugin extends _server().Plugin {
           }
         };
       });
-
       const publicActions = ['check', 'signin', 'signup', 'lostpassword', 'resetpassword', 'getUserByResetToken'];
       const loggedInActions = ['signout', 'updateProfile', 'changePassword'];
       publicActions.forEach(action => _this.app.acl.allow('users', action));
       loggedInActions.forEach(action => _this.app.acl.allow('users', action, 'loggedIn'));
-
       _this.app.on('beforeStart', () => _this.initVerification());
     })();
   }
-
   load() {
     var _this2 = this;
-
     return _asyncToGenerator(function* () {
       yield _this2.db.import({
         directory: (0, _path().resolve)(__dirname, 'collections')
       });
-
       _this2.db.addMigrations({
         namespace: 'users',
         directory: (0, _path().resolve)(__dirname, 'migrations'),
@@ -234,45 +176,36 @@ class UsersPlugin extends _server().Plugin {
           plugin: _this2
         }
       });
-
       (0, _authenticators.default)(_this2);
     })();
   }
-
   getInstallingData(options = {}) {
     var _options$cliArgs;
-
     const _process$env = process.env,
-          INIT_ROOT_NICKNAME = _process$env.INIT_ROOT_NICKNAME,
-          INIT_ROOT_PASSWORD = _process$env.INIT_ROOT_PASSWORD,
-          INIT_ROOT_EMAIL = _process$env.INIT_ROOT_EMAIL;
-
+      INIT_ROOT_NICKNAME = _process$env.INIT_ROOT_NICKNAME,
+      INIT_ROOT_PASSWORD = _process$env.INIT_ROOT_PASSWORD,
+      INIT_ROOT_EMAIL = _process$env.INIT_ROOT_EMAIL;
     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;
-
+      _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,
       rootPassword,
       rootNickname
     };
   }
-
   install(options) {
     var _this3 = this;
-
     return _asyncToGenerator(function* () {
       const _this3$getInstallingD = _this3.getInstallingData(options),
-            rootNickname = _this3$getInstallingD.rootNickname,
-            rootPassword = _this3$getInstallingD.rootPassword,
-            rootEmail = _this3$getInstallingD.rootEmail;
-
+        rootNickname = _this3$getInstallingD.rootNickname,
+        rootPassword = _this3$getInstallingD.rootPassword,
+        rootEmail = _this3$getInstallingD.rootEmail;
       const User = _this3.db.getCollection('users');
-
       if (yield User.repository.findOne({
         filter: {
           email: rootEmail
@@ -280,7 +213,6 @@ class UsersPlugin extends _server().Plugin {
       })) {
         return;
       }
-
       const user = yield User.repository.create({
         values: {
           email: rootEmail,
@@ -288,69 +220,52 @@ class UsersPlugin extends _server().Plugin {
           nickname: rootNickname
         }
       });
-
       const repo = _this3.db.getRepository('collections');
-
       if (repo) {
         yield repo.db2cm('users');
       }
     })();
-  } // TODO(module): should move to preset or dynamic configuration panel
-
-
+  }
+  // TODO(module): should move to preset or dynamic configuration panel
   initVerification() {
     var _this4 = this;
-
     return _asyncToGenerator(function* () {
       const verificationPlugin = _this4.app.getPlugin('verification');
-
       if (!verificationPlugin) {
         return;
       }
-
       const systemSettingsRepo = _this4.db.getRepository('systemSettings');
-
       const settings = yield systemSettingsRepo.findOne();
-
       if (!settings.smsAuthEnabled) {
         return;
       }
-
       verificationPlugin.interceptors.register('users:signin', {
         manual: true,
-
         getReceiver(ctx) {
           return ctx.action.params.values.phone;
         },
-
         expiresIn: 120,
         validate: function () {
           var _validate = _asyncToGenerator(function* (ctx, phone) {
             if (!phone) {
               throw new Error(ctx.t('Not a valid cellphone number, please re-enter'));
             }
-
             const User = _this4.db.getCollection('users');
-
             const exists = yield User.model.count({
               where: {
                 phone
               }
             });
-
             if (!exists) {
               throw new Error(ctx.t('The phone number is not registered, please register first', {
                 ns: _2.namespace
               }));
             }
-
             return true;
           });
-
-          function validate(_x, _x2) {
+          function validate(_x2, _x3) {
             return _validate.apply(this, arguments);
           }
-
           return validate;
         }()
       });
@@ -358,7 +273,6 @@ class UsersPlugin extends _server().Plugin {
         getReceiver(ctx) {
           return ctx.action.params.values.phone;
         },
-
         expiresIn: 120,
         validate: function () {
           var _validate2 = _asyncToGenerator(function* (ctx, phone) {
@@ -367,32 +281,25 @@ class UsersPlugin extends _server().Plugin {
                 ns: _2.namespace
               }));
             }
-
             const User = _this4.db.getCollection('users');
-
             const exists = yield User.model.count({
               where: {
                 phone
               }
             });
-
             if (exists) {
               throw new Error(ctx.t('The phone number has been registered, please login directly', {
                 ns: _2.namespace
               }));
             }
-
             return true;
           });
-
-          function validate(_x3, _x4) {
+          function validate(_x4, _x5) {
             return _validate2.apply(this, arguments);
           }
-
           return validate;
         }()
       });
-
       _this4.authenticators.register('sms', (ctx, next) => verificationPlugin.intercept(ctx, /*#__PURE__*/_asyncToGenerator(function* () {
         const values = ctx.action.params.values;
         const User = ctx.db.getCollection('users');
@@ -401,19 +308,15 @@ class UsersPlugin extends _server().Plugin {
             phone: values.phone
           }
         });
-
         if (!user) {
           return ctx.throw(404, ctx.t('The phone number is incorrect, please re-enter', {
             ns: _2.namespace
           }));
         }
-
         ctx.state.currentUser = user;
         return next();
       })));
     })();
   }
-
 }
-
 exports.default = UsersPlugin;

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@nocobase/plugin-users",
-  "version": "0.9.1-alpha.1",
+  "version": "0.9.2-alpha.1",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.9.1-alpha.1",
-    "@nocobase/database": "0.9.1-alpha.1",
-    "@nocobase/resourcer": "0.9.1-alpha.1",
-    "@nocobase/server": "0.9.1-alpha.1",
-    "@nocobase/utils": "0.9.1-alpha.1",
+    "@nocobase/actions": "0.9.2-alpha.1",
+    "@nocobase/database": "0.9.2-alpha.1",
+    "@nocobase/resourcer": "0.9.2-alpha.1",
+    "@nocobase/server": "0.9.2-alpha.1",
+    "@nocobase/utils": "0.9.2-alpha.1",
     "json-templates": "^4.2.0",
     "jsonwebtoken": "^8.5.1"
   },
   "devDependencies": {
-    "@nocobase/test": "0.9.1-alpha.1",
+    "@nocobase/test": "0.9.2-alpha.1",
     "@types/jsonwebtoken": "^8.5.8"
   },
-  "gitHead": "56cb184b00dc383b853015d525bf6e79dea92169"
+  "gitHead": "a4f103eb0144f07205aff7b2a6be8ea6aa1330df"
 }