구글 로그인 수정

kdt-8-4 · Dec 5, 2023 · d474cc7 · d474cc7
1 parent 3046538
commit d474cc7
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/user/src/main/java/com/weather/user/controller/UserController.java b/user/src/main/java/com/weather/user/controller/UserController.java
@@ -26,7 +26,7 @@ public ResponseEntity<UserDTO> google(@RequestBody GoogleUserDTO googleUserDTO)
         log.info(" ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ googleToken controller ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ");
         log.info("googleUserDTO: " + googleUserDTO);
 
-        UserDTO result = userService.profile(googleUserDTO.getEmail());
+        UserDTO result = userService.googleUserCheck(googleUserDTO);
 
         return new ResponseEntity<>(result, HttpStatus.OK);
     }

diff --git a/user/src/main/java/com/weather/user/service/UserService.java b/user/src/main/java/com/weather/user/service/UserService.java
@@ -1,6 +1,7 @@
 package com.weather.user.service;
 
 
+import com.weather.user.dto.GoogleUserDTO;
 import com.weather.user.dto.UserDTO;
 import com.weather.user.entity.User;
 
@@ -19,6 +20,8 @@ public interface UserService {
 
     void remove(String email);
 
+    UserDTO googleUserCheck(GoogleUserDTO googleUserDTO);
+
     default User dtoToEntity(UserDTO userDTO) {
         User user = User.builder()
                 .email(userDTO.getEmail())

diff --git a/user/src/main/java/com/weather/user/service/UserServiceImpl.java b/user/src/main/java/com/weather/user/service/UserServiceImpl.java
@@ -1,11 +1,14 @@
 package com.weather.user.service;
 
+import com.weather.user.dto.GoogleUserDTO;
 import com.weather.user.dto.UserDTO;
 import com.weather.user.entity.User;
+import com.weather.user.entity.UserRole;
 import com.weather.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
 
 import java.util.Optional;
@@ -127,4 +130,32 @@ public void remove(String email) {
         }
 
     }
+
+    @Override
+    public UserDTO googleUserCheck(GoogleUserDTO googleUserDTO) {
+        log.info("ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ");
+        String email = googleUserDTO.getEmail();
+        String image = googleUserDTO.getPicture();
+        Optional<User> optionalUser = userRepository.findByEmail(email, true);
+
+        if(optionalUser.isPresent()) {
+            User socialUser = optionalUser.get();
+            UserDTO result = entityToDTO(socialUser);
+            return result;
+        } else {
+            User socialUser = User.builder()
+                    .email(email)
+                    .password(passwordEncoder.encode("1234"))
+                    .image(image)
+                    .fromSocial(true)
+                    .status(true)
+                    .build();
+            socialUser.addRole(UserRole.USER);
+
+            userRepository.save(socialUser);
+
+            UserDTO result = entityToDTO(socialUser);
+            return result;
+        }
+    }
 }