@skillstew/common 1.0.18 → 1.0.20

package/build/middlewares/authMiddleware.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthMiddleware = void 0;
 const UnauthenticatedError_1 = require("../errors/UnauthenticatedError");
 const JwtHelper_1 = require("../jwt-utils/JwtHelper");
+const JwtErrors_1 = require("../errors/JwtErrors");
+const HttpStatus_1 = require("../constants/HttpStatus");
 class AuthMiddleware {
     constructor(userAccessTokenSecret, expertAccessTokenSecret, adminAccessTokenSecret) {
-        this.verify = (req, _res, next) => {
+        this.verify = (req, res, next) => {
             var _a;
             try {
                 const token = (_a = req.headers["authorization"]) === null || _a === void 0 ? void 0 : _a.split(" ")[1];
@@ -19,6 +21,24 @@ class AuthMiddleware {
                 next();
             }
             catch (err) {
+                if (err instanceof JwtErrors_1.AccessTokenVerifyError) {
+                    res
+                        .status(HttpStatus_1.HttpStatus.UNAUTHORIZED)
+                        .json({ success: false, message: err.message, code: err.code });
+                    return;
+                }
+                else if (err instanceof JwtErrors_1.InvalidTokenError) {
+                    res
+                        .status(HttpStatus_1.HttpStatus.UNAUTHORIZED)
+                        .json({ success: false, message: err.message, code: err.code });
+                    return;
+                }
+                else if (err instanceof UnauthenticatedError_1.UnauthenticatedError) {
+                    res
+                        .status(HttpStatus_1.HttpStatus.UNAUTHORIZED)
+                        .json({ success: false, message: err.message, code: err.code });
+                    return;
+                }
                 next(err);
             }
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skillstew/common",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "scripts": {

package/src/middlewares/authMiddleware.ts

@@ -1,6 +1,8 @@
 import { RequestHandler } from "express";
 import { UnauthenticatedError } from "../errors/UnauthenticatedError";
 import { JwtHelper } from "../jwt-utils/JwtHelper";
+import { AccessTokenVerifyError, InvalidTokenError } from "../errors/JwtErrors";
+import { HttpStatus } from "../constants/HttpStatus";
 
 export class AuthMiddleware {
   private _jwtHelper: JwtHelper;
@@ -17,12 +19,13 @@ export class AuthMiddleware {
     });
   }
 
-  verify: RequestHandler = (req, _res, next) => {
+  verify: RequestHandler = (req, res, next) => {
     try {
       const token = req.headers["authorization"]?.split(" ")[1];
       if (!token) {
         throw new UnauthenticatedError();
       }
+
       const payload = this._jwtHelper.verifyAccessToken(token);
       req.user = {
         id: payload.userId,
@@ -33,6 +36,22 @@ export class AuthMiddleware {
       };
       next();
     } catch (err) {
+      if (err instanceof AccessTokenVerifyError) {
+        res
+          .status(HttpStatus.UNAUTHORIZED)
+          .json({ success: false, message: err.message, code: err.code });
+        return;
+      } else if (err instanceof InvalidTokenError) {
+        res
+          .status(HttpStatus.UNAUTHORIZED)
+          .json({ success: false, message: err.message, code: err.code });
+        return;
+      } else if (err instanceof UnauthenticatedError) {
+        res
+          .status(HttpStatus.UNAUTHORIZED)
+          .json({ success: false, message: err.message, code: err.code });
+        return;
+      }
       next(err);
     }
   };