FIX : logout 로직 변경(http logout메서드사용)

Dongnaebangnae · May 4, 2024 · 9df9bab · 9df9bab
1 parent 0d11a48
commit 9df9bab
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/com/nawabali/nawabali/HelloController.java b/src/main/java/com/nawabali/nawabali/HelloController.java
@@ -7,6 +7,6 @@
 public class HelloController {
     @GetMapping("/ping")
     public String check() {
-        return "Pong! 로그아웃핸들러 변경";
+        return "Pong! http 로그아웃url 메서드 사용 변경";
     }
 }
diff --git a/src/main/java/com/nawabali/nawabali/config/WebSecurityConfig.java b/src/main/java/com/nawabali/nawabali/config/WebSecurityConfig.java
@@ -123,8 +123,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
         );
 
         http.logout(logoutconfigurer->logoutconfigurer
-                .logoutUrl("/users/logout")
-                .addLogoutHandler(jwtLogoutHandler));
+                .logoutUrl("/users/logout"));
+//                .addLogoutHandler(jwtLogoutHandler));
 
         // 필터 관리
         http.addFilterBefore(jwtExceptionHandlerFilter(), JwtAuthenticationFilter.class);

diff --git a/src/main/java/com/nawabali/nawabali/controller/UserController.java b/src/main/java/com/nawabali/nawabali/controller/UserController.java
@@ -34,10 +34,10 @@
 public class UserController {
     private final UserService userService;
 
-//    @PostMapping("/logout")
-//    public ResponseEntity<String> logout(HttpServletRequest request, HttpServletResponse response){
-//        return userService.logout(request, response);
-//    }
+    @PostMapping("/logout")
+    public ResponseEntity<String> logout(HttpServletRequest request, HttpServletResponse response){
+        return userService.logout(request, response);
+    }
 
     @PostMapping("/signup")
     @Operation(summary = "회원가입", description = "회원가입에 사용하는 API")

diff --git a/src/main/java/com/nawabali/nawabali/service/UserService.java b/src/main/java/com/nawabali/nawabali/service/UserService.java
@@ -60,10 +60,10 @@ public ResponseEntity<String> logout(HttpServletRequest request, HttpServletResp
         cookie.setDomain("dongnaebangnae.com");
         response.addCookie(cookie);
 
-//        String headerAccessToken = jwtUtil.getJwtFromHeader(request);
-//        String cookieAccessToken = jwtUtil.getTokenFromCookieAndName(request, JwtUtil.AUTHORIZATION_HEADER);
-//        log.info("accessToken : " + headerAccessToken);
-//        log.info("cookieAccessToken : " + cookieAccessToken);
+        String headerAccessToken = jwtUtil.getJwtFromHeader(request);
+        String cookieAccessToken = jwtUtil.getTokenFromCookieAndName(request, JwtUtil.AUTHORIZATION_HEADER);
+        log.info("accessToken : " + headerAccessToken);
+        log.info("cookieAccessToken : " + cookieAccessToken);
 
         return ResponseEntity.ok("로그아웃 성공");