@azteam/express 1.2.212 → 1.2.215

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.212",
+    "version": "1.2.215",
     "main": "src/index.js",
     "engines": {
         "node": ">= 12.0.0",
@@ -11,7 +11,7 @@
     "dependencies": {
         "@azteam/crypto": "1.0.24",
         "@azteam/error": "1.0.25",
-        "@azteam/http-client": "1.0.94",
+        "@azteam/http-client": "1.0.95",
         "@grpc/grpc-js": "1.6.7",
         "@grpc/proto-loader": "0.6.12",
         "body-parser": "1.19.0",

package/src/Controller.js

@@ -6,12 +6,12 @@ class Controller {
 
     publicRouter() {
         let child = this;
-        let result = [];
+        const result = [];
 
         while (Object.getPrototypeOf(child.__proto__)) {
             const data = Object.getOwnPropertyNames(Object.getPrototypeOf(child));
 
-            data.map((methodName) => {
+            data.map(function (methodName) {
                 const matches = methodName.match(/^(get|post|put|patch|delete)/);
                 if (matches) {
                     let path = '/';
@@ -27,6 +27,7 @@ class Controller {
                         path,
                     });
                 }
+                return true;
             });
             child = child.__proto__;
         }

package/src/Server.js

@@ -10,7 +10,9 @@ import morgan from 'morgan';
 import cors from 'cors';
 import _ from 'lodash';
 import 'express-async-errors';
-import {errorCatch, CORS, ErrorException, NOT_FOUND, UNKNOWN} from '@azteam/error';
+import {CORS, errorCatch, ErrorException, UNKNOWN} from '@azteam/error';
+
+import {authMiddleware} from './middleware/authMiddleware';
 
 const RES_TYPE = {
     ARRAY: 'ARRAY',
@@ -104,11 +106,15 @@ class Server {
         if (apiDir) {
             const controllerDirs = fs.readdirSync(apiDir);
 
-            for (const dirName of controllerDirs) {
+            for (let i = 0; i < controllerDirs.length; i += 1) {
+                const dirName = controllerDirs[i];
                 if (fs.statSync(`${apiDir}/${dirName}`).isDirectory()) {
                     const versionDirs = fs.readdirSync(`${apiDir}/${dirName}`);
 
-                    for (const versionName of versionDirs) {
+                    for (let j = 0; j < versionDirs.length; j += 1) {
+                        const versionName = versionDirs[j];
+
+                        // eslint-disable-next-line global-require,import/no-dynamic-require
                         const controller = require(`${apiDir}/${dirName}/${versionName}/controller`).default;
                         this.addController(dirName, versionName, controller);
                     }
@@ -250,7 +256,7 @@ class Server {
                 });
             };
 
-            app.use(async function (req, res, next) {
+            app.use(function (req, res, next) {
                 delete res.cache;
 
                 req.trackDevice = {
@@ -267,6 +273,8 @@ class Server {
                 app.use(middleware);
             });
 
+            app.use(authMiddleware);
+
             const msg = [];
             _.map(this.controllers, (data) => {
                 const {controller} = data;
@@ -303,10 +311,6 @@ class Server {
                 return res.success('welcome');
             });
 
-            app.use((req, res) => {
-                throw new ErrorException(NOT_FOUND);
-            });
-
             app.use((err, req, res, next) => {
                 const error = errorCatch(err);
 

package/src/middleware/authMiddleware.js

@@ -1,4 +1,5 @@
 import jwt from 'jsonwebtoken';
+import {ErrorException, TOKEN_EXPIRED, TOKEN_FAILED, UNKNOWN} from '@azteam/error';
 
 function systemLogin(userData = null) {
     let user = {};
@@ -10,51 +11,35 @@ function systemLogin(userData = null) {
     return user;
 }
 
-export default function (cbRefreshToken, cbLoginAPI) {
-    return async function (req, res, next) {
-        const {headers, signedCookies} = req;
+export function authMiddleware(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 = signedCookies.access_token;
+    if (headers['x-app-secret'] === process.env.SECRET_KEY) {
+        req.user = systemLogin(headers['x-app-user']);
+    } else {
+        let token = null;
 
-            if (headers.authorization && signedCookies.api_key !== headers.authorization) {
-                token = headers.authorization;
-            }
+        if (headers.authorization) {
+            token = headers.authorization;
+        }
 
-            if (token) {
-                token = token.replace('Bearer ', '');
-                return jwt.verify(token, process.env.SECRET_KEY, async (error, jwtData) => {
-                    if (error) {
-                        try {
-                            let data = null;
-                            if (error.name === 'TokenExpiredError') {
-                                if (signedCookies.refresh_token) {
-                                    data = await cbRefreshToken(signedCookies.refresh_token);
-                                } else if (signedCookies.api_key) {
-                                    data = await cbLoginAPI(signedCookies.api_key);
-                                }
-                            } else if (error.name === 'JsonWebTokenError') {
-                                data = await cbLoginAPI(token);
-                            }
-                            if (data) {
-                                jwtData = jwt.decode(data.access_token);
-                                res.addCookie({
-                                    access_token: data.access_token,
-                                });
-                                res.set('Auth-Token', data.access_token);
-                            }
-                        } catch (e) {}
-                    }
-                    if (jwtData) {
-                        req.user = jwtData;
-                    }
+        if (token) {
+            if (token.startsWith('JWT ')) {
+                token = token.replace('JWT ', '');
+
+                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(UNKNOWN, err);
+                }
             }
+            throw new ErrorException(TOKEN_FAILED, ['Token type failed']);
         }
+    }
 
-        return next();
-    };
+    return next();
 }

package/src/middleware/cacheMiddleware.js

@@ -26,12 +26,11 @@ export default function (key, options = {}) {
             const cacheData = await redis.get(cacheKey);
             if (cacheData) {
                 return res.json(cacheData);
-            } else {
-                res.cache = {
-                    key: cacheKey,
-                    ttl: options.ttl,
-                };
             }
+            res.cache = {
+                key: cacheKey,
+                ttl: options.ttl,
+            };
         }
         return next();
     };

package/src/middleware/index.js

@@ -1,6 +1,5 @@
 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';