From 811a21cbff17b49289977a3c62c70e6462443944 Mon Sep 17 00:00:00 2001
From: seungryeol <opop0421@naver.com>
Date: Sun, 12 Nov 2023 00:02:16 +0900
Subject: [PATCH] =?UTF-8?q?[fix]=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?=
 =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=20=EC=95=88=EA=B0=80=EC=A0=B8?=
 =?UTF-8?q?=EC=98=A4=EA=B8=B0=20=EC=A4=91=EB=B3=B5=20=ED=95=A8=EC=88=98=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../farmususer/user/service/AuthService.java  | 30 ++++---------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/main/java/modernfarmer/server/farmususer/user/service/AuthService.java b/src/main/java/modernfarmer/server/farmususer/user/service/AuthService.java
index 0c2fb09..2b9e006 100644
--- a/src/main/java/modernfarmer/server/farmususer/user/service/AuthService.java
+++ b/src/main/java/modernfarmer/server/farmususer/user/service/AuthService.java
@@ -40,20 +40,15 @@ public BaseResponseDto googleLogin(String accessToken) {
         User user;
         boolean early;
 
-        Mono<GoogleUserResponseDto> userInfoMono = getUserGoogleInfo(accessToken);
+        Mono<GoogleUserResponseDto> userInfoMono = getUserInfo(accessToken, "https://www.googleapis.com/oauth2/v2/userinfo", GoogleUserResponseDto.class);
         GoogleUserResponseDto userInfo = userInfoMono.block();
 
         Optional<User> userData = userRepository.findByUserNumber(String.valueOf(userInfo.getId()));
 
-        log.info(String.valueOf(userInfo.getEmail()));
-        log.info(String.valueOf(userInfo.getPicture()));
-        log.info(String.valueOf(userInfo.getId()));
-
         if(userData.isEmpty()){
             user = User.builder()
                     .userNumber(String.valueOf(userInfo.getId()))
                     .roles("USER")
-                    .profileImage(userInfo.getPicture())
                     .early(true)
                     .build();
 
@@ -86,15 +81,9 @@ public BaseResponseDto kakaoLogin(String accessToken) {
 
         User user;
         boolean early;
-        Mono<KakaoUserResponseDto> userInfoMono = getUserKakaoInfo(accessToken);
+        Mono<KakaoUserResponseDto> userInfoMono = getUserInfo(accessToken, "https://kapi.kakao.com/v2/user/me", KakaoUserResponseDto.class);
         KakaoUserResponseDto userInfo = userInfoMono.block();
 
-
-        log.info(String.valueOf(userInfo.getKakao_account().getEmail()));
-        log.info(String.valueOf(userInfo.getKakao_account().getProfile().getProfile_image_url()));
-        log.info(String.valueOf(userInfo.getKakao_account().getProfile().getNickname()));
-
-
         Optional<User> userData = userRepository.findByUserNumber(String.valueOf(userInfo.getId()));
 
 
@@ -102,7 +91,6 @@ public BaseResponseDto kakaoLogin(String accessToken) {
             user = User.builder()
                     .userNumber(String.valueOf(userInfo.getId()))
                     .roles("USER")
-                    .profileImage(userInfo.getKakao_account().getProfile().getProfile_image_url())
                     .early(true)
                     .build();
 
@@ -131,21 +119,13 @@ public BaseResponseDto kakaoLogin(String accessToken) {
         return baseResponseDto;
     }
 
-    public Mono<KakaoUserResponseDto> getUserKakaoInfo(String accessToken) {
+    public <T> Mono<T> getUserInfo(String accessToken, String apiUrl, Class<T> responseType) {
         return webClient
                 .get()
-                .uri("https://kapi.kakao.com/v2/user/me") // 카카오 사용자 정보 엔드포인트
+                .uri(apiUrl)
                 .headers(headers -> headers.setBearerAuth(accessToken))
                 .retrieve()
-                .bodyToMono(KakaoUserResponseDto.class);
+                .bodyToMono(responseType);
     }
 
-    public Mono<GoogleUserResponseDto> getUserGoogleInfo(String accessToken) {
-        return webClient
-                .get()
-                .uri("https://www.googleapis.com/oauth2/v2/userinfo") // 카카오 사용자 정보 엔드포인트
-                .headers(headers -> headers.setBearerAuth(accessToken))
-                .retrieve()
-                .bodyToMono(GoogleUserResponseDto.class);
-    }
 }
\ No newline at end of file