free-be-account 0.0.10 → 0.0.12

package/index.js

@@ -1121,18 +1121,20 @@ 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 m.sms.sendRandom(phone, undefined, true, req.body.smsTemp || 'register');
@@ -1142,7 +1144,7 @@ module.exports = (app) => ({
                         return next('route');
                     }
                 } catch (ex) {
-                    res.makeError(500, ex.message || 'Failed to send sms!', m);
+                    res.makeError(502, ex.message || 'Failed to send sms!', m);
                     return next('route');
                 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-be-account",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "main": "index.js",
   "license": "UNLICENSED",
   "repository": {
@@ -9,14 +9,14 @@
   },
   "dependencies": {
     "@alicloud/pop-core": "^1.7.12",
-    "axios": "^1.3.4",
-    "bcrypt": "^5.0.1",
+    "axios": "^1.3.5",
+    "bcrypt": "^5.1.0",
     "crypto-js": "^4.1.1",
     "js-md5": "^0.7.3",
     "nodemailer": "^6.9.1",
-    "passport": "^0.5.0",
+    "passport": "^0.6.0",
     "passport-local": "^1.0.0",
     "svg-captcha": "^1.4.0",
-    "uuid": "^8.3.2"
+    "uuid": "^9.0.0"
   }
 }

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;
@@ -132,10 +132,12 @@ module.exports = (app) => ({
         const keys = (global && global.sms && global.sms[t]) || app.modules.account.config.sms.keys[t] || app.modules.account.config.sms.keys;
         
         if (keys.platform) {
-            // if the cached code still there, we should not re-send!
-            if (await app.cache.get(p)) {
+            // should not send too frequent!
+            const lastSentTime = await app.cache.get(`${p}_lastSentTime`);
+            if (lastSentTime && (Date.now() - lastSentTime) < (keys.resentGap || (60 * 1000))) {
                 throw new Error('Cannot send too frequently!');
             }
+
             if (_sms_lib[keys.platform]) {
                 let sent = true;
                 const v = keys.fixedCode || value;
@@ -150,6 +152,7 @@ module.exports = (app) => ({
                     if (c) {
                         const cTime = keys.cacheTime || (5 * 60 * 1000)
                         await app.cache.put(p, v, cTime);
+                        await app.cache.put(`${p}_lastSentTime`, Date.now(), cTime);
                     }
                     return true;
                 } else {