diff --git a/prd/src/main/java/site/ocr/prd/dto/UserInfoInqyReqDTO.java b/prd/src/main/java/site/ocr/prd/dto/UserInfoInqyReqDTO.java index a7f7711..6b8a194 100644 --- a/prd/src/main/java/site/ocr/prd/dto/UserInfoInqyReqDTO.java +++ b/prd/src/main/java/site/ocr/prd/dto/UserInfoInqyReqDTO.java @@ -11,7 +11,13 @@ import lombok.ToString; @Setter public class UserInfoInqyReqDTO { - @JsonProperty("access_token") - String access_token; + class Request { + @JsonProperty("access_token") + String access_token; + } + + class Properties { + + } } diff --git a/prd/src/main/java/site/ocr/prd/dto/UserInfoInqyResDTO.java b/prd/src/main/java/site/ocr/prd/dto/UserInfoInqyResDTO.java index cd9c8a5..bc58d65 100644 --- a/prd/src/main/java/site/ocr/prd/dto/UserInfoInqyResDTO.java +++ b/prd/src/main/java/site/ocr/prd/dto/UserInfoInqyResDTO.java @@ -6,19 +6,32 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; +@ToString @Getter @Setter public class UserInfoInqyResDTO { - class Request { + class Response { @JsonProperty("id") String id; @JsonProperty("properties") + KakaoAccount account; + } - class Properties { - + class KakaoAccount { + PropertiesKeys keys; + + } + + class PropertiesKeys { + String profile; + String name; + String email; + String age_range; + String birthday; + String gender; } } \ No newline at end of file diff --git a/prd/src/main/java/site/ocr/prd/services/LoginService.java b/prd/src/main/java/site/ocr/prd/services/LoginService.java index 32d9cf8..45e3394 100644 --- a/prd/src/main/java/site/ocr/prd/services/LoginService.java +++ b/prd/src/main/java/site/ocr/prd/services/LoginService.java @@ -6,8 +6,8 @@ import org.springframework.web.reactive.function.BodyInserters; import org.springframework.web.reactive.function.client.WebClient; import org.springframework.http.HttpHeaders; -import site.ocr.prd.dto.LoginRequestDto; -import site.ocr.prd.dto.LoginResponseDto; +import site.ocr.prd.dto.LoginReqDTO; +import site.ocr.prd.dto.LoginResDTO; @Service public class LoginService { @@ -18,10 +18,10 @@ public class LoginService { this.webClient = builder.build(); } - public LoginResponseDto getToken(LoginRequestDto request) { + public LoginResDTO getToken(LoginReqDTO request) { System.out.println("kakao auth code = {}" + request.getCode()); - LoginResponseDto result = webClient.post() + LoginResDTO result = webClient.post() .uri("https://kauth.kakao.com/oauth/token") .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE + ";charset=utf-8") .body(BodyInserters.fromFormData("grant_type", "authorization_code") @@ -29,7 +29,7 @@ public class LoginService { .with("redirect_uri", "http://localhost:9001/oauth/oauth-kakao-authorize") .with("code", request.getCode())) .retrieve() - .bodyToMono(LoginResponseDto.class) + .bodyToMono(LoginResDTO.class) .block(); return result; }