@ahhaohho/auth-middleware 2.3.0 → 2.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ahhaohho/auth-middleware",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "Shared authentication and authorization middleware for ahhaohho microservices",
   "main": "src/index.js",
   "scripts": {

package/src/middleware/auth.js

@@ -35,15 +35,7 @@ function authenticateJWT(req, res, next) {
   initializePassport();
 
   passport.authenticate('jwt', { session: false }, (err, user, info) => {
-    if (err) {
-      console.error('[@ahhaohho/auth-middleware] Authentication error:', err.message);
-      return res.status(500).json({
-        error: 'Authentication error',
-        message: err.message
-      });
-    }
-
-    if (!user) {
+    if (err || !user) {
       return res.status(401).json({
         error: 'Unauthorized',
         message: info?.message || 'Invalid or expired token'
@@ -74,15 +66,7 @@ function authenticateRefresh(req, res, next) {
   initializePassport();
 
   passport.authenticate('refresh', { session: false }, (err, user, info) => {
-    if (err) {
-      console.error('[@ahhaohho/auth-middleware] Refresh token error:', err.message);
-      return res.status(500).json({
-        error: 'Token refresh error',
-        message: err.message
-      });
-    }
-
-    if (!user) {
+    if (err || !user) {
       return res.status(401).json({
         error: 'Invalid refresh token',
         message: info?.message || 'Invalid or expired refresh token'
@@ -148,15 +132,12 @@ async function authenticateHybrid(req, res, next) {
   // 1. Access token 검증 시도
   passport.authenticate('jwt', { session: false }, async (err, user, info) => {
     if (err) {
-      console.error('[@ahhaohho/auth-middleware] Hybrid auth error:', err.message);
-      return res.status(500).json({
-        error: 'Authentication error',
-        message: err.message
-      });
+      // Access token 검증 에러는 refresh token 시도로 넘어감
+      console.log('[@ahhaohho/auth-middleware] Access token error, trying refresh token...');
     }
 
     // Access token이 유효한 경우
-    if (user) {
+    if (!err && user) {
       req.user = user;
 
       // 하위 호환성: req.userId, req.userRole 설정
@@ -179,16 +160,7 @@ async function authenticateHybrid(req, res, next) {
 
     // 3. Refresh token 검증
     passport.authenticate('refresh', { session: false }, async (refreshErr, refreshUser, refreshInfo) => {
-      if (refreshErr) {
-        console.error('[@ahhaohho/auth-middleware] Refresh token error:', refreshErr.message);
-        return res.status(500).json({
-          error: 'Token refresh error',
-          message: refreshErr.message
-        });
-      }
-
-      if (!refreshUser) {
-        console.error('[@ahhaohho/auth-middleware] ❌ No refresh user found, returning 401');
+      if (refreshErr || !refreshUser) {
         return res.status(401).json({
           error: 'Unauthorized',
           message: 'Both access and refresh tokens are invalid'
@@ -224,7 +196,7 @@ async function authenticateHybrid(req, res, next) {
         console.error('[@ahhaohho/auth-middleware] Failed to generate new token:', tokenError.message);
         return res.status(500).json({
           error: 'Token generation error',
-          message: tokenError.message
+          message: 'Failed to generate new access token'
         });
       }
     })(req, res, next);