fix: Modify logout error (#10)

src/main/java/com/beotkkot/qtudy/controller/auth/AuthController.java

@@ -1,17 +1,14 @@
 package com.beotkkot.qtudy.controller.auth;
 
 import com.beotkkot.qtudy.domain.user.Users;
-import com.beotkkot.qtudy.dto.auth.KakaoUserInfo;
-import com.beotkkot.qtudy.dto.auth.UserResponse;
+import com.beotkkot.qtudy.dto.object.KakaoUserInfo;
+import com.beotkkot.qtudy.dto.response.auth.AuthResponseDto;
+import com.beotkkot.qtudy.dto.response.auth.GetAuthResponseDto;
 import com.beotkkot.qtudy.service.auth.AuthService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @RestController
 @RequestMapping("/auth/kakao")
 @RequiredArgsConstructor
@@ -21,48 +18,39 @@ public class AuthController {
 
  // 프론트로부터 인가 code를 받아와 카카오 서버로부터 토큰 얻기
  @GetMapping("")
- public ResponseEntity<Object> kakaoLogin(@RequestParam("code") String code) {
+ public ResponseEntity<? super GetAuthResponseDto> kakaoLogin(@RequestParam("code") String code) {
 
  System.out.println("code = " + code);
 
  // 1. 인가 코드를 통해 카카오 서버로부터 토큰을 얻는다
  String accessToken = authService.getAccessToken(code);
+ if (accessToken.equals("")) {
+ return GetAuthResponseDto.noAuthentication();
+ }
 
  // 2. 발급받은 토큰을 이용해 사용자 정보를 조회
  KakaoUserInfo kakaoUserInfo = authService.getKakaoUserInfo(accessToken);
-
- // 3. 로그인
- Users user = authService.login(kakaoUserInfo);
-
- // 4. 유저 정보 리턴
- UserResponse userResponse = new UserResponse(
- "SU",
- "Sucess",
- user.getUserId(),
- user.getKakaoId(),
- user.getName(),
- user.getProfileImageUrl(),
- accessToken
- );
- return ResponseEntity.status(HttpStatus.OK).body(userResponse);
+ if (kakaoUserInfo == null) {
+ return GetAuthResponseDto.noExistUser();
+
+ } else {
+ // 3. 로그인
+ Users user = authService.login(kakaoUserInfo);
+ // 4. 유저 정보 리턴
+ return GetAuthResponseDto.success(user, accessToken);
+ }
  }
 
  @PostMapping("/logout")
- public ResponseEntity<Map<String,String>> logout(@RequestHeader("Authorization") String header) {
-
- System.out.println("header = " + header);
+ public ResponseEntity<? super AuthResponseDto> logout(@RequestHeader("Authorization") String accessToken) {
 
- String[] authHeader = header.split(" ");
  // 헤더에서 토큰 추출
- String accessToken = authHeader[1];
+ System.out.println("accessToken = " + accessToken);
 
  // 토큰을 사용해 로그아웃 처리
- authService.logout(accessToken);
+ ResponseEntity<? super AuthResponseDto> response = authService.logout(accessToken);
 
- // 로그아웃 성공 메시지 반환
- Map<String, String> response = new HashMap<>();
- response.put("code", "SU");
- response.put("message", "Success");
- return ResponseEntity.ok(response);
+ // 로그아웃 응답 반환
+ return response;
  }
 }

src/main/java/com/beotkkot/qtudy/service/auth/AuthService.java

@@ -1,22 +1,28 @@
 package com.beotkkot.qtudy.service.auth;
 
 import com.beotkkot.qtudy.domain.user.Users;
-import com.beotkkot.qtudy.dto.auth.KakaoUserInfo;
+import com.beotkkot.qtudy.dto.object.KakaoUserInfo;
+import com.beotkkot.qtudy.dto.response.ResponseDto;
+import com.beotkkot.qtudy.dto.response.auth.AuthResponseDto;
 import com.beotkkot.qtudy.service.user.UserService;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpServerErrorException;
 import org.springframework.web.client.RestTemplate;
 
 @Service
+@Slf4j
 @RequiredArgsConstructor
 public class AuthService {
 
@@ -28,6 +34,8 @@ public String getAccessToken(String code) {
  String accessToken = "";
  String requestURL = "https://kauth.kakao.com/oauth/token";
 
+ ResponseEntity<String> response;
+
  RestTemplate rt = new RestTemplate();
 
  // HttpHeader
@@ -44,14 +52,19 @@ public String getAccessToken(String code) {
  // header, body를 가진 엔티티
  HttpEntity<MultiValueMap<String, String>> tokenRequest = new HttpEntity<>(params, headers);
 
- ResponseEntity<String> response = rt.exchange(requestURL, HttpMethod.POST, tokenRequest, String.class);
+ try {
+ response = rt.exchange(requestURL, HttpMethod.POST, tokenRequest, String.class);
+ String responseBody = response.getBody();
+ System.out.println("responseBody = " + responseBody);
 
- String responseBody = response.getBody();
- System.out.println("responseBody = " + responseBody);
+ JsonParser parser = new JsonParser();
+ JsonElement element = parser.parse(responseBody);
+ accessToken = element.getAsJsonObject().get("access_token").getAsString();
 
- JsonParser parser = new JsonParser();
- JsonElement element = parser.parse(responseBody);
- accessToken = element.getAsJsonObject().get("access_token").getAsString();
+ } catch (Exception exception) {
+ log.info("error message: " + exception.getMessage());
+ return accessToken;
+ }
 
  return accessToken;
  }
@@ -60,6 +73,7 @@ public String getAccessToken(String code) {
  public KakaoUserInfo getKakaoUserInfo(String accessToken) {
 
  String requestURL = "https://kapi.kakao.com/v2/user/me";
+ ResponseEntity<String> response;
 
  RestTemplate rt = new RestTemplate();
 
@@ -70,23 +84,29 @@ public KakaoUserInfo getKakaoUserInfo(String accessToken) {
 
  // header를 가진 엔티티
  HttpEntity<MultiValueMap<String, String>> kakaoUserInfoRequest = new HttpEntity<>(headers);
- ResponseEntity<String> response = rt.exchange(requestURL, HttpMethod.POST, kakaoUserInfoRequest, String.class);
+ try {
+ response = rt.exchange(requestURL, HttpMethod.POST, kakaoUserInfoRequest, String.class);
 
- String responseBody = response.getBody();
- System.out.println("responseBody = " + responseBody);
+  String responseBody = response.getBody();
+  System.out.println("responseBody = " + responseBody);
 
- JsonParser parser = new JsonParser();
- JsonElement element = parser.parse(responseBody);
+  JsonParser parser = new JsonParser();
+  JsonElement element = parser.parse(responseBody);
 
- // 유저 정보 추출
- Long id = element.getAsJsonObject().get("id").getAsLong();
- JsonObject properties = element.getAsJsonObject().get("properties").getAsJsonObject();
- System.out.println("properties = " + properties);
- String name = properties.getAsJsonObject().get("nickname").getAsString();
- String profileImageUrl = properties.getAsJsonObject().get("profile_image").getAsString();
+  // 유저 정보 추출
+  Long id = element.getAsJsonObject().get("id").getAsLong();
+  JsonObject properties = element.getAsJsonObject().get("properties").getAsJsonObject();
+  System.out.println("properties = " + properties);
+  String name = properties.getAsJsonObject().get("nickname").getAsString();
+  String profileImageUrl = properties.getAsJsonObject().get("profile_image").getAsString();
 
- // 카카오 유저 정보 생성해서 리턴
- return new KakaoUserInfo(id, name, profileImageUrl, accessToken);
+ // 카카오 유저 정보 생성해서 리턴
+ return new KakaoUserInfo(id, name, profileImageUrl, accessToken);
+
+ } catch (Exception exception) {
+ log.info("error message: " + exception.getMessage());
+ return null;
+ }
  }
 
  // 3. 사용자 정보를 DB에서 조회하고, 가입되지 않은 사용자라면 DB에 저장 후 해당 사용자 반환
@@ -105,9 +125,11 @@ public Users login(KakaoUserInfo kakaoUserInfo) {
  return findUser;
  }
 
- public void logout(String accessToken) {
+ public ResponseEntity<? super AuthResponseDto> logout(String accessToken) {
  String requestURL = "https://kapi.kakao.com/v1/user/logout";
 
+ ResponseEntity<String> response;
+
  RestTemplate rt = new RestTemplate();
 
  // HttpHeader
@@ -116,9 +138,22 @@ public void logout(String accessToken) {
 
  // header를 가진 엔티티
  HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(headers);
- ResponseEntity<String> response = rt.exchange(requestURL, HttpMethod.POST, request, String.class);
-
- String responseBody = response.getBody();
 
+ try {
+ response = rt.exchange(requestURL, HttpMethod.POST, request, String.class);
+ System.out.println(response.getBody());
+ } catch (HttpClientErrorException exception) {
+ // 4xx 에러 (클라이언트 오류) 처리
+ log.info("error message: " + exception.getMessage());
+ return AuthResponseDto.noAuthentication();
+ } catch (HttpServerErrorException exception) {
+ // 5xx 에러 (서버 오류) 처리
+ log.info("error message: " + exception.getMessage());
+ return ResponseDto.databaseError();
+ } catch (Exception exception) {
+ // 그 외 예외 처리
+ log.info("error message: " + exception.getMessage());
+ }
+ return AuthResponseDto.success();
  }
 }