@nocobase/plugin-users 0.7.4-alpha.5 → 0.7.5-alpha.1

package/lib/actions/users.d.ts

@@ -1,6 +1,6 @@
 import { Context, Next } from '@nocobase/actions';
 export declare function check(ctx: Context, next: Next): Promise<void>;
-export declare function signin(ctx: Context, next: Next): Promise<void>;
+export declare function signin(ctx: Context, next: Next): Promise<any>;
 export declare function signout(ctx: Context, next: Next): Promise<void>;
 export declare function signup(ctx: Context, next: Next): Promise<void>;
 export declare function lostpassword(ctx: Context, next: Next): Promise<void>;

package/lib/actions/users.js

@@ -13,6 +13,16 @@ 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"));
 
@@ -27,11 +37,19 @@ var _ = require("../");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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 _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 _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 _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 _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 _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 _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); } }
 
@@ -61,46 +79,44 @@ function signin(_x3, _x4) {
 
 function _signin() {
   _signin = _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;
+    const _ctx$app$getPlugin = ctx.app.getPlugin('@nocobase/plugin-users'),
+          authenticators = _ctx$app$getPlugin.authenticators,
+          jwtService = _ctx$app$getPlugin.jwtService;
 
-    if (!values[uniqueField]) {
-      ctx.throw(401, ctx.t('Please fill in your email address', {
-        ns: _.namespace
-      }));
-    }
+    const branches = {};
 
-    const User = ctx.db.getCollection('users');
-    const user = yield User.model.findOne({
-      where: {
-        [uniqueField]: values[uniqueField]
-      }
-    });
+    var _iterator = _createForOfIteratorHelper(authenticators.getEntities()),
+        _step;
 
-    if (!user) {
-      ctx.throw(401, ctx.t('The email is incorrect, please re-enter', {
-        ns: _.namespace
-      }));
-    }
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        const _step$value = _slicedToArray(_step.value, 2),
+              name = _step$value[0],
+              authenticator = _step$value[1];
 
-    const pwd = User.getField('password');
-    const isValid = yield pwd.verify(values.password, user.password);
-
-    if (!isValid) {
-      ctx.throw(401, ctx.t('The password is incorrect, please re-enter', {
-        ns: _.namespace
-      }));
+        branches[name] = authenticator;
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
     }
 
-    const pluginUser = ctx.app.getPlugin('@nocobase/plugin-users');
-    ctx.body = _objectSpread(_objectSpread({}, user.toJSON()), {}, {
-      token: pluginUser.jwtService.sign({
-        userId: user.get('id')
-      })
+    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();
+      const token = jwtService.sign({
+        userId: user.id
+      });
+      ctx.body = {
+        user,
+        token
+      };
+      return next();
     });
-    yield next();
   });
   return _signin.apply(this, arguments);
 }
@@ -143,9 +159,12 @@ function _lostpassword() {
     const email = ctx.action.params.values.email;
 
     if (!email) {
-      ctx.throw(401, ctx.t('Please fill in your email address', {
-        ns: _.namespace
-      }));
+      ctx.throw(400, {
+        code: 'InvalidUserData',
+        message: ctx.t('Please fill in your email address', {
+          ns: _.namespace
+        })
+      });
     }
 
     const User = ctx.db.getCollection('users');
@@ -156,9 +175,12 @@ function _lostpassword() {
     });
 
     if (!user) {
-      ctx.throw(401, ctx.t('The email is incorrect, please re-enter', {
-        ns: _.namespace
-      }));
+      ctx.throw(404, {
+        code: 'InvalidUserData',
+        message: ctx.t('The email is incorrect, please re-enter', {
+          ns: _.namespace
+        })
+      });
     }
 
     user.resetToken = _crypto().default.randomBytes(20).toString('hex');
@@ -188,7 +210,7 @@ function _resetpassword() {
     });
 
     if (!user) {
-      ctx.throw(401, 'Unauthorized');
+      ctx.throw(404);
     }
 
     user.token = null;
@@ -216,7 +238,7 @@ function _getUserByResetToken() {
     });
 
     if (!user) {
-      ctx.throw(401, 'Unauthorized');
+      ctx.throw(401);
     }
 
     ctx.body = user;
@@ -232,13 +254,18 @@ function updateProfile(_x15, _x16) {
 function _updateProfile() {
   _updateProfile = _asyncToGenerator(function* (ctx, next) {
     const values = ctx.action.params.values;
+    const currentUser = ctx.state.currentUser;
 
-    if (!ctx.state.currentUser) {
-      ctx.throw(401, 'Unauthorized');
+    if (!currentUser) {
+      ctx.throw(401);
     }
 
-    yield ctx.state.currentUser.update(values);
-    ctx.body = ctx.state.currentUser;
+    const UserRepo = ctx.db.getRepository('users');
+    const result = yield UserRepo.update({
+      filterByTk: currentUser.id,
+      values
+    });
+    ctx.body = result;
     yield next();
   });
   return _updateProfile.apply(this, arguments);
@@ -255,7 +282,7 @@ function _changePassword() {
           newPassword = _ctx$action$params$va2.newPassword;
 
     if (!ctx.state.currentUser) {
-      ctx.throw(401, 'Unauthorized');
+      ctx.throw(401);
     }
 
     const User = ctx.db.getCollection('users');

package/lib/authenticators/index.d.ts

@@ -0,0 +1,7 @@
+import { HandlerType } from '@nocobase/resourcer';
+import Plugin from '..';
+interface Authenticators {
+    [key: string]: HandlerType;
+}
+export default function (plugin: Plugin, more?: Authenticators): void;
+export {};

package/lib/authenticators/index.js

@@ -0,0 +1,63 @@
+"use strict";
+
+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 _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 _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];
+
+    authenticators.register(name, authenticator);
+  }
+}

package/lib/authenticators/password.d.ts

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

package/lib/authenticators/password.js

@@ -0,0 +1,60 @@
+"use strict";
+
+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;
+
+    if (!values[uniqueField]) {
+      return ctx.throw(400, {
+        code: 'InvalidUserData',
+        message: ctx.t('Please fill in your email address', {
+          ns: _.namespace
+        })
+      });
+    }
+
+    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();
+  });
+  return _ref.apply(this, arguments);
+}

package/lib/collections/users.js

@@ -46,6 +46,18 @@ var _default = {
       'x-validator': 'email',
       require: true
     }
+  }, {
+    interface: 'phone',
+    type: 'string',
+    name: 'phone',
+    unique: true,
+    uiSchema: {
+      type: 'string',
+      title: '{{t("Phone")}}',
+      'x-component': 'Input',
+      'x-validator': 'phone',
+      require: true
+    }
   }, {
     interface: 'password',
     type: 'password',

package/lib/locale/ja-JP.d.ts

@@ -0,0 +1,5 @@
+declare const _default: {
+    'Please fill in your email address': string;
+    'The password is incorrect, please re-enter': string;
+};
+export default _default;

package/lib/locale/ja-JP.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  'Please fill in your email address': 'メールアドレスを入力してください',
+  'The password is incorrect, please re-enter': 'パスワードが正しくありません。再度入力してください。'
+};
+exports.default = _default;

package/lib/locale/zh-CN.d.ts

@@ -2,5 +2,8 @@ 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/zh-CN.js

@@ -5,8 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
-  'The email is incorrect, please re-enter': '邮箱错误，请重新输入',
-  'Please fill in your email address': '请填写密码',
-  'The password is incorrect, please re-enter': '密码错误，请重新输入'
+  'The email is incorrect, please re-enter': '邮箱有误，请重新输入',
+  'Please fill in your email address': '请填写邮箱',
+  'The password is incorrect, please re-enter': '密码有误，请重新输入',
+  'Not a valid cellphone number, please re-enter': '不是有效的手机号，请重新输入',
+  'The phone number has been registered, please login directly': '手机号已注册，请直接登录',
+  'The phone number is not registered, please register first': '手机号未注册，请先注册'
 };
 exports.default = _default;

package/lib/middlewares/parseToken.d.ts

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

package/lib/middlewares/parseToken.js

@@ -5,16 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.parseToken = parseToken;
 
-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(); }
 
 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."); }
@@ -33,41 +23,41 @@ 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) {
-  const middleware = new (_resourcer().MiddlewareManager)();
-  middleware.use( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(function* (ctx, next) {
-      const user = yield findUserByToken(ctx, options.plugin);
+function parseToken(_x, _x2) {
+  return _parseToken.apply(this, arguments);
+}
 
-      if (user) {
-        ctx.state.currentUser = user;
-      }
+function _parseToken() {
+  _parseToken = _asyncToGenerator(function* (ctx, next) {
+    const user = yield findUserByToken(ctx);
 
-      return next();
-    });
+    if (user) {
+      ctx.state.currentUser = user;
+    }
 
-    return function (_x, _x2) {
-      return _ref.apply(this, arguments);
-    };
-  }());
-  return middleware;
+    return next();
+  });
+  return _parseToken.apply(this, arguments);
 }
 
-function findUserByToken(_x3, _x4) {
+function findUserByToken(_x3) {
   return _findUserByToken.apply(this, arguments);
 }
 
 function _findUserByToken() {
-  _findUserByToken = _asyncToGenerator(function* (ctx, plugin) {
+  _findUserByToken = _asyncToGenerator(function* (ctx) {
     const token = ctx.getBearerToken();
 
     if (!token) {
       return null;
     }
 
+    const _ctx$app$getPlugin = ctx.app.getPlugin('@nocobase/plugin-users'),
+          jwtService = _ctx$app$getPlugin.jwtService;
+
     try {
-      const _yield$plugin$jwtServ = yield plugin.jwtService.decode(token),
-            userId = _yield$plugin$jwtServ.userId;
+      const _yield$jwtService$dec = yield jwtService.decode(token),
+            userId = _yield$jwtService$dec.userId;
 
       const collection = ctx.db.getCollection('users');
       ctx.state.currentUserAppends = ctx.state.currentUserAppends || [];
@@ -90,13 +80,15 @@ function _findUserByToken() {
         _iterator.f();
       }
 
-      return yield ctx.db.getRepository('users').findOne({
+      const user = yield ctx.db.getRepository('users').findOne({
         appends: ctx.state.currentUserAppends,
         filter: {
           id: userId
         }
       });
+      return user;
     } catch (error) {
+      console.log(error);
       return null;
     }
   });

package/lib/migrations/20220818072639-add-users-phone.d.ts

@@ -0,0 +1,5 @@
+import { Migration } from '@nocobase/server';
+export default class AddUsersPhoneMigration extends Migration {
+    up(): Promise<void>;
+    down(): Promise<void>;
+}

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

@@ -0,0 +1,71 @@
+"use strict";
+
+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: {
+            name: 'phone',
+            collectionName: 'users',
+            type: 'string',
+            unique: true,
+            interface: 'phone',
+            uiSchema: {
+              type: 'string',
+              title: '{{t("Phone")}}',
+              'x-component': 'Input',
+              'x-validator': 'phone',
+              require: true
+            }
+          },
+          // NOTE: to trigger hook
+          context: {}
+        });
+      }
+    })();
+  }
+
+  down() {
+    return _asyncToGenerator(function* () {})();
+  }
+
+}
+
+exports.default = AddUsersPhoneMigration;

package/lib/server.d.ts

@@ -1,11 +1,14 @@
 import { Plugin } from '@nocobase/server';
+import { Registry } from '@nocobase/utils';
+import { HandlerType, Middleware } from '@nocobase/resourcer';
 import { JwtOptions, JwtService } from './jwt-service';
 export interface UserPluginConfig {
     jwt: JwtOptions;
 }
 export default class UsersPlugin extends Plugin<UserPluginConfig> {
     jwtService: JwtService;
-    tokenMiddleware: any;
+    tokenMiddleware: Middleware;
+    authenticators: Registry<HandlerType>;
     constructor(app: any, options: any);
     beforeLoad(): Promise<void>;
     load(): Promise<void>;

package/lib/server.js

@@ -5,6 +5,26 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+function _path() {
+  const data = require("path");
+
+  _path = function _path() {
+    return data;
+  };
+
+  return data;
+}
+
+function _jsonTemplates() {
+  const data = _interopRequireDefault(require("json-templates"));
+
+  _jsonTemplates = function _jsonTemplates() {
+    return data;
+  };
+
+  return data;
+}
+
 function _database() {
   const data = require("@nocobase/database");
 
@@ -25,20 +45,20 @@ function _server() {
   return data;
 }
 
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
+function _utils() {
+  const data = require("@nocobase/utils");
 
-  _jsonTemplates = function _jsonTemplates() {
+  _utils = function _utils() {
     return data;
   };
 
   return data;
 }
 
-function _path() {
-  const data = require("path");
+function _resourcer() {
+  const data = require("@nocobase/resourcer");
 
-  _path = function _path() {
+  _resourcer = function _resourcer() {
     return data;
   };
 
@@ -53,7 +73,9 @@ var _jwtService = require("./jwt-service");
 
 var _locale = require("./locale");
 
-var middlewares = _interopRequireWildcard(require("./middlewares"));
+var _middlewares = require("./middlewares");
+
+var _authenticators = _interopRequireDefault(require("./authenticators"));
 
 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); }
 
@@ -82,10 +104,9 @@ class UsersPlugin extends _server().Plugin {
     super(app, options);
     this.jwtService = void 0;
     this.tokenMiddleware = void 0;
+    this.authenticators = new (_utils().Registry)();
     this.jwtService = new _jwtService.JwtService((options === null || options === void 0 ? void 0 : options.jwt) || {});
-    this.tokenMiddleware = middlewares.parseToken({
-      plugin: this
-    });
+    this.tokenMiddleware = new (_resourcer().Middleware)(_middlewares.parseToken);
   }
 
   beforeLoad() {
@@ -101,7 +122,7 @@ class UsersPlugin extends _server().Plugin {
       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]');
+        cmd.option('-n, --root-nickname <rootNickname>');
       }
 
       _this.db.registerOperators({
@@ -173,7 +194,7 @@ class UsersPlugin extends _server().Plugin {
         _this.app.resourcer.registerActionHandler(`users:${key}`, action);
       }
 
-      _this.app.resourcer.use(_this.tokenMiddleware.compose());
+      _this.app.resourcer.use(_this.tokenMiddleware.getHandler());
 
       const publicActions = ['check', 'signin', 'signup', 'lostpassword', 'resetpassword', 'getUserByResetToken'];
       const loggedInActions = ['signout', 'updateProfile', 'changePassword'];
@@ -189,6 +210,119 @@ class UsersPlugin extends _server().Plugin {
       yield _this2.db.import({
         directory: (0, _path().resolve)(__dirname, 'collections')
       });
+
+      _this2.db.addMigrations({
+        namespace: 'users',
+        directory: (0, _path().resolve)(__dirname, 'migrations'),
+        context: {
+          plugin: _this2
+        }
+      });
+
+      (0, _authenticators.default)(_this2); // TODO(module): should move to preset
+
+      const verificationPlugin = _this2.app.getPlugin('@nocobase/plugin-verification');
+
+      if (verificationPlugin && process.env.DEFAULT_SMS_VERIFY_CODE_PROVIDER) {
+        verificationPlugin.interceptors.register('users:signin', {
+          manual: true,
+          provider: process.env.DEFAULT_SMS_VERIFY_CODE_PROVIDER,
+
+          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 = _this2.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) {
+              return _validate.apply(this, arguments);
+            }
+
+            return validate;
+          }()
+        });
+        verificationPlugin.interceptors.register('users:signup', {
+          provider: process.env.DEFAULT_SMS_VERIFY_CODE_PROVIDER,
+
+          getReceiver(ctx) {
+            return ctx.action.params.values.phone;
+          },
+
+          expiresIn: 120,
+          validate: function () {
+            var _validate2 = _asyncToGenerator(function* (ctx, phone) {
+              if (!phone) {
+                throw new Error(ctx.t('Not a valid cellphone number, please re-enter', {
+                  ns: _2.namespace
+                }));
+              }
+
+              const User = _this2.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) {
+              return _validate2.apply(this, arguments);
+            }
+
+            return validate;
+          }()
+        });
+
+        _this2.authenticators.register('sms', (ctx, next) => verificationPlugin.intercept(ctx, /*#__PURE__*/_asyncToGenerator(function* () {
+          const values = ctx.action.params.values;
+          const User = ctx.db.getCollection('users');
+          const user = yield User.model.findOne({
+            where: {
+              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();
+        })));
+      }
     })();
   }
 
@@ -200,13 +334,13 @@ class UsersPlugin extends _server().Plugin {
           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;
+    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;
 
     return {
       rootEmail,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-users",
-  "version": "0.7.4-alpha.5",
+  "version": "0.7.5-alpha.1",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -10,12 +10,17 @@
     }
   ],
   "dependencies": {
+    "@nocobase/actions": "0.7.5-alpha.1",
+    "@nocobase/database": "0.7.5-alpha.1",
+    "@nocobase/resourcer": "0.7.5-alpha.1",
+    "@nocobase/server": "0.7.5-alpha.1",
+    "@nocobase/utils": "0.7.5-alpha.1",
+    "json-templates": "^4.2.0",
     "jsonwebtoken": "^8.5.1"
   },
   "devDependencies": {
-    "@nocobase/test": "0.7.4-alpha.5",
-    "@types/jsonwebtoken": "^8.5.8",
-    "json-templates": "^4.2.0"
+    "@nocobase/test": "0.7.5-alpha.1",
+    "@types/jsonwebtoken": "^8.5.8"
   },
-  "gitHead": "0fbd32afad99b610509cf7093ed027aa727880c1"
+  "gitHead": "f6eb27b68185bb0c0b4c2cfca1df84205a9b9173"
 }