Merge pull request #143 from fourix4/dev

Dev
fourix4 · Jul 25, 2024 · 4e2d2fa · 4e2d2fa
2 parents b44c21b + a4ad2ae
commit 4e2d2fa
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/src/main/java/com/example/CatchStudy/global/jwt/JwtAuthenticationFilter.java b/src/main/java/com/example/CatchStudy/global/jwt/JwtAuthenticationFilter.java
@@ -52,15 +52,10 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
             SecurityContextHolder.getContext().setAuthentication(authentication); // 검증 후 security context 인증 정보 저장
         } catch (ExpiredJwtException e) {   // 만료 에러 발생
             // refreshToken 존재시
-            if(jwtUtil.validateRefreshToken(accessToken)) {
-                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-                response.setContentType("application/json");
-                response.setCharacterEncoding("UTF-8");
-
-                Response<Void> errorResponse = Response.error("401", ErrorCode.EXPIRED_ACCESS_TOKEN.getMessage());
-                ObjectMapper objectMapper = new ObjectMapper();
-                String jsonResponse = objectMapper.writeValueAsString(errorResponse);
-                response.getWriter().write(jsonResponse);
+            if (jwtUtil.validateRefreshToken(accessToken)) {
+                sendErrorResponse(response, "401", ErrorCode.EXPIRED_ACCESS_TOKEN.getMessage());
+            } else {
+                sendErrorResponse(response, "403", ErrorCode.EXPIRED_LOGIN_ERROR.getMessage());
             }
 
             return;
@@ -78,4 +73,16 @@ private String resolveToken(HttpServletRequest request) {
 
         return null;
     }
+
+     private static void sendErrorResponse(HttpServletResponse response, String statusCode, String message) throws IOException {
+        response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+        response.setContentType("application/json");
+        response.setCharacterEncoding("UTF-8");
+
+        Response<Void> errorResponse = Response.error(statusCode, message);
+        ObjectMapper objectMapper = new ObjectMapper();
+        String jsonResponse = objectMapper.writeValueAsString(errorResponse);
+        response.getWriter().write(jsonResponse);
+    }
+
 }