npm - @azteam/express - Versions diffs - 1.2.214 → 1.2.215 - Mend

@azteam/express 1.2.214 → 1.2.215

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/package.json +1 -1
package/src/middleware/authMiddleware.js +11 -6

package/package.json CHANGED Viewed

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

package/src/middleware/authMiddleware.js CHANGED Viewed

@@ -1,4 +1,5 @@
 import jwt from 'jsonwebtoken';
+import {ErrorException, TOKEN_EXPIRED, TOKEN_FAILED, UNKNOWN} from '@azteam/error';
 function systemLogin(userData = null) {
     let user = {};
@@ -25,14 +26,18 @@ export function authMiddleware(req, res, next) {
         if (token) {
             if (token.startsWith('JWT ')) {
                 token = token.replace('JWT ', '');
-                return jwt.verify(token, process.env.SECRET_KEY, async (error, jwtData) => {
-                    if (jwtData) {
-                        req.user = jwtData;
-                    }
+                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 Error('Token type failed');
+            throw new ErrorException(TOKEN_FAILED, ['Token type failed']);
         }
     }