free-be-account 0.0.9 → 0.0.11

package/index.js

@@ -152,6 +152,38 @@ const verify_api_permission = async (app, mdl, user, api_path) => {
     return true; // TODO: secure enough??
 }
 
+
+async function clear_cache_token_by_user_id (app, id) {
+    if (!id) return;
+
+    const cacheKeys = await app.cache.keys();
+    if (cacheKeys && cacheKeys.length) {
+        for (let i = 0; i < cacheKeys.length; i += 1) {
+            const k = cacheKeys[i];
+
+            let value = await app.cache.get(k);
+            if (value && value.userId && value.userId === id)
+                await app.cache.del(k);
+        }
+    }
+}
+
+async function generate_new_access_token_pwd (app, userId, oldToken, keepToken = '', isWx = false) {
+    let uuid = keepToken || uuidv1();
+
+    // remove the old one from cache
+    app.cache.del(oldToken);
+    // cache.del(oldToken);
+    await clear_cache_token_by_user_id(app, userId);
+
+    // add the new one to the cache
+
+    app.cache.put(uuid, { userId: userId, type: isWx ? 'wx' : 'pwd' }, app.config['cacheTimeout']);
+    // cache.put(uuid, { userId: userId, type: 'pwd' }, app.config['cacheTimeout']);
+
+    return uuid;
+}
+
 module.exports = (app) => ({
     sms: sms(app),
     AccountAuditStatus,
@@ -545,6 +577,8 @@ module.exports = (app) => ({
             ks.forEach(k => app.cache.del(k))
         });
     },
+    clear_cache_token_by_user_id,
+    generate_new_access_token_pwd,
     hooks: {
         onBegin: (app) => {
             app.use(passport.initialize());
@@ -833,7 +867,7 @@ module.exports = (app) => ({
                                             app.models['account'].create({
                                                 Enabled: true,
                                                 Deleted: false,
-                                                Permission: app.config.passport.accountDefaultPermissions || {},
+                                                Permission: app.config.account.accountDefaultPermissions || {},
                                                 Profile: profile,
                                             }).then((nuser) => {
                                                 if (nuser) {
@@ -985,37 +1019,6 @@ module.exports = (app) => ({
                 return next();
             });
 
-            async function clear_cache_token_by_user_id (id) {
-                if (!id) return;
-
-                const cacheKeys = await app.cache.keys();
-                if (cacheKeys && cacheKeys.length) {
-                    for (let i = 0; i < cacheKeys.length; i += 1) {
-                        const k = cacheKeys[i];
-
-                        let value = await app.cache.get(k);
-                        if (value && value.userId && value.userId === id)
-                            await app.cache.del(k);
-                    }
-                }
-            }
-
-            async function generate_new_access_token_pwd (userId, oldToken, keepToken = '', isWx = false) {
-                let uuid = keepToken || uuidv1();
-
-                // remove the old one from cache
-                app.cache.del(oldToken);
-                // cache.del(oldToken);
-                await clear_cache_token_by_user_id(userId);
-
-                // add the new one to the cache
-
-                app.cache.put(uuid, { userId: userId, type: isWx ? 'wx' : 'pwd' }, app.config['cacheTimeout']);
-                // cache.put(uuid, { userId: userId, type: 'pwd' }, app.config['cacheTimeout']);
-
-                return uuid;
-            }
-
             // login with the specified strategy
             app.post(`${app.config['baseUrl'] || ''}/login`,
                 passport.authenticate(m.config['strategy'] || 'local', { session: false }),
@@ -1044,10 +1047,10 @@ module.exports = (app) => ({
                         (req.user && req.user.PhoneNumber && m.config['keepTokenAccounts'].indexOf(req.user.PhoneNumber) >= 0)) {
                         // keep token
                         const kt = await app.cache.get(`_keep_token_${req.user.id}`);
-                        token = await generate_new_access_token_pwd(req.user.id, access_token, kt, req.user.isWx);
+                        token = await generate_new_access_token_pwd(app, req.user.id, access_token, kt, req.user.isWx);
                         app.cache.set(`_keep_token_${req.user.id}`, token);
                     } else {
-                        token = await generate_new_access_token_pwd(req.user.id, access_token, null, req.user.isWx);
+                        token = await generate_new_access_token_pwd(app, req.user.id, access_token, null, req.user.isWx);
                     }
 
                     res.cookie('token', token, { maxAge: app.config['cookieTimeout'] });
@@ -1118,21 +1121,23 @@ module.exports = (app) => ({
                     const phone = crypto.encoder.desDecode(req.body.PhoneNumber, m.config.desKey);
 
                     // check user existance if necessary
-                    const existsCount = await res.app.models.account.countDocuments({$or: [
-                        { PhoneNumber: phone },
-                        { 'Profile.Email': phone },
-                    ]});
-
-                    if (req.body.exists && existsCount <= 0) {
-                        res.makeError(409, 'User not exists!', m);
-                        return next('route');
-                    }
-                    if (!req.body.exists && existsCount > 0) {
-                        res.makeError(410, 'User aleady exists!', m);
-                        return next('route');
+                    if (req.body.exists !== 'all') {
+                        const existsCount = await res.app.models.account.countDocuments({$or: [
+                            { PhoneNumber: phone },
+                            { 'Profile.Email': phone },
+                        ]});
+    
+                        if (req.body.exists && existsCount <= 0) {
+                            res.makeError(409, 'User not exists!', m);
+                            return next('route');
+                        }
+                        if (!req.body.exists && existsCount > 0) {
+                            res.makeError(410, 'User aleady exists!', m);
+                            return next('route');
+                        }
                     }
 
-                    const result = await res.Module('sms').sendRandom(phone, undefined, true, req.body.smsTemp || 'register');
+                    const result = await m.sms.sendRandom(phone, undefined, true, req.body.smsTemp || 'register');
 
                     if (!result) {
                         res.makeError(500, 'Failed to send sms!', m);
@@ -1147,7 +1152,6 @@ module.exports = (app) => ({
                 return next();
             })
 
-
             // verfiy the sms code
             app.post(`${(app.config['baseUrl'] || '')}/register/verify`, async (req, res, next) => {
                 if (!req.body.PhoneNumber || !req.body.code) {
@@ -1155,7 +1159,7 @@ module.exports = (app) => ({
                     return next('route');
                 }
                 const phone = crypto.encoder.desDecode(req.body.PhoneNumber, m.config.desKey);
-                const result = await res.Module('sms').verify(phone, req.body.code);
+                const result = await m.sms.verify(phone, req.body.code);
                 // app.logger.debug(cache.exportJson());
 
                 if (!result) {
@@ -1167,7 +1171,6 @@ module.exports = (app) => ({
                 return next();
             })
 
-
             // verify phone number (duplication) for register
             app.post(`${(app.config['baseUrl'] || '')}/register/verify/phone`, async (req, res, next) => {
                 if (!req.body.PhoneNumber) {
@@ -1196,7 +1199,7 @@ module.exports = (app) => ({
                         return next('route');
                     }
 
-                    const result = await res.Module('sms').verify(phone, req.body.code);
+                    const result = await m.sms.verify(phone, req.body.code);
 
                     if (!result) {
                         res.makeError(403, 'Code verification failed!', m);
@@ -1269,7 +1272,7 @@ module.exports = (app) => ({
                     const phone = crypto.encoder.desDecode(req.body.PhoneNumber, m.config.desKey);
                     const password = crypto.encoder.desDecode(req.body.Password, m.config.desKey);
 
-                    const result = await res.Module('sms').verify(phone, req.body.code);
+                    const result = await m.sms.verify(phone, req.body.code);
 
                     if (!result) {
                         res.makeError(403, 'Code verification failed!', m);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-be-account",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "main": "index.js",
   "license": "UNLICENSED",
   "repository": {

package/routers/uc/info/route.js

@@ -79,11 +79,11 @@ router.post('/submit',
             res.locals.body.Profile = {...user.Profile, ...req.body.Profile};
         }
 
-        res.locals.body.Status = res.app.modules.passport.AccountAuditStatus.Auditing;
+        res.locals.body.Status = res.app.modules.account.AccountAuditStatus.Auditing;
 
         // set to default permission 
-        const p = res.app.modules.passport.config.accountDefaultPermissions;
-        res.app.modules.passport.utils.clearPermission(p);
+        const p = res.app.modules.account.config.accountDefaultPermissions;
+        res.app.modules.account.utils.clearPermission(p);
         res.locals.body.Permission = p;
 
         res.locals.filters = { id: req.user.id };

package/routers/uc/phone/route.js

@@ -24,9 +24,9 @@ router.put('/',
 
         // update phone number
         res.locals.body = {};
-        res.locals.body.PhoneNumber = res.app.modules.passport.utils.crypto.encoder.desDecode(req.body.phone, res.app.modules.passport.config.desKey);
+        res.locals.body.PhoneNumber = res.app.modules.account.utils.crypto.encoder.desDecode(req.body.phone, res.app.modules.account.config.desKey);
 
-        const oResult = await res.Module('sms').verify(ophone, req.body.ocode);
+        const oResult = await router.mdl.sms.verify(ophone, req.body.ocode);
         if (!oResult) {
             res.makeError(400, 'Verification code for the old phone is incorrect!', router.mdl);
             await res.app.cache.del(ophone);
@@ -34,7 +34,7 @@ router.put('/',
             return next('route');
         }
 
-        const result = await res.Module('account').sms.verify(res.locals.body.PhoneNumber, req.body.code);
+        const result = await router.mdl.sms.verify(res.locals.body.PhoneNumber, req.body.code);
         if (!result) {
             res.makeError(405, 'Verification code for the new phone is incorrect!', router.mdl);
             await res.app.cache.del(ophone);

package/routers/uc/pwd/route.js

@@ -16,7 +16,7 @@ router.put('/',
             return next('route');
         }
 
-        const result = await res.Module('sms').verify(phone, req.body.code);
+        const result = await router.mdl.sms.verify(phone, req.body.code);
         // app.logger.debug(cache.exportJson());
 
         if (!result) {
@@ -32,7 +32,7 @@ router.put('/',
         const password = res.app.modules.account.utils.crypto.encoder.desDecode(req.body.Password, res.app.modules.account.config.desKey);
 
         res.locals.body = {};
-        res.locals.body.Password = res.app.modules.passport.utils.encryptPwd(password, res.app.modules.passport.config.pwdEncryptMethod || 'md5');
+        res.locals.body.Password = res.app.modules.account.utils.encryptPwd(password, res.app.modules.account.config.pwdEncryptMethod || 'md5');
 
         res.locals.filters = { id: req.user.id };
         res.locals.fields = [

package/routers/uc/sub/route.js

@@ -79,7 +79,6 @@ router.post('/',
         // also same Org (but should check whether we have Org module??)
         if (req.user.Org) req.body.Org = req.user.Org;
 
-        // TODO: should not set status here as we don't have this field yet (which was added in passport)
         req.body.Status = '1';
 
         // TODO: check permission, should not be bigger than the main account

package/sms/index.js

@@ -5,8 +5,8 @@ const nodemailer = require('nodemailer');
 
 let global;
 
-if (fs.existsSync(path.resolve(__dirname, '../../global.js'))) {
-    global = require('../../global');
+if (fs.existsSync(path.resolve(__dirname, '../../../global.js'))) {
+    global = require('../../../global');
 }
 
 let MAIL_TRANS = undefined;