@villedemontreal/jwt-validator 5.7.11 → 5.7.12

package/dist/src/middleware/jwtMiddleware.d.ts

@@ -4,4 +4,4 @@ import * as express from 'express';
  *
  * @param {boolean} mandatoryValidation Defines if the JWT is mandatory. Defaults to true.
  */
-export declare const jwtValidationMiddleware: (mandatoryValidation?: boolean) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>;
+export declare const jwtValidationMiddleware: (mandatoryValidation?: boolean) => (req: express.Request, res: express.Response, next: express.NextFunction) => void;

package/dist/src/middleware/jwtMiddleware.js

@@ -10,14 +10,23 @@ const jwtValidator_1 = require("../jwtValidator");
  * @param {boolean} mandatoryValidation Defines if the JWT is mandatory. Defaults to true.
  */
 const jwtValidationMiddleware = (mandatoryValidation = true) => {
-    return async (req, res, next) => {
+    return (req, res, next) => {
         try {
             const authHeader = req.get(http_header_fields_typed_1.default.AUTHORIZATION);
             if (mandatoryValidation || authHeader) {
-                req[constants_1.constants.requestExtraVariables.JWT] =
-                    await jwtValidator_1.jwtValidator.verifyAuthorizationHeader(authHeader);
+                jwtValidator_1.jwtValidator
+                    .verifyAuthorizationHeader(authHeader)
+                    .then((jwt) => {
+                    req[constants_1.constants.requestExtraVariables.JWT] = jwt;
+                    next();
+                })
+                    .catch((err) => {
+                    next(err);
+                });
+            }
+            else {
+                next();
             }
-            next();
         }
         catch (err) {
             next(err);

package/dist/src/middleware/jwtMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"jwtMiddleware.js","sourceRoot":"","sources":["../../../src/middleware/jwtMiddleware.ts"],"names":[],"mappings":";;;AACA,uEAA6D;AAC7D,mDAAgD;AAChD,kDAA+C;AAE/C;;;;GAIG;AACI,MAAM,uBAAuB,GAE8D,CAChG,mBAAmB,GAAG,IAAI,EAC1B,EAAE;IACF,OAAO,KAAK,EACV,GAAoB,EACpB,GAAqB,EACrB,IAA0B,EACX,EAAE;QACjB,IAAI;YACF,MAAM,UAAU,GAAW,GAAG,CAAC,GAAG,CAAC,kCAAqB,CAAC,aAAa,CAAC,CAAC;YACxE,IAAI,mBAAmB,IAAI,UAAU,EAAE;gBACpC,GAAW,CAAC,qBAAS,CAAC,qBAAqB,CAAC,GAAG,CAAC;oBAC/C,MAAM,2BAAY,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;aAC5D;YACD,IAAI,EAAE,CAAC;SACR;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,GAAG,CAAC,CAAC;SACX;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,uBAAuB,2BAqBlC"}
+{"version":3,"file":"jwtMiddleware.js","sourceRoot":"","sources":["../../../src/middleware/jwtMiddleware.ts"],"names":[],"mappings":";;;AACA,uEAA6D;AAC7D,mDAAgD;AAChD,kDAA+C;AAE/C;;;;GAIG;AACI,MAAM,uBAAuB,GAEqD,CACvF,mBAAmB,GAAG,IAAI,EAC1B,EAAE;IACF,OAAO,CAAC,GAAoB,EAAE,GAAqB,EAAE,IAA0B,EAAQ,EAAE;QACvF,IAAI;YACF,MAAM,UAAU,GAAW,GAAG,CAAC,GAAG,CAAC,kCAAqB,CAAC,aAAa,CAAC,CAAC;YACxE,IAAI,mBAAmB,IAAI,UAAU,EAAE;gBACrC,2BAAY;qBACT,yBAAyB,CAAC,UAAU,CAAC;qBACrC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;oBACX,GAAW,CAAC,qBAAS,CAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;oBACxD,IAAI,EAAE,CAAC;gBACT,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBACb,IAAI,CAAC,GAAG,CAAC,CAAC;gBACZ,CAAC,CAAC,CAAC;aACN;iBAAM;gBACL,IAAI,EAAE,CAAC;aACR;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,GAAG,CAAC,CAAC;SACX;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,uBAAuB,2BAyBlC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@villedemontreal/jwt-validator",
-  "version": "5.7.11",
+  "version": "5.7.12",
   "description": "Module to validate JWT (JSON Web Tokens)",
   "main": "dist/src/index.js",
   "typings": "dist/src",

package/src/middleware/jwtMiddleware.ts

@@ -10,21 +10,25 @@ import { jwtValidator } from '../jwtValidator';
  */
 export const jwtValidationMiddleware: (
   mandatoryValidation?: boolean
-) => (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void> = (
+) => (req: express.Request, res: express.Response, next: express.NextFunction) => void = (
   mandatoryValidation = true
 ) => {
-  return async (
-    req: express.Request,
-    res: express.Response,
-    next: express.NextFunction
-  ): Promise<void> => {
+  return (req: express.Request, res: express.Response, next: express.NextFunction): void => {
     try {
       const authHeader: string = req.get(httpHeaderFieldsTyped.AUTHORIZATION);
       if (mandatoryValidation || authHeader) {
-        (req as any)[constants.requestExtraVariables.JWT] =
-          await jwtValidator.verifyAuthorizationHeader(authHeader);
+        jwtValidator
+          .verifyAuthorizationHeader(authHeader)
+          .then((jwt) => {
+            (req as any)[constants.requestExtraVariables.JWT] = jwt;
+            next();
+          })
+          .catch((err) => {
+            next(err);
+          });
+      } else {
+        next();
       }
-      next();
     } catch (err) {
       next(err);
     }