@ahhaohho/auth-middleware 1.0.5 → 1.0.7

package/README.md

@@ -1,4 +1,4 @@
-# @ahhaohho/auth-middleware
+ㅈ# @ahhaohho/auth-middleware
 
 Shared authentication middleware with Passport.js for ahhaohho microservices.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ahhaohho/auth-middleware",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Shared authentication middleware with Passport.js for ahhaohho microservices",
   "main": "src/index.js",
   "scripts": {

package/src/strategies/jwt.strategy.js

@@ -1,15 +1,44 @@
-const { Strategy: JwtStrategy, ExtractJwt } = require('passport-jwt');
+const { Strategy: JwtStrategy } = require('passport-jwt');
 const { getJwtKeys } = require('../utils/secretManager');
 const { isBlacklisted } = require('../utils/blacklist');
 const jwt = require('jsonwebtoken');
 
+/**
+ * Bearer 접두사가 있든 없든 토큰을 추출하는 커스텀 함수
+ */
+const extractJwtFromHeader = (req) => {
+  const authHeader = req.headers.authorization || req.headers.Authorization;
+
+  if (!authHeader) {
+    return null;
+  }
+
+  // Bearer 접두사가 있는 경우
+  if (authHeader.startsWith('Bearer ')) {
+    return authHeader.substring(7);
+  }
+
+  // bearer (소문자)인 경우
+  if (authHeader.startsWith('bearer ')) {
+    return authHeader.substring(7);
+  }
+
+  // Bearer 접두사 없이 토큰만 있는 경우
+  // JWT 형식인지 확인 (xxx.yyy.zzz 형태)
+  if (authHeader.split('.').length === 3) {
+    return authHeader;
+  }
+
+  return null;
+};
+
 /**
  * Passport JWT 전략 생성
  * Access Token 검증용
  */
 function createJwtStrategy() {
   const options = {
-    jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
+    jwtFromRequest: extractJwtFromHeader,
     // 다중 키 지원을 위한 secretOrKeyProvider 사용
     secretOrKeyProvider: async (request, rawJwtToken, done) => {
       try {
@@ -36,9 +65,23 @@ function createJwtStrategy() {
                 '[@ahhaohho/auth-middleware] ⚠️ Token verified with previous key (fallback)'
               );
             } catch (previousKeyError) {
+              // 🚨 임시: invalid signature도 허용 (다음 앱 배포 전까지)
+              if (currentKeyError.message.includes('invalid signature') || currentKeyError.message.includes('jwt malformed')) {
+                console.warn('[@ahhaohho/auth-middleware] ⚠️ [TEMPORARY] Allowing invalid signature');
+                request._jwtDecoded = { userId: 'unknown', userRole: 'guest' };
+                request._jwtKeyUsed = 'bypassed';
+                return done(null, keys.current);
+              }
               return done(currentKeyError, false);
             }
           } else {
+            // 🚨 임시: invalid signature도 허용 (다음 앱 배포 전까지)
+            if (currentKeyError.message.includes('invalid signature') || currentKeyError.message.includes('jwt malformed')) {
+              console.warn('[@ahhaohho/auth-middleware] ⚠️ [TEMPORARY] Allowing invalid signature');
+              request._jwtDecoded = { userId: 'unknown', userRole: 'guest' };
+              request._jwtKeyUsed = 'bypassed';
+              return done(null, keys.current);
+            }
             return done(currentKeyError, false);
           }
         }
@@ -68,7 +111,7 @@ function createJwtStrategy() {
       }
 
       // 블랙리스트 확인
-      const token = ExtractJwt.fromAuthHeaderAsBearerToken()(request);
+      const token = extractJwtFromHeader(request);
       const blacklisted = await isBlacklisted(decoded.userId, 'access', token);
       if (blacklisted) {
         return done(new Error('Token has been revoked'), false);
@@ -79,10 +122,15 @@ function createJwtStrategy() {
       );
 
       // req.user에 주입할 사용자 정보 반환
+      // FLC 토큰 지원: email, name, loginMethod 추가
       const user = {
         userId: decoded.userId,
         userRole: decoded.userRole,
-        phoneNumber: decoded.phoneNumber
+        phoneNumber: decoded.phoneNumber,
+        email: decoded.email,
+        name: decoded.name,
+        loginMethod: decoded.loginMethod,
+        imwebId: decoded.imwebId
       };
 
       return done(null, user);

package/src/strategies/refresh.strategy.js

@@ -4,19 +4,24 @@ const { isBlacklisted } = require('../utils/blacklist');
 
 /**
  * Refresh Token 헤더에서 토큰 추출
+ * Bearer 접두사가 있든 없든 처리
  */
 function extractRefreshToken(req) {
   let token = null;
 
-  if (req && req.headers && req.headers['refresh-token']) {
-    let refreshToken = req.headers['refresh-token'];
+  if (req && req.headers) {
+    let refreshToken = req.headers['refresh-token'] || req.headers['refreshtoken'];
 
-    // Bearer 접두사 제거
-    if (refreshToken.startsWith('Bearer ')) {
-      refreshToken = refreshToken.substring(7);
-    }
+    if (refreshToken) {
+      // Bearer 접두사 제거 (대소문자 구분 없이)
+      if (refreshToken.startsWith('Bearer ')) {
+        refreshToken = refreshToken.substring(7);
+      } else if (refreshToken.startsWith('bearer ')) {
+        refreshToken = refreshToken.substring(7);
+      }
 
-    token = refreshToken.trim();
+      token = refreshToken.trim();
+    }
   }
 
   return token;