@jpbs/common 1.2.2 → 1.2.4

package/build/middlewares/authProtect.js

@@ -28,12 +28,12 @@ const authenticationGuard = (jwtSecret) => (req, res, next) => __awaiter(void 0,
             res.status(http_status_codes_1.StatusCodes.UNAUTHORIZED).json({ error: "Unauthorized" });
             return;
         }
-        const isRevoked = yield (0, redisClient_1.isTokenRevoked)(token);
+        const decoded = jsonwebtoken_1.default.verify(token, jwtSecret);
+        const isRevoked = yield (0, redisClient_1.isTokenRevoked)(token, decoded.id);
         if (isRevoked) {
             res.status(http_status_codes_1.StatusCodes.UNAUTHORIZED).json({ error: "Token has been revoked" });
             return;
         }
-        const decoded = jsonwebtoken_1.default.verify(token, jwtSecret);
         req.currentUser = decoded;
         next();
     }

package/build/redisClient.d.ts

@@ -289,6 +289,6 @@ declare const redisClient: import("@redis/client").RedisClientType<{
     };
 } & import("redis").RedisModules, import("redis").RedisFunctions, import("redis").RedisScripts>;
 declare const initializeRedis: () => Promise<void>;
-declare const revokeToken: (token: string) => Promise<void>;
-declare const isTokenRevoked: (token: string) => Promise<boolean>;
+declare const revokeToken: (token: string, userId: string) => Promise<void>;
+declare const isTokenRevoked: (token: string, userId: string) => Promise<boolean>;
 export { redisClient, initializeRedis, revokeToken, isTokenRevoked };

package/build/redisClient.js

@@ -46,17 +46,12 @@ const getTokenTTL = (token) => {
         return 0;
     }
 };
-const revokeToken = (token) => __awaiter(void 0, void 0, void 0, function* () {
+const revokeToken = (token, userId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const decoded = jsonwebtoken_1.default.decode(token);
-        if (!decoded || !decoded.id) {
-            console.error('❌ Token does not contain user id');
-            return;
-        }
         const ttl = getTokenTTL(token);
         if (ttl > 0) {
-            yield redisClient.set(`revokedToken:${decoded.id}:${token}`, 'revoked', { EX: ttl });
-            console.log(`🚫 Token revoked for user ${decoded.id}: ${token}`);
+            yield redisClient.set(`revokedToken:${userId}:${token}`, 'revoked', { EX: ttl });
+            console.log(`🚫 Token revoked for user ${userId}: ${token}`);
         }
         else {
             console.log('⚠️ Token already expired, no need to revoke.');
@@ -67,14 +62,9 @@ const revokeToken = (token) => __awaiter(void 0, void 0, void 0, function* () {
     }
 });
 exports.revokeToken = revokeToken;
-const isTokenRevoked = (token) => __awaiter(void 0, void 0, void 0, function* () {
+const isTokenRevoked = (token, userId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const decoded = jsonwebtoken_1.default.decode(token);
-        if (!decoded || !decoded.id) {
-            console.error('❌ Token does not contain user id');
-            return false;
-        }
-        const result = yield redisClient.get(`revokedToken:${decoded.id}:${token}`);
+        const result = yield redisClient.get(`revokedToken:${userId}:${token}`);
         return result !== null;
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jpbs/common",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [