@ahhaohho/auth-middleware 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ahhaohho/auth-middleware",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Shared authentication middleware with Passport.js for ahhaohho microservices",
   "main": "src/index.js",
   "scripts": {
@@ -28,11 +28,12 @@
   "author": "ahhaohho",
   "license": "MIT",
   "dependencies": {
-    "passport": "^0.7.0",
-    "passport-jwt": "^4.0.1",
-    "jsonwebtoken": "^9.0.2",
+    "@aws-sdk/client-secrets-manager": "^3.552.0",
     "ioredis": "^5.4.1",
-    "@aws-sdk/client-secrets-manager": "^3.552.0"
+    "jsonwebtoken": "^9.0.2",
+    "passport": "^0.7.0",
+    "passport-custom": "^1.1.1",
+    "passport-jwt": "^4.0.1"
   },
   "peerDependencies": {
     "express": "^4.x"

package/src/middleware/auth.js

@@ -160,6 +160,8 @@ async function authenticateHybrid(req, res, next) {
 
     // 3. Refresh token 검증
     passport.authenticate('refresh', { session: false }, async (refreshErr, refreshUser, refreshInfo) => {
+      console.log('[@ahhaohho/auth-middleware] 🔍 Refresh callback:', { hasError: !!refreshErr, hasUser: !!refreshUser, userId: refreshUser?.userId });
+
       if (refreshErr) {
         console.error('[@ahhaohho/auth-middleware] Refresh token error:', refreshErr.message);
         return res.status(500).json({
@@ -169,6 +171,7 @@ async function authenticateHybrid(req, res, next) {
       }
 
       if (!refreshUser) {
+        console.error('[@ahhaohho/auth-middleware] ❌ No refresh user found, returning 401');
         return res.status(401).json({
           error: 'Unauthorized',
           message: 'Both access and refresh tokens are invalid'

package/src/strategies/refresh.strategy.js

@@ -1,4 +1,4 @@
-const { Strategy: JwtStrategy } = require('passport-jwt');
+const { Strategy: CustomStrategy } = require('passport-custom');
 const { verifyTokenWithFallback } = require('../utils/jwtValidator');
 const { isBlacklisted } = require('../utils/blacklist');
 
@@ -23,48 +23,46 @@ function extractRefreshToken(req) {
 }
 
 /**
- * Passport Refresh Token 전략 생성
+ * Passport Refresh Token 전략 생성 (Custom Strategy 사용)
  */
 function createRefreshStrategy() {
-  const options = {
-    jwtFromRequest: extractRefreshToken,
-    secretOrKeyProvider: async (request, rawJwtToken, done) => {
-      try {
-        // 1. 다중 키로 토큰 검증
-        const { decoded, keyUsed } = await verifyTokenWithFallback(rawJwtToken);
-
-        if (!decoded || !decoded.userId) {
-          return done(new Error('Invalid refresh token payload'), false);
-        }
+  return new CustomStrategy(async (req, done) => {
+    try {
+      // 1. 토큰 추출
+      const token = extractRefreshToken(req);
+      if (!token) {
+        return done(null, false, { message: 'No refresh token provided' });
+      }
 
-        // 2. 블랙리스트 확인 (refresh 타입)
-        const blacklisted = await isBlacklisted(decoded.userId, 'refresh', rawJwtToken);
-        if (blacklisted) {
-          return done(new Error('Refresh token has been revoked'), false);
-        }
+      // 2. 다중 키로 토큰 검증
+      const { decoded, keyUsed } = await verifyTokenWithFallback(token);
 
-        // 3. 검증 성공
-        console.log(
-          `[@ahhaohho/auth-middleware] ✅ Refresh token verified with ${keyUsed} key for user ${decoded.userId}`
-        );
+      if (!decoded || !decoded.userId) {
+        return done(null, false, { message: 'Invalid refresh token payload' });
+      }
 
-        done(null, decoded);
-      } catch (error) {
-        console.error('[@ahhaohho/auth-middleware] ❌ Refresh token verification failed:', error.message);
-        done(error, false);
+      // 3. 블랙리스트 확인 (refresh 타입)
+      const blacklisted = await isBlacklisted(decoded.userId, 'refresh', token);
+      if (blacklisted) {
+        return done(null, false, { message: 'Refresh token has been revoked' });
       }
-    },
-    passReqToCallback: false
-  };
 
-  return new JwtStrategy(options, (jwtPayload, done) => {
-    const user = {
-      userId: jwtPayload.userId,
-      userRole: jwtPayload.userRole,
-      phoneNumber: jwtPayload.phoneNumber
-    };
+      // 4. 검증 성공 - user 객체 반환
+      console.log(
+        `[@ahhaohho/auth-middleware] ✅ Refresh token verified with ${keyUsed} key for user ${decoded.userId}`
+      );
 
-    return done(null, user);
+      const user = {
+        userId: decoded.userId,
+        userRole: decoded.userRole,
+        phoneNumber: decoded.phoneNumber
+      };
+
+      return done(null, user);
+    } catch (error) {
+      console.error('[@ahhaohho/auth-middleware] ❌ Refresh token verification failed:', error.message);
+      return done(error, false);
+    }
   });
 }