@munlib/common 1.0.32 → 1.0.34

package/build/index.d.ts

@@ -4,7 +4,6 @@ export * from './errors/database-connection-error';
 export * from './errors/not-authorized-error';
 export * from './errors/not-found-error';
 export * from './errors/request-validation-error';
-export * from './middlewares/current-user';
 export * from './middlewares/error-handler';
 export * from './middlewares/require-auth';
 export * from './middlewares/validate-request';

package/build/index.js

@@ -21,7 +21,7 @@ __exportStar(require("./errors/database-connection-error"), exports);
 __exportStar(require("./errors/not-authorized-error"), exports);
 __exportStar(require("./errors/not-found-error"), exports);
 __exportStar(require("./errors/request-validation-error"), exports);
-__exportStar(require("./middlewares/current-user"), exports);
+//export * from './middlewares/current-user';
 __exportStar(require("./middlewares/error-handler"), exports);
 __exportStar(require("./middlewares/require-auth"), exports);
 __exportStar(require("./middlewares/validate-request"), exports);

package/build/middlewares/current-user.d.ts

@@ -1,14 +0,0 @@
-import { Request, Response, NextFunction } from 'express';
-interface UserPayload {
-    id: string;
-    email: string;
-}
-declare global {
-    namespace Express {
-        interface Request {
-            user?: UserPayload;
-        }
-    }
-}
-export declare const currentUser: (req: Request, res: Response, next: NextFunction) => void;
-export {};

package/build/middlewares/current-user.js

@@ -1,20 +1,37 @@
 "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;
-var jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-var currentUser = function (req, res, next) {
-    var _a;
-    if (!((_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt)) {
-        return next();
-    }
-    try {
-        var payload = jsonwebtoken_1.default.verify(req.session.jwt, process.env.JWT_KEY);
-        req.user = payload;
+/* import { Request, Response, NextFunction } from 'express';
+import jwt from 'jsonwebtoken';
+
+interface UserPayload {
+  id: string;
+  email: string;
+}
+
+declare global {
+  namespace Express {
+    interface Request {
+      user?: UserPayload;
     }
-    catch (err) { }
-    next();
+  }
+}
+
+export const currentUser = (
+  req: Request,
+  res: Response,
+  next: NextFunction
+) => {
+  if (!req.session?.jwt) {
+    return next();
+  }
+
+  try {
+    const payload = jwt.verify(
+      req.session.jwt,
+      process.env.JWT_KEY!
+    ) as UserPayload;
+    req.user = payload;
+  } catch (err) {}
+
+  next();
 };
-exports.currentUser = currentUser;
+ */ 

package/build/middlewares/require-auth.d.ts

@@ -6,7 +6,7 @@ interface UserPayload {
 declare global {
     namespace Express {
         interface Request {
-            user?: UserPayload;
+            currentUser?: UserPayload;
         }
     }
 }

package/build/middlewares/require-auth.js

@@ -15,7 +15,7 @@ var requireAuth = function (req, res, next) {
     }
     try {
         var payload = jsonwebtoken_1.default.verify(req.session.jwt, process.env.JWT_KEY);
-        req.user = payload;
+        req.currentUser = payload;
     }
     catch (err) {
         throw new not_authorized_error_1.NotAuthorizedError();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@munlib/common",
-    "version": "1.0.32",
+    "version": "1.0.34",
     "description": "",
     "main": "./build/index.js",
     "types": "./build/index.d.ts",