@jpbs/common 1.2.0 → 1.2.2

package/build/middlewares/authProtect.d.ts

@@ -12,5 +12,5 @@ interface IDecodedUser {
     username: string;
     role: Role;
 }
-export declare const authenticationGuard: (jwtSecret: string) => (req: AuthenticatedRequest, res: Response, next: NextFunction) => Promise<Response<any, Record<string, any>> | undefined>;
+export declare const authenticationGuard: (jwtSecret: string) => (req: AuthenticatedRequest, res: Response, next: NextFunction) => Promise<void>;
 export {};

package/build/middlewares/authProtect.js

@@ -25,11 +25,13 @@ const authenticationGuard = (jwtSecret) => (req, res, next) => __awaiter(void 0,
     try {
         const token = req.cookies.auth_token;
         if (!token) {
-            return res.status(http_status_codes_1.StatusCodes.UNAUTHORIZED).json({ error: "Unauthorized" });
+            res.status(http_status_codes_1.StatusCodes.UNAUTHORIZED).json({ error: "Unauthorized" });
+            return;
         }
         const isRevoked = yield (0, redisClient_1.isTokenRevoked)(token);
         if (isRevoked) {
-            return res.status(http_status_codes_1.StatusCodes.UNAUTHORIZED).json({ error: "Token has been revoked" });
+            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;

package/build/redisClient.js

@@ -35,7 +35,7 @@ const getTokenTTL = (token) => {
     try {
         const decoded = jsonwebtoken_1.default.decode(token);
         if (!decoded || typeof decoded !== 'object' || !decoded.exp) {
-            return 3600;
+            return 0;
         }
         const now = Math.floor(Date.now() / 1000);
         const ttl = decoded.exp - now;
@@ -48,10 +48,15 @@ const getTokenTTL = (token) => {
 };
 const revokeToken = (token) => __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:${token}`, 'revoked', { EX: ttl });
-            console.log(`🚫 Token revoked: ${token}`);
+            yield redisClient.set(`revokedToken:${decoded.id}:${token}`, 'revoked', { EX: ttl });
+            console.log(`🚫 Token revoked for user ${decoded.id}: ${token}`);
         }
         else {
             console.log('⚠️ Token already expired, no need to revoke.');
@@ -64,7 +69,12 @@ 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* () {
     try {
-        const result = yield redisClient.get(`revokedToken:${token}`);
+        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}`);
         return result !== null;
     }
     catch (error) {

package/package.json

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