@ecom-micro/common 2.0.14 → 2.0.16

package/build/index.d.ts

@@ -4,9 +4,10 @@ export * from './errors/notAuthorized';
 export * from './errors/notFoundError';
 export * from './errors/requestValidationError';
 export * from './middleware/errorHandler';
-export * from './middleware/protect';
+export * from './middleware/currentUser';
 export * from './middleware/restrictTo';
 export * from './middleware/requestValidation';
+export * from './middleware/requireAuth';
 export * from './events/baseListener';
 export * from './events/basePublisher';
 export * from './events/productCreatedEvent';

package/build/index.js

@@ -20,9 +20,10 @@ __exportStar(require("./errors/notAuthorized"), exports);
 __exportStar(require("./errors/notFoundError"), exports);
 __exportStar(require("./errors/requestValidationError"), exports);
 __exportStar(require("./middleware/errorHandler"), exports);
-__exportStar(require("./middleware/protect"), exports);
+__exportStar(require("./middleware/currentUser"), exports);
 __exportStar(require("./middleware/restrictTo"), exports);
 __exportStar(require("./middleware/requestValidation"), exports);
+__exportStar(require("./middleware/requireAuth"), exports);
 __exportStar(require("./events/baseListener"), exports);
 __exportStar(require("./events/basePublisher"), exports);
 __exportStar(require("./events/productCreatedEvent"), exports);

package/build/middleware/{protect.d.ts → currentUser.d.ts}

@@ -11,5 +11,5 @@ declare global {
         }
     }
 }
-export declare const protect: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+export declare const currentUser: (req: Request, res: Response, next: NextFunction) => void;
 export {};

package/build/middleware/currentUser.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.currentUser = void 0;
+const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const currentUser = (req, res, next) => {
+    var _a;
+    if (!((_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt)) {
+        return next();
+    }
+    try {
+        const payload = jsonwebtoken_1.default.verify(req.session.jwt, process.env.JWT_KEY);
+        req.user = payload;
+    }
+    catch (err) { }
+    next();
+};
+exports.currentUser = currentUser;

package/build/middleware/requireAuth.d.ts

@@ -0,0 +1,2 @@
+import { Request, Response, NextFunction } from 'express';
+export declare const requireAuth: (req: Request, res: Response, next: NextFunction) => void;

package/build/middleware/requireAuth.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requireAuth = void 0;
+const notAuthorized_1 = require("../errors/notAuthorized");
+const requireAuth = (req, res, next) => {
+    if (!req.user) {
+        throw new notAuthorized_1.NotAuthorizedError();
+    }
+    next();
+};
+exports.requireAuth = requireAuth;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecom-micro/common",
-  "version": "2.0.14",
+  "version": "2.0.16",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",

package/build/middleware/protect.js

@@ -1,32 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.protect = void 0;
-const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const badRequestError_1 = require("../errors/badRequestError");
-const protect = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    try {
-        if (!((_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt)) {
-            return next(new badRequestError_1.BadRequestError('You are not login! Please login first'));
-        }
-        const payload = jsonwebtoken_1.default.verify(req.session.jwt, process.env.JWT_KEY);
-        req.user = payload;
-    }
-    catch (err) {
-        res.send({ currentUser: null });
-    }
-    next();
-});
-exports.protect = protect;