@azteam/express 1.2.216 → 1.2.219

package/package.json

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

package/src/Server.js

@@ -10,9 +10,7 @@ import morgan from 'morgan';
 import cors from 'cors';
 import _ from 'lodash';
 import 'express-async-errors';
-import {CORS, errorCatch, ErrorException, UNKNOWN} from '@azteam/error';
-
-import {authMiddleware} from './middleware/authMiddleware';
+import {CORS, errorCatch, ErrorException, NOT_FOUND, UNKNOWN} from '@azteam/error';
 
 const RES_TYPE = {
     ARRAY: 'ARRAY',
@@ -269,12 +267,10 @@ class Server {
                 next();
             });
 
-            _.map(this.middlewares, (middleware) => {
+            _.map(this.middlewares, function (middleware) {
                 app.use(middleware);
             });
 
-            app.use(authMiddleware);
-
             const msg = [];
             _.map(this.controllers, (data) => {
                 const {controller} = data;
@@ -307,11 +303,15 @@ class Server {
 
             console.table(msg);
 
-            app.all('/', async (req, res) => {
+            app.all('/', async function (req, res) {
                 return res.success('welcome');
             });
 
-            app.use((err, req, res, next) => {
+            app.use(function (req, res) {
+                throw new ErrorException(NOT_FOUND);
+            });
+
+            app.use(function (err, req, res, next) {
                 const error = errorCatch(err);
 
                 if (process.env.NODE_ENV === 'development') {

package/src/middleware/authMiddleware.js

@@ -1,5 +1,5 @@
 import jwt from 'jsonwebtoken';
-import {ErrorException, TOKEN_EXPIRED, TOKEN_FAILED, UNKNOWN} from '@azteam/error';
+import {ErrorException, TOKEN_EXPIRED, TOKEN_FAILED} from '@azteam/error';
 
 function systemLogin(userData = null) {
     let user = {};
@@ -11,35 +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('JWT ')) {
-                token = token.replace('JWT ', '');
+            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(UNKNOWN, err);
+                } else {
+                    const data = await cbLoginAPI(token);
+                    if (data) {
+                        req.user = data;
+                    }
+                    return next();
                 }
             }
-            throw new ErrorException(TOKEN_FAILED, ['Token type failed']);
         }
-    }
 
-    return next();
+        return next();
+    };
 }

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';