Merge pull request #109 from M7-TAVE/feat/105-logout

feat: 로그아웃 api 수정 추가 #105

Author: seoyeon83

src/main/java/com/example/travelbag/domain/member/controller/api/auth/status/AuthController.java

@@ -1,12 +1,23 @@
 package com.example.travelbag.domain.member.controller.api.auth.status;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestTemplate;
-
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import java.util.Map;
+
+
 @RestController
 @RequestMapping("/api/auth")
 public class AuthController {
@@ -52,30 +63,77 @@ public ResponseEntity<Map<String, Object>> getAuthStatus(Authentication authenti
         }
     }
 
-    // 새로운 로그아웃 API
+    @GetMapping("/token")
+    public ResponseEntity<Map<String, String>> getAccessToken(Authentication authentication,
+                                                              @Autowired OAuth2AuthorizedClientService authorizedClientService) {
+        if (authentication == null) {
+            return ResponseEntity.status(401).body(Map.of("error", "User not authenticated"));
+        }
+
+        OAuth2AuthenticationToken oauthToken = (OAuth2AuthenticationToken) authentication;
+        String clientRegistrationId = oauthToken.getAuthorizedClientRegistrationId();
+
+        OAuth2AuthorizedClient authorizedClient =
+                authorizedClientService.loadAuthorizedClient(clientRegistrationId, oauthToken.getName());
+
+        if (authorizedClient == null || authorizedClient.getAccessToken() == null) {
+            return ResponseEntity.status(500).body(Map.of("error", "Access token not available"));
+        }
+
+        String kakaoAccessToken = authorizedClient.getAccessToken().getTokenValue();
+        return ResponseEntity.ok(Map.of("accessToken", kakaoAccessToken));
+    }
+
     @PostMapping("/logout")
-    public ResponseEntity<Map<String, Object>> logout(@RequestHeader("Authorization") String accessToken) {
+    public ResponseEntity<Map<String, Object>> logout(@RequestHeader("Authorization") String authorizationHeader) {
+        if (authorizationHeader == null || !authorizationHeader.startsWith("Bearer ")) {
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(Map.of(
+                    "error", "Authorization header is missing or invalid"
+            ));
+        }
+
+        // Bearer 접두어 제거 후 Access Token 추출
+        String accessToken = authorizationHeader.replace("Bearer ", "").trim();
         String kakaoLogoutUrl = "https://kapi.kakao.com/v1/user/logout";
 
         try {
             // 카카오 로그아웃 API 호출
             RestTemplate restTemplate = new RestTemplate();
             var headers = new org.springframework.http.HttpHeaders();
             headers.set("Authorization", "Bearer " + accessToken);
+
             var request = new org.springframework.http.HttpEntity<>(headers);
+            var response = restTemplate.postForEntity(kakaoLogoutUrl, request, String.class);
 
-            restTemplate.postForEntity(kakaoLogoutUrl, request, String.class);
+            // 로그아웃 성공 여부 확인
+            if (response.getStatusCode().is2xxSuccessful()) {
+                // Spring Security 세션 초기화
+                SecurityContextHolder.clearContext();
+                System.out.println("Kakao logout successful. Token: " + accessToken);
 
-            // 로그아웃 성공 응답
-            return ResponseEntity.ok(Map.of(
-                    "message", "Successfully logged out"
+                return ResponseEntity.ok(Map.of(
+                        "message", "Successfully logged out"
+                ));
+            } else {
+                System.out.println("Kakao logout failed with status: " + response.getStatusCode());
+                return ResponseEntity.status(response.getStatusCode()).body(Map.of(
+                        "error", "Kakao logout failed"
+                ));
+            }
+        } catch (HttpStatusCodeException ex) {
+            // 카카오 API에서 반환된 HTTP 상태 코드와 응답 메시지 처리
+            System.out.println("Error during Kakao logout. Status: " + ex.getStatusCode() + ", Response: " + ex.getResponseBodyAsString());
+            return ResponseEntity.status(ex.getStatusCode()).body(Map.of(
+                    "error", ex.getResponseBodyAsString()
             ));
         } catch (Exception e) {
-            System.out.println("Error in /api/auth/logout: " + e.getMessage());
+            // 일반 예외 처리
+            System.out.println("Unexpected error during Kakao logout: " + e.getMessage());
             e.printStackTrace();
-            return ResponseEntity.status(500).body(Map.of(
-                    "error", e.getMessage()
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(Map.of(
+                    "error", "Unexpected error occurred"
             ));
         }
     }
+
 }

src/main/java/com/example/travelbag/domain/member/service/CustomOAuth2UserService.java

@@ -23,6 +23,9 @@ public class CustomOAuth2UserService extends DefaultOAuth2UserService {
     public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException {
         OAuth2User oAuth2User = super.loadUser(userRequest);
 
+        String accessToken = userRequest.getAccessToken().getTokenValue();
+        System.out.println("Access Token !?!?!?: " + accessToken); // 디버깅용 로그
+
         System.out.println("OAuth2User attributes: " + oAuth2User.getAttributes());  // 디버깅용 로그
 
         Map<String, Object> attributes = oAuth2User.getAttributes();