@nocobase/plugin-users 0.8.0-alpha.9 → 0.8.1-alpha.4

package/lib/collections/users.js

@@ -14,7 +14,7 @@ var _default = {
   logging: true,
   fields: [{
     name: 'id',
-    type: 'integer',
+    type: 'bigInt',
     autoIncrement: true,
     primaryKey: true,
     allowNull: false,
@@ -44,7 +44,7 @@ var _default = {
       title: '{{t("Email")}}',
       'x-component': 'Input',
       'x-validator': 'email',
-      require: true
+      required: true
     }
   }, {
     interface: 'phone',
@@ -56,7 +56,7 @@ var _default = {
       title: '{{t("Phone")}}',
       'x-component': 'Input',
       'x-validator': 'phone',
-      require: true
+      required: true
     }
   }, {
     interface: 'password',

package/lib/middlewares/parseToken.js

@@ -86,9 +86,11 @@ function _findUserByToken() {
           id: userId
         }
       });
+      ctx.logger.info(`Current user id: ${userId}`);
       return user;
     } catch (error) {
       console.log(error);
+      ctx.logger.error(error);
       return null;
     }
   });

package/lib/server.d.ts

@@ -1,4 +1,4 @@
-import { HandlerType, Middleware } from '@nocobase/resourcer';
+import { HandlerType } from '@nocobase/resourcer';
 import { Plugin } from '@nocobase/server';
 import { Registry } from '@nocobase/utils';
 import { JwtOptions, JwtService } from './jwt-service';
@@ -8,7 +8,6 @@ export interface UserPluginConfig {
 }
 export default class UsersPlugin extends Plugin<UserPluginConfig> {
     jwtService: JwtService;
-    tokenMiddleware: Middleware;
     authenticators: Registry<HandlerType>;
     constructor(app: any, options: any);
     beforeLoad(): Promise<void>;
@@ -19,4 +18,5 @@ export default class UsersPlugin extends Plugin<UserPluginConfig> {
         rootNickname: any;
     };
     install(options: any): Promise<void>;
+    initVerification(): Promise<void>;
 }

package/lib/server.js

@@ -35,16 +35,6 @@ function _database() {
   return data;
 }
 
-function _resourcer() {
-  const data = require("@nocobase/resourcer");
-
-  _resourcer = function _resourcer() {
-    return data;
-  };
-
-  return data;
-}
-
 function _server() {
   const data = require("@nocobase/server");
 
@@ -103,10 +93,8 @@ class UsersPlugin extends _server().Plugin {
   constructor(app, options) {
     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 = new (_resourcer().Middleware)(_middlewares.parseToken);
   }
 
   beforeLoad() {
@@ -155,7 +143,7 @@ class UsersPlugin extends _server().Plugin {
         if (createdBy === true) {
           collection.setField('createdById', {
             type: 'context',
-            dataType: 'integer',
+            dataType: 'bigInt',
             dataIndex: 'state.currentUser.id',
             createOnly: true,
             visible: true,
@@ -172,7 +160,7 @@ class UsersPlugin extends _server().Plugin {
         if (updatedBy === true) {
           collection.setField('updatedById', {
             type: 'context',
-            dataType: 'integer',
+            dataType: 'bigInt',
             dataIndex: 'state.currentUser.id',
             visible: true,
             index: true
@@ -202,6 +190,8 @@ class UsersPlugin extends _server().Plugin {
       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());
     })();
   }
 
@@ -221,110 +211,7 @@ class UsersPlugin extends _server().Plugin {
         }
       });
 
-      (0, _authenticators.default)(_this2); // TODO(module): should move to preset
-
-      const verificationPlugin = _this2.app.getPlugin('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();
-        })));
-      }
+      (0, _authenticators.default)(_this2);
     })();
   }
 
@@ -336,13 +223,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,
@@ -376,6 +263,123 @@ class UsersPlugin extends _server().Plugin {
         yield repo.db2cm('users');
       }
     })();
+  } // 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) {
+            return _validate.apply(this, arguments);
+          }
+
+          return validate;
+        }()
+      });
+      verificationPlugin.interceptors.register('users:signup', {
+        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 = _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) {
+            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');
+        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();
+      })));
+    })();
   }
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-users",
-  "version": "0.8.0-alpha.9",
+  "version": "0.8.1-alpha.4",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -10,17 +10,17 @@
     }
   ],
   "dependencies": {
-    "@nocobase/actions": "0.8.0-alpha.9",
-    "@nocobase/database": "0.8.0-alpha.9",
-    "@nocobase/resourcer": "0.8.0-alpha.9",
-    "@nocobase/server": "0.8.0-alpha.9",
-    "@nocobase/utils": "0.8.0-alpha.9",
+    "@nocobase/actions": "0.8.1-alpha.4",
+    "@nocobase/database": "0.8.1-alpha.4",
+    "@nocobase/resourcer": "0.8.1-alpha.4",
+    "@nocobase/server": "0.8.1-alpha.4",
+    "@nocobase/utils": "0.8.1-alpha.4",
     "json-templates": "^4.2.0",
     "jsonwebtoken": "^8.5.1"
   },
   "devDependencies": {
-    "@nocobase/test": "0.8.0-alpha.9",
+    "@nocobase/test": "0.8.1-alpha.4",
     "@types/jsonwebtoken": "^8.5.8"
   },
-  "gitHead": "6afe02d59bb22df0f96a7605c9001dcc17a30d6a"
+  "gitHead": "22ccdf7bd7fcbd16aeefd5250db237a4bd1ccff1"
 }