@common_ch/common 1.0.230 → 1.0.231

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

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

package/build/middlewares/current-user.js

@@ -1,4 +1,13 @@
 "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 };
 };
@@ -6,23 +15,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.currentUser = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const redis_service_1 = require("../services/redis/redis.service");
-const currentUser = (req, res, next) => {
+const currentUser = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     const authHeader = req.headers['authorization'];
     if (!authHeader || !authHeader.startsWith('Bearer')) {
         return next();
     }
     try {
         const token = authHeader.split(' ')[1];
-        (0, redis_service_1.getCacheTokenAuth)(token).then((result) => {
-            if (result) {
-                console.log('token blocked.');
-                next();
-            }
-        });
-        const payload = jsonwebtoken_1.default.verify(token, process.env.JWT_KEY);
-        req.currentUser = payload;
+        const isTokenBlocked = yield (0, redis_service_1.getCacheTokenAuth)(token);
+        if (!isTokenBlocked) {
+            const payload = jsonwebtoken_1.default.verify(token, process.env.JWT_KEY);
+            req.currentUser = payload;
+        }
     }
     catch (err) { }
     next();
-};
+});
 exports.currentUser = currentUser;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@common_ch/common",
-  "version": "1.0.230",
+  "version": "1.0.231",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [