Fix(OAuth): fix google login

src/main/java/com/mapu/domain/user/domain/User.java

@@ -20,7 +20,7 @@ public class User extends BaseEntity {
 
     @Email(message = "이메일 형식이 올바르지 않습니다.")
     @NotNull(message = "이메일은 필수입니다.")
-    @Column(nullable = false, unique = true, length = 20)
+    @Column(nullable = false, unique = true, length = 50)
     private String email;
 
     @NotNull(message = "역할은 필수입니다.")

src/main/java/com/mapu/infra/oauth/application/OAuthService.java

@@ -79,31 +79,18 @@ private OAuthUserInfo getUserInfoFromOAuth(String socialLoginType, String code)
 
         switch (socialLoginType) {
             case "GOOGLE": {
-                try {
-                    userInfo = getGoogleUserInfo(code);
-                    //TODO: null일 때 예외 처리
-                } catch (Exception e) {
-                    throw new OAuthException(OAuthExceptionErrorCode.GOOGLE_LOGIN_FAIL);
-                }finally {
-                    break;
-                }
+                userInfo = getGoogleUserInfo(code);
+                log.info("google user info: {}", userInfo.getEmail());
+                break;
             }
             case "KAKAO": {
-                try {
-                    userInfo = getKakaoUserInfo(code);
-                    //TODO: null일 때 예외 처리
-                } catch (Exception e) {
-                    throw new OAuthException(OAuthExceptionErrorCode.KAKAO_LOGIN_FAIL);
-                } finally {
-                    break;
-                }
+                userInfo = getKakaoUserInfo(code);
+                break;
             }
             default: {
-                // 기본 오류 처리
                 throw new OAuthException(OAuthExceptionErrorCode.INVALID_SOCIAL_LOGIN_TYPE);
             }
         }
-
         return userInfo;
     }
 
@@ -114,33 +101,35 @@ private void saveUserInfoToSession(HttpSession session, OAuthUserInfo oAuthUserI
         log.info("New user info saved in session: {}", session.getAttribute("email"));
     }
 
-    private OAuthUserInfo getGoogleUserInfo(String code) throws JsonProcessingException {
-        GoogleToken oAuthToken = googleUserService.getAccessToken(code);
-        GoogleUserInfo googleUserInfo = googleUserService.requestGoogleUserInfo(oAuthToken);
-        log.info("googleUser: " + googleUserInfo.email);
-
-        OAuthUserInfo oAuthUserInfo = OAuthUserInfo.builder()
-                .socialId(googleUserInfo.getId())
-                .socialProvider("google")
-                .email(googleUserInfo.email)
-                .build();
-
-        return oAuthUserInfo;
+    private OAuthUserInfo getGoogleUserInfo(String code){
+        GoogleToken googleToken = googleUserService.getAccessToken(code);
+        try {
+            GoogleUserInfo googleUserInfo = googleUserService.requestGoogleUserInfo(googleToken);
+            log.info("googleUser: " + googleUserInfo.email);
+            OAuthUserInfo oAuthUserInfo = OAuthUserInfo.builder()
+                    .socialId(googleUserInfo.getId())
+                    .socialProvider("google")
+                    .email(googleUserInfo.email)
+                    .build();
+            return oAuthUserInfo;
+        }catch (Exception e){
+            throw new OAuthException(OAuthExceptionErrorCode.GOOGLE_LOGIN_FAIL);
+        }
     }
 
     private OAuthUserInfo getKakaoUserInfo(String code) {
-        KakaoToken oAuthToken = kakaoUserService.getAccessToken(code);
-
-        KakaoUserInfo kakaoUserInfo = kakaoUserService.requestKakaoUserInfo(oAuthToken.getAccess_token());
-        //KakaoUserInfo kakaoUserInfo = kakaoUserService.requestKakaoUserInfo(code); // postman test 부분
-        log.info("kakaoUser: " + kakaoUserInfo.getKakao_account().getEmail());
-
-        OAuthUserInfo oAuthUserInfo = OAuthUserInfo.builder()
-                .socialId(kakaoUserInfo.getId())
-                .socialProvider("kakao")
-                .email(kakaoUserInfo.getKakao_account().email)
-                .build();
-
-        return oAuthUserInfo;
+        KakaoToken kakaoToken = kakaoUserService.getAccessToken(code);
+        try {
+            KakaoUserInfo kakaoUserInfo = kakaoUserService.requestKakaoUserInfo(kakaoToken);
+            log.info("kakaoUser: " + kakaoUserInfo.getKakao_account().getEmail());
+            OAuthUserInfo oAuthUserInfo = OAuthUserInfo.builder()
+                    .socialId(kakaoUserInfo.getId())
+                    .socialProvider("kakao")
+                    .email(kakaoUserInfo.getKakao_account().email)
+                    .build();
+            return oAuthUserInfo;
+        }catch (Exception e){
+            throw new OAuthException(OAuthExceptionErrorCode.KAKAO_LOGIN_FAIL);
+        }
     }
 }

src/main/java/com/mapu/infra/oauth/domain/OAuth.java

@@ -23,7 +23,7 @@ public class OAuth  extends BaseEntity {
     private String platformName;
 
     @NotNull
-    @Column(nullable = false, length = 20)
+    @Column(nullable = false, length = 50)
     private String platformId;
 
     @OneToOne(fetch = FetchType.LAZY)

src/main/java/com/mapu/infra/oauth/exception/errorcode/OAuthExceptionErrorCode.java

@@ -14,7 +14,8 @@ public enum OAuthExceptionErrorCode implements ResponseStatus {
     NEED_TO_SIGNUP(5000, HttpStatus.OK.value(), "회원가입이 필요한 유저입니다."),
     GOOGLE_LOGIN_FAIL(5001,HttpStatus.BAD_REQUEST.value(),"GOOGLE 소셜 로그인 중 오류가 발생했습니다."),
     KAKAO_LOGIN_FAIL(5002,HttpStatus.BAD_REQUEST.value(),"KAKAO 소셜 로그인 중 오류가 발생했습니다."),
-    INVALID_SOCIAL_LOGIN_TYPE(5003, HttpStatus.BAD_REQUEST.value(),"유효하지 않은 소셜로그인 유형입니다.");
+    INVALID_SOCIAL_LOGIN_TYPE(5003, HttpStatus.BAD_REQUEST.value(),"유효하지 않은 소셜로그인 유형입니다."),
+    GET_TOKEN_FAIL(5004, HttpStatus.BAD_REQUEST.value(), "SOCIAL TOKEN이 제대로 생성되지 않았습니다");
 
     private final int code;
     private final int status;

src/main/java/com/mapu/infra/oauth/google/GoogleUserInfo.java

@@ -1,15 +1,25 @@
 package com.mapu.infra.oauth.google;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
 public class GoogleUserInfo {
     public String id;
     public String email;
+
+    @JsonProperty("verified_email")
     public Boolean verifiedEmail;
+
     public String name;
+
+    @JsonProperty("given_name")
     public String givenName;
+
+    @JsonProperty("family_name")
     public String familyName;
+
     public String picture;
     public String locale;
 }
+

src/main/java/com/mapu/infra/oauth/google/GoogleUserService.java

@@ -4,29 +4,64 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mapu.infra.oauth.config.OAuthClientConfig;
+import com.mapu.infra.oauth.exception.OAuthException;
+import com.mapu.infra.oauth.exception.errorcode.OAuthExceptionErrorCode;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.reactive.function.BodyInserters;
 import org.springframework.web.reactive.function.client.WebClient;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class GoogleUserService {
 
     private final OAuthClientConfig oAuthClientConfig;
-    private final ObjectMapper objectMapper;
 
+    private final String accessTokenUri = "https://oauth2.googleapis.com/token";
     private final String UserInfoUri = "https://www.googleapis.com/oauth2/v1/userinfo";
 
 
-    public GoogleToken getAccessToken(String code) throws JsonProcessingException {
-        GoogleToken googleToken = objectMapper.readValue(code, GoogleToken.class);
+    public GoogleToken getAccessToken(String code) {
+        //요청 param (body)
+        MultiValueMap<String , String> params = new LinkedMultiValueMap<>();
+        params.add("grant_type", "authorization_code");
+        params.add("client_id", oAuthClientConfig.getGoogleClientId());
+        params.add("redirect_uri", oAuthClientConfig.getGoogleRedirectUri());
+        params.add("code", code);
+        params.add("client_secret", oAuthClientConfig.getGoogleClientSecret());
+
+
+        //request
+        WebClient wc = WebClient.create(accessTokenUri);
+        String response = wc.post()
+                .uri(accessTokenUri)
+                .body(BodyInserters.fromFormData(params))
+                .header("Content-type","application/x-www-form-urlencoded;charset=utf-8" ) //요청 헤더
+                .retrieve()
+                .bodyToMono(String.class)
+                .block();
+        //json형태로 변환
+        ObjectMapper objectMapper = new ObjectMapper();
+        GoogleToken googleToken =null;
+
+        try {
+            googleToken = objectMapper.readValue(response, GoogleToken.class);
+        } catch (JsonProcessingException e) {
+            throw new OAuthException(OAuthExceptionErrorCode.GET_TOKEN_FAIL);
+        }
+        log.info("Google Token: {}", googleToken.getAccess_token());
         return googleToken;
     }
 
-    public GoogleUserInfo requestGoogleUserInfo(GoogleToken googleToken) {
+    public GoogleUserInfo requestGoogleUserInfo(GoogleToken googleToken) throws JsonProcessingException {
         //Http 요청
+        log.info("requestGoogleUserInfo");
         WebClient wc = WebClient.create(UserInfoUri);
         String response = wc.get()
                 .uri(UserInfoUri)
@@ -39,11 +74,8 @@ public GoogleUserInfo requestGoogleUserInfo(GoogleToken googleToken) {
         ObjectMapper objectMapper = new ObjectMapper();
         GoogleUserInfo googleUserInfo = null;
 
-        try {
-            googleUserInfo = objectMapper.readValue(response, GoogleUserInfo.class);
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
+        log.info("response: {}", response);
+        googleUserInfo = objectMapper.readValue(response, GoogleUserInfo.class);
         return googleUserInfo;
     }
 }

src/main/java/com/mapu/infra/oauth/kakao/KakaoUserService.java

@@ -3,6 +3,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mapu.infra.oauth.config.OAuthClientConfig;
+import com.mapu.infra.oauth.exception.OAuthException;
+import com.mapu.infra.oauth.exception.errorcode.OAuthExceptionErrorCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -49,19 +51,18 @@ public KakaoToken getAccessToken(String code) {
         try {
             kakaoToken = objectMapper.readValue(response, KakaoToken.class);
         } catch (JsonProcessingException e) {
-            log.error("json processing error", e);
-            e.printStackTrace();
+            throw new OAuthException(OAuthExceptionErrorCode.GET_TOKEN_FAIL);
         }
 
         return kakaoToken;
     }
-    public KakaoUserInfo requestKakaoUserInfo(String token) {
+    public KakaoUserInfo requestKakaoUserInfo(KakaoToken kakaoToken) throws JsonProcessingException {
 
         //Http 요청
         WebClient wc = WebClient.create(UserInfoUri);
         String response = wc.post()
                 .uri(UserInfoUri)
-                .header("Authorization", "Bearer " + token)
+                .header("Authorization", "Bearer " + kakaoToken.getAccess_token())
                 .header("Content-type", "application/x-www-form-urlencoded;charset=utf-8")
                 .retrieve()
                 .bodyToMono(String.class)
@@ -70,37 +71,7 @@ public KakaoUserInfo requestKakaoUserInfo(String token) {
         ObjectMapper objectMapper = new ObjectMapper();
         KakaoUserInfo kakaoUserInfo = null;
 
-        try {
-            kakaoUserInfo = objectMapper.readValue(response, KakaoUserInfo.class);
-        } catch (JsonProcessingException e) {
-            log.error("json processing error", e);
-            e.printStackTrace();
-        }
+        kakaoUserInfo = objectMapper.readValue(response, KakaoUserInfo.class);
         return kakaoUserInfo;
     }
-
-    // 소은이가 하는 부분
-//    @Transactional
-//    public User saveUser(String access_token) {
-//        KakaoUserInfo kakaoUserInfo = findKakaoUser(access_token); //사용자 정보 받아오기
-//         User user = userRepository.findByUserid(kakaoUserInfo.getId());
-//
-//        //처음이용자 강제 회원가입
-//        if(user ==null) {
-//            user = User.builder()
-//                    .userid(kakaoUserInfo.getId())
-//                    .password(null) //필요없으니 일단 아무거도 안넣음. 원하는데로 넣으면 됌
-//                    .nickname(kakaoUserInfo.getKakao_account().getProfile().getNickname())
-//                    .profileImg(kakaoUserInfo.getKakao_account().getProfile().getProfile_image_url())
-//                    .email(kakaoUserInfo.getKakao_account().getEmail())
-//                    .roles("USER")
-//                    .createTime(LocalDateTime.now())
-//                    .provider("Kakao")
-//                    .build();
-//
-//            userRepository.save(user);
-//        }
-//
-//        return user;
-//    }
 }

src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
   jwt:
     secret: ${JWT_SECRET}
     token:
-      access-expiration-time: 600 #10min
+      access-expiration-time: 3600 #1hour
       refresh-expiration-time: 86400 #24hour
 
 ---
@@ -21,7 +21,7 @@ spring:
             client-id: ${GOOGLE_CLIENT_ID}
             client-secret: ${GOOGLE_CLIENT_SECRET}
             scope: email
-            redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}"
+            redirect-uri: "http://localhost:3000/google/callback"
             authorization-grant-type: authorization_code
             client-name: Google
           kakao: