free-be-account 0.0.15 → 0.0.17

package/index.js

@@ -7,12 +7,23 @@ var svgCaptcha = require('svg-captcha');
 const passport = require('passport');
 const LocalStrategy = require('passport-local').Strategy;
 const {v1: uuidv1} = require('uuid');
+const RedisStore = require("connect-redis").default;
+const session = require("express-session");
+
 const crypto = require("./crypto");
 const { clearPermission, getPermissionPathList, verifyPassword, encryptPwd } = require('./utils');
 const { AccountAuditStatus } = require('./enum');
 const sms = require('./sms');
 const wx = require('./platforms/wx/index');
 
+const eis = {};
+
+try {
+    Object.assign(eis, require('../../global.js').eis);
+} catch (err) {
+    console.log('No global eis found!');
+}
+
 let __app_service_list_saved = false;
 let __saved_service_list;
 
@@ -205,6 +216,10 @@ module.exports = (app) => ({
         accountDefaultPassword: '12345678',
         accountDefaultPasswordRandom: false,
         accountDefaultPasswordRandomLength: 6,
+
+        autoCreateNewUser: false,
+        recoverNoSamePwd: false,
+
         // accountDefaultPermissions: [
         //     // could from system config
         //     // {
@@ -227,6 +242,7 @@ module.exports = (app) => ({
 
         dataScopes: [],
         permissionControls: [],
+        smsFormat: '6n',
         captcha: {
             cache: 5 * 60 * 1000,
             login: false,
@@ -315,12 +331,19 @@ module.exports = (app) => ({
                         Label: '邮箱',
                         Name: 'Profile.Email',
                         Index: 3,
+                        Rules: ['validatorEmail'],
                     },
                     {
                         Type: 'String',
                         Label: '职务',
                         Name: 'Profile.Title',
                         Index: 4,
+                        Rules: ['validatorOnlyCC'],
+                    },
+                    {
+                      Name: 'Profile.Avatar',
+                      Type: 'Image',
+                      Label: '头像',
                     },
                 ],
             },
@@ -399,6 +422,14 @@ module.exports = (app) => ({
             // label could be nagtive, means a user with it will DO NOT has it's permissions
             Negative: { type: 'Boolean', default: false },
         },
+
+        system_notification: {
+            User: { type: 'String', refer: 'account' },
+            Title: { type: 'String', required: true },
+            Content: { type: 'String' },
+            Read: { type: 'Boolean', default: false },
+            Category: { type: 'String' },
+        },
     },
     utils: {
         verify_api_permission,
@@ -850,12 +881,16 @@ module.exports = (app) => ({
                                     {
                                         // 'Profile.WxOpenId': wxResult.openid,
                                         ...openidFilter,
-                                        Enabled: true,
-                                        Deleted: false,
+                                        // Enabled: true,
+                                        // Deleted: false,
                                     }).then((user) => {
                                         if (user) {
-                                            user.isWx = true;
-                                            done(null, user);
+                                            if (!user.Enabled || user.Deleted) {
+                                                done(null, false);
+                                            } else {
+                                                user.isWx = true;
+                                                done(null, user);
+                                            }
                                         } else {
                                             // create new 
                                             const profile = {};
@@ -895,12 +930,12 @@ module.exports = (app) => ({
                             {
                                 $or: [{ PhoneNumber: username }, { UserName: username }],
                                 // Password: password,
-                                Enabled: true,
-                                Deleted: false,
+                                // Enabled: true,
+                                // Deleted: false,
                             }).then(async (user) => {
                                 if (!user) { 
                                     // auto create new user
-                                    if (m.config.autoCreateNewUser) {
+                                    if (m.config.autoCreateNewUser && await app.modules['account'].verify(username, password)) {
                                         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);
                                         };
@@ -936,10 +971,14 @@ module.exports = (app) => ({
                                     }
                                 }
 
+                                if (!user.Enabled || user.Deleted) {
+                                    return done(null, false);
+                                }
+
                                 const pwdVerified = verifyPassword(password, user.Password, m.config.pwdEncryptMethod || 'md5');
 
-                                return Promise.resolve(app.cache.get(username)).then((cachePwd) => {
-                                    if (!pwdVerified && cachePwd !== password) {
+                                return Promise.resolve(app.modules['sms'].verify(username, cachePwd)).then((cachePwd) => {
+                                    if (!pwdVerified && !cachePwd) {
                                         return done(null, false); 
                                     } else {
                                         return done(null, user);
@@ -1007,16 +1046,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 +1084,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();
@@ -1113,7 +1152,11 @@ module.exports = (app) => ({
                     let access_token = req.cookies.token || req.header('Authorization');
 
                     // call logout of the passport
-                    req.logout(() => {});
+                    req.logout((err) => {
+                        if (err) {
+                            app.logger.error(err.message || err);
+                        }
+                    });
 
                     // clear the cached token
                     res.clearCookie('token');
@@ -1202,7 +1245,7 @@ module.exports = (app) => ({
                     return next('route');
                 }
                 const phone = crypto.encoder.desDecode(req.body.PhoneNumber, m.config.desKey);
-                const result = await m.sms.verify(phone, req.body.code);
+                const result = await m.sms.verify(phone, req.body.code, req.body.delete === false ? false : true);
                 // app.logger.debug(cache.exportJson());
 
                 if (!result) {
@@ -1263,16 +1306,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 +1402,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();
                 },
@@ -1442,6 +1534,35 @@ module.exports = (app) => ({
             m.clearCachedPermission(app);
 
             // TODO: remove service list which are in the white list
+        },
+        onAppReady: (app) => {
+            let redisStore = new RedisStore({
+                client: app.redis,
+                prefix: app.config.prefix || 'xx-eis:',
+            });
+
+            app.use(
+                session({
+                  store: redisStore,
+                  resave: false, // required: force lightweight session keep alive (touch)
+                  saveUninitialized: false, // recommended: only save session when data exists
+                  secret: eis.session.secret || 'default eis session secret',
+                }),
+            );
+
+            app.use(passport.session());
+        },
+    },
+    notify: (user, title, content, category) => {
+        if (!user || !title) {
+            return;
         }
-    }
+
+        app.models.system_notification.create({
+            User: user,
+            Title: title,
+            Content: content,
+            Category: category,
+        });
+    },
 })