[fix] 카카오, 구글 로그인 프로필 이미지 가져와 저장, 주석 코드 삭제

Mojacknong · Oct 29, 2023 · 19f40ba · 19f40ba
1 parent 335c43d
commit 19f40ba
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 85 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -2,7 +2,7 @@ name: ModernFarmer CI/CD
 
 on:
   push:
-    branches: ["feature_11/에러처리-추가"]
+    branches: ["feature_13/카카오,-구글-로그인-수정"]
 
   pull_request:
     branches: ["dev"]

diff --git a/src/main/java/modernfarmer/server/farmususer/user/controller/AuthController.java b/src/main/java/modernfarmer/server/farmususer/user/controller/AuthController.java
@@ -36,33 +36,6 @@ public TokenResponseDto kakaoLogin(HttpServletRequest request)  {
         return reissueTokenResponseDto;
     }
 
-//
-//    @DeleteMapping("/logout")
-//    public ResponseDto logout(HttpServletRequest request)  {
-//
-//
-//        String userId = jwtTokenProvider.getUserId(request);
-//
-//        ResponseDto logoutResponseDto = authService.logout(Long.valueOf(userId));
-//
-//        LOGGER.info("로그아웃 완료");
-//
-//        return logoutResponseDto;
-//    }
-//
-//    @GetMapping(value = "/reissue-token")
-//    public TokenResponseDto reissueToken(HttpServletRequest request)  {
-//
-//        String userId = jwtTokenProvider.getUserId(request);
-//        String refreshToken = jwtTokenProvider.resolveToken(request);
-//
-//        TokenResponseDto reissueTokenResponseDto = authService.reissueToken(refreshToken, Long.valueOf(userId));
-//
-//        LOGGER.info("토큰 재발급 완료");
-//
-//        return reissueTokenResponseDto;
-//    }
-
 
     @PostMapping(value = "/google-login")
     public TokenResponseDto googleLogin(HttpServletRequest request)  {

diff --git a/src/main/java/modernfarmer/server/farmususer/user/dto/response/GoogleUserResponseDto.java b/src/main/java/modernfarmer/server/farmususer/user/dto/response/GoogleUserResponseDto.java
@@ -11,10 +11,6 @@ public class GoogleUserResponseDto {
 
     private String id;
     private String email;
-    private boolean verified_email;
-    private String name;
-    private String given_name;
-    private String family_name;
     private String picture;
-    private String locale;
+    private String name;
 }
diff --git a/src/main/java/modernfarmer/server/farmususer/user/dto/response/KakaoUserResponseDto.java b/src/main/java/modernfarmer/server/farmususer/user/dto/response/KakaoUserResponseDto.java
@@ -2,47 +2,49 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 
 
 @Getter
 @Builder
+@AllArgsConstructor
 public class KakaoUserResponseDto {
 
     private long id;
     @JsonCreator
     public KakaoUserResponseDto(@JsonProperty("id") long id) {
         this.id = id;
     }
-//    private UserProfileDTO  kakao_account;
-//
-//
-//    @Setter
-//    @Getter
-//    public class UserProfileDTO {
-//        private boolean profileNicknameNeedsAgreement;
-//        private boolean profileImageNeedsAgreement;
-//        private ProfileData profile;
-//        private boolean hasEmail;
-//        private boolean emailNeedsAgreement;
-//        private boolean isEmailValid;
-//        private boolean isEmailVerified;
-//        private String email;
-//
-//
-//
-//
-//        @Getter
-//        @Setter
-//        public class ProfileData {
-//            private String nickname;
-//            private String thumbnailImageUrl;
-//            private String profileImageUrl;
-//            private boolean isDefaultImage;
-//        }
-//    }
+    private UserProfileDTO  kakao_account;
+
+
+    @Setter
+    @Getter
+    public class UserProfileDTO {
+        private boolean profileNicknameNeedsAgreement;
+        private boolean profileImageNeedsAgreement;
+        private ProfileData profile;
+        private boolean hasEmail;
+        private boolean emailNeedsAgreement;
+        private boolean isEmailValid;
+        private boolean isEmailVerified;
+        private String email;
+
+
+
+
+        @Getter
+        @Setter
+        public class ProfileData {
+            private String nickname;
+            private String thumbnail_image_Url;
+            private String profile_image_url;
+            private boolean isDefaultImage;
+        }
+    }
 
 
 

diff --git a/src/main/java/modernfarmer/server/farmususer/user/entity/User.java b/src/main/java/modernfarmer/server/farmususer/user/entity/User.java
@@ -35,4 +35,12 @@ public class User {
     private String role;
 
 
+    @Size(max = 45)
+    @Column(name = "nickname", length = 45)
+    private String nickname;
+
+    @Size(max = 255)
+    @Column(name = "profile_image")
+    private String profileImage;
+
 }
diff --git a/src/main/java/modernfarmer/server/farmususer/user/service/AuthService.java b/src/main/java/modernfarmer/server/farmususer/user/service/AuthService.java
@@ -1,5 +1,6 @@
 package modernfarmer.server.farmususer.user.service;
 
+
 import lombok.extern.slf4j.Slf4j;
 import modernfarmer.server.farmususer.user.dto.response.GoogleUserResponseDto;
 import modernfarmer.server.farmususer.user.dto.response.KakaoUserResponseDto;
@@ -9,7 +10,6 @@
 import modernfarmer.server.farmususer.user.util.JwtTokenProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
@@ -44,23 +44,18 @@ public TokenResponseDto googleLogin(String accessToken) {
         Mono<GoogleUserResponseDto> userInfoMono = getUserGoogleInfo(accessToken);
         GoogleUserResponseDto userInfo = userInfoMono.block();
 
-//        LOGGER.info(String.valueOf(userInfo.getAccount_email()));
-//        LOGGER.info(String.valueOf(userInfo.getProfile_nickname()));
-//        LOGGER.info(String.valueOf(userInfo.getProfile_image()));
-
-//        LOGGER.info(String.valueOf(userInfo.getKakao_account().getEmail()));
-//        LOGGER.info(String.valueOf(userInfo.getKakao_account().getProfile().getProfileImageUrl()));
-//        LOGGER.info(String.valueOf(userInfo.getKakao_account().getProfile().getNickname()));
 
         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()))
                     .role("USER")
-//                    .email(userInfo.getKakao_account().getEmail())
-//                    .nickname(userInfo.getKakao_account().getProfile().getNickname())
-//                    .userProfile(userInfo.getKakao_account().getProfile().getProfileImageUrl())
+                    .profileImage(userInfo.getPicture())
                     .build();
 
             userRepository.save(user);
@@ -80,8 +75,6 @@ public TokenResponseDto googleLogin(String accessToken) {
                 .refreshToken(refreshToken)
                 .build();
 
-//        redisTemplate.opsForHash().put(jwtTokenProvider.createRereshToken(),"userId", String.valueOf(userLoginData.get().getId()));
-//        redisTemplate.opsForHash().put(jwtTokenProvider.createRereshToken(),"role", String.valueOf(userLoginData.get().getRole()));
 
         redisTemplate.opsForValue().set(String.valueOf(userLoginData.get().getId()),refreshToken);
 
@@ -95,23 +88,19 @@ public TokenResponseDto kakaoLogin(String accessToken) {
         Mono<KakaoUserResponseDto> userInfoMono = getUserKakaoInfo(accessToken);
         KakaoUserResponseDto userInfo = userInfoMono.block();
 
-//        LOGGER.info(String.valueOf(userInfo.getAccount_email()));
-//        LOGGER.info(String.valueOf(userInfo.getProfile_nickname()));
-//        LOGGER.info(String.valueOf(userInfo.getProfile_image()));
 
-//        LOGGER.info(String.valueOf(userInfo.getKakao_account().getEmail()));
-//        LOGGER.info(String.valueOf(userInfo.getKakao_account().getProfile().getProfileImageUrl()));
-//        LOGGER.info(String.valueOf(userInfo.getKakao_account().getProfile().getNickname()));
+        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()));
 
         if(userData.isEmpty()){
             user = User.builder()
                     .usernumber(String.valueOf(userInfo.getId()))
                     .role("USER")
-//                    .email(userInfo.getKakao_account().getEmail())
-//                    .nickname(userInfo.getKakao_account().getProfile().getNickname())
-//                    .userProfile(userInfo.getKakao_account().getProfile().getProfileImageUrl())
+                    .profileImage(userInfo.getKakao_account().getProfile().getProfile_image_url())
                     .build();
 
             userRepository.save(user);
@@ -131,16 +120,13 @@ public TokenResponseDto kakaoLogin(String accessToken) {
                 .refreshToken(refreshToken)
                 .build();
 
-//        redisTemplate.opsForHash().put(jwtTokenProvider.createRereshToken(),"userId", String.valueOf(userLoginData.get().getId()));
-//        redisTemplate.opsForHash().put(jwtTokenProvider.createRereshToken(),"role", String.valueOf(userLoginData.get().getRole()));
 
         redisTemplate.opsForValue().set(String.valueOf(userLoginData.get().getId()),refreshToken);
 
 
         return tokenResponseDto;
     }
 
-
     public Mono<KakaoUserResponseDto> getUserKakaoInfo(String accessToken) {
         return webClient
                 .get()