free-be-account 0.0.15 → 0.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-be-account",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "main": "index.js",
   "license": "UNLICENSED",
   "repository": {
@@ -9,14 +9,19 @@
   },
   "dependencies": {
     "@alicloud/pop-core": "^1.7.13",
-    "axios": "^1.4.0",
-    "bcrypt": "^5.1.0",
-    "crypto-js": "^4.1.1",
-    "js-md5": "^0.7.3",
-    "nodemailer": "^6.9.2",
-    "passport": "^0.6.0",
+    "axios": "^1.7.7",
+    "bcrypt": "^5.1.1",
+    "connect-redis": "^7.1.1",
+    "crypto-js": "^4.2.0",
+    "express-session": "^1.18.1",
+    "js-md5": "^0.8.3",
+    "minimatch": "^10.0.1",
+    "nodemailer": "^6.9.16",
+    "passport": "^0.7.0",
     "passport-local": "^1.0.0",
+    "semver": "^7.6.3",
     "svg-captcha": "^1.4.0",
-    "uuid": "^9.0.0"
+    "tar": "^7.4.3",
+    "uuid": "^11.0.2"
   }
 }

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: '用户名',
     },
 ];
 
@@ -94,6 +90,9 @@ router.get('/', async (req, res, next) => {
                     }
                 }
             }
+
+            doc.Profile = doc.Profile || {};
+            doc.Profile.Name = doc.Profile.Name || doc.UserName || '';
         }
     }
 }));

package/routers/uc/info/route.js

@@ -91,12 +91,12 @@ router.post('/submit',
 
         if (router.mdl.config.accountRequireAudit) {
             res.locals.body.Status = router.mdl.AccountAuditStatus.Auditing;
-        }
 
-        // set to default permission 
-        const p = router.mdl.config.accountDefaultPermissions;
-        res.app.modules.account.utils.clearPermission(p);
-        res.locals.body.Permission = p;
+            // set to default permission 
+            const p = router.mdl.config.accountDefaultPermissions;
+            res.app.modules.account.utils.clearPermission(p);
+            res.locals.body.Permission = p;
+        }
 
         res.locals.filter = { id: req.user.id };
         res.locals.fields = [

package/routers/uc/noty/index.js

@@ -0,0 +1,4 @@
+module.exports = {
+    title: '系统通知',
+    description: '',
+};

package/routers/uc/noty/route.js

@@ -0,0 +1,61 @@
+const express = require(require('path').resolve('./') + "/node_modules/express");
+const router = express.Router();
+
+router.get('/count',
+    async (req, res, next) => {
+        const count = await res.app.models.system_notification.countDocuments({
+            User: req.user.id,
+            Read: false,
+        });
+
+        res.addData({
+            count,
+        }, true);
+
+        return next();
+    },
+);
+
+router.get('/', 
+    (req, res, next) => {
+        res.locals.filter = {
+            User: req.user.id,
+        };
+
+        res.locals.fields = [
+            'id',
+            'CreatedDate',
+
+            'Title',
+            'Content',
+            'Read',
+            'Category',
+        ];
+
+        return next();
+    },
+    router.FindDocuments('system_notification'),
+);
+
+router.put('/read/:id',
+    (req, res, next) => {
+        res.locals.filter = {
+            id: req.params.id,
+            User: req.user.id,
+            Read: false,
+        };
+
+        res.locals.fields = [
+            'Read',
+        ]
+
+        res.locals.body = {
+            Read: true,
+        };
+
+        return next();
+    },
+    router.UpdateDocument('system_notification'),
+);
+
+module.exports = router;

package/sms/index.js

@@ -9,7 +9,7 @@ if (fs.existsSync(path.resolve(__dirname, '../../../global.js'))) {
     global = require('../../../global');
 }
 
-let MAIL_TRANS = undefined;
+let MAIL_TRANS = {};
 
 function _generateMSG (f = '4n') {
     if (typeof f !== 'string' || f.length < 2) {
@@ -95,7 +95,7 @@ const _sms_lib = {
         send: async function(k, p, v) {
             if(!k || !k.host || !k.secret || !k.mail || !k.from || !k.title) throw new Error('MMail configuration incorrect!');
             
-            MAIL_TRANS = MAIL_TRANS || nodemailer.createTransport({ 
+            MAIL_TRANS[k.mail] = MAIL_TRANS[k.mail] || nodemailer.createTransport({ 
                 host: k.host, 
                 secureConnection: true,
                 port: 465,
@@ -109,7 +109,7 @@ const _sms_lib = {
             const result = await MAIL_TRANS.sendMail({ 
                 from: k.from,
                 to: p,
-                subject: k.title,
+                subject: typeof k.title === 'function' ? k.title(v) : k.title,
                 html: typeof k.template === 'function' ? k.template(v) : k.template,
                 envelope: {
                     from: k.from,
@@ -182,8 +182,14 @@ module.exports = (app) => ({
         let v = _generateMSG(f);
         return await this.send(p, v, c, t);
     },
-    verify: async function (p, v) {
+    verify: async function (p, v, del) {
         const cached = await app.cache.get(p);
+
+        // clear cache if the code is correct
+        if (del && cached === v) {
+            await app.cache.del(p);
+        }
+        
         return cached === v;
     }
 })