free-be-account 0.0.15 → 0.0.16

package/index.js

@@ -205,6 +205,10 @@ module.exports = (app) => ({
         accountDefaultPassword: '12345678',
         accountDefaultPasswordRandom: false,
         accountDefaultPasswordRandomLength: 6,
+
+        autoCreateNewUser: false,
+        recoverNoSamePwd: false,
+
         // accountDefaultPermissions: [
         //     // could from system config
         //     // {
@@ -227,6 +231,7 @@ module.exports = (app) => ({
 
         dataScopes: [],
         permissionControls: [],
+        smsFormat: '6n',
         captcha: {
             cache: 5 * 60 * 1000,
             login: false,
@@ -1007,16 +1012,28 @@ module.exports = (app) => ({
             // permission control
             app.use(async (req, res, next) => {
                 // permission control
-                if (!await m.hasPermission(req, m)) {
-                    const whiteList = ((m.config && m.config['whiteList']) || []).concat([`${app.config['baseUrl'] || ''}/login`]);
-                    for (let i = 0; i < whiteList.length; i += 1) {
-                        const wl = whiteList[i];
-
-                        if (typeof wl === 'string' && wl.toLowerCase() === req.originalUrl.toLowerCase()) return next();
+                let inWhiteList = false;
+                const whiteList = ((m.config && m.config['whiteList']) || []).concat([`${app.config['baseUrl'] || ''}/login`]);
+                for (let i = 0; i < whiteList.length; i += 1) {
+                    const wl = whiteList[i];
+
+                    if (typeof wl === 'string' && wl.toLowerCase() === req.originalUrl.toLowerCase()) {
+                        inWhiteList = true;
+                        break;
+                    }
 
-                        if (typeof wl === 'object' && new RegExp(wl).test(req.originalUrl)) return next();
+                    if (typeof wl === 'object' && new RegExp(wl).test(req.originalUrl)) {
+                        inWhiteList = true;
+                        break;
                     }
+                }
 
+                if (inWhiteList) {
+                    await m.hasPermission(req, m)
+                    return next();
+                }
+                
+                if (!await m.hasPermission(req, m)) {
                     if (req.user && req.user.id) {
                         await res.endWithErr(400, 401);
                     }
@@ -1033,30 +1050,18 @@ module.exports = (app) => ({
                 if (token) {
                     res.cookie('token', token, { maxAge: app.config['cookieTimeout'] });
                 }
-                
-                return next();
-            });
 
-            // check for force reset pwd
-            app.use(async (req, res, next) => {
+                // check for force reset pwd
                 const resetP = m.config && m.config['forceResetPwd'];
 
-                if(resetP) {
-                    if (req.user && req.user.id) {
-                        const updateAt = req.user.PwdUpdatedAt || req.user.CreatedDate || req.user.LastUpdateDate;
-                        const pastP = new Date() - updateAt;
+                if(resetP && req.user && req.user.id) {
+                    const updateAt = req.user.PwdUpdatedAt || req.user.CreatedDate || req.user.LastUpdateDate;
+                    const pastP = new Date() - updateAt;
 
-                        if(pastP > (resetP * 24 * 3600 * 1000)) {
-                            await res.endWithErr(403, 'RSTPWD');
-                        } else {
-                            return next();
-                        }
-                    }
-                    else {
-                        await res.endWithErr(401);
+                    if(pastP > (resetP * 24 * 3600 * 1000)) {
+                        await res.makeError(403, 'RSTPWD');
+                        return next('route');
                     }
-
-                    return;
                 }
 
                 return next();
@@ -1263,16 +1268,52 @@ module.exports = (app) => ({
                         }
                     }
 
-                    const existPhone = await res.app.models.account.countDocuments({ PhoneNumber: phone });
-                    if (existPhone) {
-                        res.makeError(404, 'The phone number was used already!', m);
-                        return next('route');
+                    const valid_phone = (d) => {
+                        return /^(0|86|17951)?(13[0-9]|14[0-9]|15[0-9]|16[0-9]|17[0-9]|18[0-9]|19[0-9])[0-9]{8}$/.test(d);
+                    };
+                    const valid_email = (d) => {
+                        // eslint-disable-next-line no-useless-escape
+                        return /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(d);
+                    }
+
+                    const userPhoneEmail = {};
+                    let isPhone = false;
+                    let isEmail = false;
+
+                    if (valid_phone(phone)) {
+                        userPhoneEmail.PhoneNumber = phone;
+                        isPhone = true;
+                    } else if (valid_email(phone)) {
+                        isEmail = true;
+                        userPhoneEmail.UserName = phone;
+                        userPhoneEmail['Profile'] = {
+                            Email: phone
+                        };
+                    } else {
+                        userPhoneEmail.UserName = phone;
+                    }
+
+                    if (isPhone) {
+                        const existPhone = await res.app.models.account.countDocuments({ PhoneNumber: phone });
+                        if (existPhone) {
+                            res.makeError(404, 'The phone number was used already!', m);
+                            return next('route');
+                        }
+                    }
+
+                    if (isEmail) {
+                        const existPhone = await res.app.models.account.countDocuments({ 'Profile.Email': phone });
+                        if (existPhone) {
+                            res.makeError(405, 'The email address was used already!', m);
+                            return next('route');
+                        }
                     }
 
                     // only create with specified fields
                     res.locals.body = {
                         Saved: true,
-                        PhoneNumber: phone,
+                        // PhoneNumber: phone,
+                        ...userPhoneEmail,
                         Password: encryptPwd(password, m.config.pwdEncryptMethod || 'md5')
                     }
 
@@ -1323,18 +1364,31 @@ module.exports = (app) => ({
                     }
 
                     // only create with specified fields
-                    if (m.config.recoverNoSamePwd && verifyPassword(password, req.user.Password, m.config.pwdEncryptMethod || 'md5')) {
-                        res.makeError(406, 'New password cannot be the same as the old one!', m);
-                        return next('route');
+                    if (m.config.recoverNoSamePwd) {
+                        let oldPwd = req.user && req.user.Password;
+                        if (!oldPwd) {
+                            const theUser = await res.app.models.account.findOne({$or: [
+                                { PhoneNumber: phone },
+                                { 'Profile.Email': phone },
+                            ]});
+    
+                            oldPwd = theUser && theUser.Password;
+                        }
+
+                        if (oldPwd && verifyPassword(password, oldPwd, m.config.pwdEncryptMethod || 'md5')) {
+                            res.makeError(406, 'New password cannot be the same as the old one!', m);
+                            return next('route');
+                        }
                     }
 
                     res.locals.body = {
                         Password: encryptPwd(password, m.config.pwdEncryptMethod || 'md5'),
                     }
 
-                    res.locals.filter = {
-                        PhoneNumber: phone
-                    }
+                    res.locals.filter = {$or: [
+                        { PhoneNumber: phone },
+                        { 'Profile.Email': phone },
+                    ]}
 
                     return next();
                 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-be-account",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "main": "index.js",
   "license": "UNLICENSED",
   "repository": {
@@ -9,14 +9,14 @@
   },
   "dependencies": {
     "@alicloud/pop-core": "^1.7.13",
-    "axios": "^1.4.0",
-    "bcrypt": "^5.1.0",
-    "crypto-js": "^4.1.1",
+    "axios": "^1.6.8",
+    "bcrypt": "^5.1.1",
+    "crypto-js": "^4.2.0",
     "js-md5": "^0.7.3",
-    "nodemailer": "^6.9.2",
+    "nodemailer": "^6.9.13",
     "passport": "^0.6.0",
     "passport-local": "^1.0.0",
     "svg-captcha": "^1.4.0",
-    "uuid": "^9.0.0"
+    "uuid": "^9.0.1"
   }
 }

package/routers/mgmt/route.js

@@ -4,26 +4,26 @@ const router = express.Router();
 const { AccountAuditStatus } = require('../../enum');
 const { clearPermission, encryptPwd, crypto } = require('../../utils');
 
-// TODO: i18n translate
 const accountFilters = [
+    {
+        Name: 'id',
+        Type: 'String',
+        Info: {
+            Separate: true,
+        },
+    },
     {
         Name: 'LastUpdateDate',
         Type: 'DateRange',
-        Label: '更新日期',
-        Placeholder: '请选择',
     },
     {
         Name: 'Enabled',
         Type: 'Select',
-        Label: '激活状态',
-        Placeholder: '请选择',
         Options: [
             {
-                Label: '已激活',
                 Value: true,
             },
             {
-                Label: '未激活',
                 Value: false,
             },
         ],
@@ -31,22 +31,18 @@ const accountFilters = [
     {
         Name: 'Profile.Name',
         Type: 'String',
-        Label: '姓名',
     },
     {
         Name: 'Profile.Title',
         Type: 'String',
-        Label: '职务',
     },
     {
         Name: 'PhoneNumber',
         Type: 'String',
-        Label: '手机号',
     },
     {
         Name: 'UserName',
         Type: 'String',
-        Label: '用户名',
     },
 ];