@azteam/express 1.2.215 → 1.2.218

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.215",
+    "version": "1.2.218",
     "main": "src/index.js",
     "engines": {
         "node": ">= 12.0.0",
@@ -10,7 +10,7 @@
     "license": "MIT",
     "dependencies": {
         "@azteam/crypto": "1.0.24",
-        "@azteam/error": "1.0.25",
+        "@azteam/error": "1.0.26",
         "@azteam/http-client": "1.0.95",
         "@grpc/grpc-js": "1.6.7",
         "@grpc/proto-loader": "0.6.12",

package/src/Server.js

@@ -10,7 +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 {CORS, errorCatch, ErrorException, NOT_FOUND, UNKNOWN} from '@azteam/error';
 
 import {authMiddleware} from './middleware/authMiddleware';
 
@@ -269,7 +269,7 @@ class Server {
                 next();
             });
 
-            _.map(this.middlewares, (middleware) => {
+            _.map(this.middlewares, function (middleware) {
                 app.use(middleware);
             });
 
@@ -307,11 +307,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 = {};
@@ -24,8 +24,8 @@ export function authMiddleware(req, res, next) {
         }
 
         if (token) {
-            if (token.startsWith('JWT ')) {
-                token = token.replace('JWT ', '');
+            if (token.startsWith('Bearer ')) {
+                token = token.replace('Bearer ', '');
 
                 try {
                     req.user = jwt.verify(token, process.env.SECRET_KEY);
@@ -34,10 +34,12 @@ export function authMiddleware(req, res, next) {
                     if (err.name === 'TokenExpiredError') {
                         throw new ErrorException(TOKEN_EXPIRED, err);
                     }
-                    throw new ErrorException(UNKNOWN, err);
+                    throw new ErrorException(TOKEN_FAILED, err);
                 }
             }
-            throw new ErrorException(TOKEN_FAILED, ['Token type failed']);
+            throw new ErrorException(TOKEN_FAILED, {
+                message: 'Token type invalid',
+            });
         }
     }