@azteam/express 1.2.218 → 1.2.221

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.218",
+    "version": "1.2.221",
     "main": "src/index.js",
     "engines": {
         "node": ">= 12.0.0",

package/src/AdminController.js

@@ -109,11 +109,11 @@ class AdminController extends Controller {
         };
     }
 
-    async beforeCreate(data, user) {
+    async beforeCreate(data) {
         return data;
     }
 
-    async afterCreate(item, user) {
+    async afterCreate(item) {
         return item;
     }
 
@@ -135,11 +135,11 @@ class AdminController extends Controller {
         };
     }
 
-    async beforeModify(data, user) {
+    async beforeModify(data) {
         return data;
     }
 
-    async afterModify(item, user) {
+    async afterModify(item) {
         return item;
     }
 
@@ -147,9 +147,9 @@ class AdminController extends Controller {
         let item = await this.repository.findOneById(req.params.id);
         if (!item) return res.error(NOT_EXISTS);
 
-        const data = await this.beforeModify(req.body, req.user);
-
-        item = await this.repository.modifyByUser(req.user.id, item, data);
+        item.loadData(req.body);
+        item.modified_id = req.user.id;
+        await item.save();
 
         item = await this.afterModify(item, req.user);
 
@@ -173,7 +173,8 @@ class AdminController extends Controller {
         const item = await this.repository.findOneById(req.params.id);
         if (!item) return res.error(NOT_EXISTS);
 
-        await this.repository.deleteByUser(req.user.id, item);
+        await item.delete(req.user.id);
+
         return res.success(true);
     };
 
@@ -189,7 +190,8 @@ class AdminController extends Controller {
         const item = await this.repository.findOneTrashById(req.params.id);
         if (!item) return res.error(NOT_EXISTS);
 
-        await this.repository.restoreByUser(req.user.id, item);
+        await item.restore(req.user.id);
+
         return res.success(true);
     };
 
@@ -205,7 +207,8 @@ class AdminController extends Controller {
         const item = await this.repository.findOneTrashById(req.params.id);
         if (!item) return res.error(NOT_EXISTS);
 
-        await this.repository.destroy(item);
+        await this.repository.destroy(item.id);
+
         return res.success(true);
     };
 

package/src/Server.js

@@ -12,8 +12,6 @@ import _ from 'lodash';
 import 'express-async-errors';
 import {CORS, errorCatch, ErrorException, NOT_FOUND, UNKNOWN} from '@azteam/error';
 
-import {authMiddleware} from './middleware/authMiddleware';
-
 const RES_TYPE = {
     ARRAY: 'ARRAY',
     OBJECT: 'OBJECT',
@@ -273,8 +271,6 @@ class Server {
                 app.use(middleware);
             });
 
-            app.use(authMiddleware);
-
             const msg = [];
             _.map(this.controllers, (data) => {
                 const {controller} = data;

package/src/middleware/authMiddleware.js

@@ -11,37 +11,42 @@ function systemLogin(userData = null) {
     return user;
 }
 
-export function authMiddleware(req, res, next) {
-    const {headers} = req;
+export default function (cbLoginAPI) {
+    return async function (req, res, next) {
+        const {headers} = req;
 
-    if (headers['x-app-secret'] === process.env.SECRET_KEY) {
-        req.user = systemLogin(headers['x-app-user']);
-    } else {
-        let token = null;
+        if (headers['x-app-secret'] === process.env.SECRET_KEY) {
+            req.user = systemLogin(headers['x-app-user']);
+        } else {
+            let token = null;
 
-        if (headers.authorization) {
-            token = headers.authorization;
-        }
+            if (headers.authorization) {
+                token = headers.authorization;
+            }
 
-        if (token) {
-            if (token.startsWith('Bearer ')) {
-                token = token.replace('Bearer ', '');
+            if (token) {
+                if (token.startsWith('Bearer ')) {
+                    token = token.replace('Bearer ', '');
 
-                try {
-                    req.user = jwt.verify(token, process.env.SECRET_KEY);
-                    return next();
-                } catch (err) {
-                    if (err.name === 'TokenExpiredError') {
-                        throw new ErrorException(TOKEN_EXPIRED, err);
+                    try {
+                        req.user = jwt.verify(token, process.env.SECRET_KEY);
+                        return next();
+                    } catch (err) {
+                        if (err.name === 'TokenExpiredError') {
+                            throw new ErrorException(TOKEN_EXPIRED, err);
+                        }
+                        throw new ErrorException(TOKEN_FAILED, err);
                     }
-                    throw new ErrorException(TOKEN_FAILED, err);
+                } else {
+                    const data = await cbLoginAPI(token);
+                    if (data) {
+                        req.user = data;
+                    }
+                    return next();
                 }
             }
-            throw new ErrorException(TOKEN_FAILED, {
-                message: 'Token type invalid',
-            });
         }
-    }
 
-    return next();
+        return next();
+    };
 }

package/src/middleware/cacheMiddleware.js

@@ -14,7 +14,7 @@ export default function (key, options = {}) {
             let cacheKey = key;
 
             if (options.query) {
-                cacheKey += `${cacheKey}:${_.get(req, options.query)}`;
+                cacheKey = `${cacheKey}:${_.get(req, options.query)}`;
             }
             if (req.paginate) {
                 if (_.isEmpty(req.query) && req.paginate.page <= options.limitPage) {

package/src/middleware/index.js

@@ -1,5 +1,6 @@
 export {default as signMiddleware} from './signMiddleware';
 export {default as etagMiddleware} from './etagMiddleware';
+export {default as authMiddleware} from './authMiddleware';
 export {default as roleMiddleware} from './roleMiddleware';
 export {default as adminRoleMiddleware} from './adminRoleMiddleware';
 export {default as systemRoleMiddleware} from './systemRoleMiddleware';

package/src/middleware/paginateMiddleware.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 
 function omitData(data) {
-    Object.keys(data).map(function (key, index) {
+    Object.keys(data).map(function (key) {
         let value = data[key];
         if (typeof value === 'string') {
             value = value.trim();
@@ -10,11 +10,10 @@ function omitData(data) {
             } else {
                 data[key] = value;
             }
-        } else {
-            if (value === null || value === undefined || Number.isNaN(value)) {
-                delete data[key];
-            }
+        } else if (value === null || value === undefined || Number.isNaN(value)) {
+            delete data[key];
         }
+        return true;
     });
     return data;
 }