🐛 self-invocation 문제 해결

Author: cheshireHYUN

src/main/java/com/boggle_boggle/bbegok/oauth/service/CustomOAuth2UserService.java

@@ -35,6 +35,7 @@ public class CustomOAuth2UserService extends DefaultOAuth2UserService {
     private final UserSettingsRepository userSettingsRepository;
 
     @Override
+    @Transactional
     public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException {
         OAuth2User user = super.loadUser(userRequest);
 
@@ -48,7 +49,6 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
         }
     }
 
-    @Transactional
     protected OAuth2User process(OAuth2UserRequest userRequest, OAuth2User user) {
         ProviderType providerType = ProviderType.valueOf(userRequest.getClientRegistration().getRegistrationId().toUpperCase());
         OAuth2UserInfo userInfo = OAuth2UserInfoFactory.getOAuth2UserInfo(providerType, user.getAttributes());
@@ -61,15 +61,7 @@ protected OAuth2User process(OAuth2UserRequest userRequest, OAuth2User user) {
                                 " account. Please use your " + savedUser.getProviderType() + " account to login."
                 );
             }
-            //이메일을 업데이트
-            log.debug("### OAUTH2 EMAIL <1> : {}", userInfo.getEmail());
-            if(userInfo.getEmail() != null) {
-                if(savedUser.getEmail() == null || (!savedUser.getEmail().equals(userInfo.getEmail()))) {
-                    log.debug("### OAUTH2 EMAIL <2> : {}을 {}로 update", savedUser.getEmail(), userInfo.getEmail());
-                    savedUser.updateEmail(userInfo.getEmail());
-                }
-            }
-
+            updateUser(userInfo);
         } else {
             //가입한적 없다면 회원가입을 진행.
             savedUser = createUser(userInfo, providerType);
@@ -80,6 +72,16 @@ protected OAuth2User process(OAuth2UserRequest userRequest, OAuth2User user) {
         return UserPrincipal.create(savedUser, user.getAttributes());
     }
 
+    public void updateUser( OAuth2UserInfo userInfo) {
+        User user = userRepository.findByUserIdAndIsDeleted(userInfo.getId(), false);
+        log.debug("### OAUTH2 EMAIL <1> : {}", userInfo.getEmail());
+        if(userInfo.getEmail() == null) return;
+        if(user.getEmail() == null || (!user.getEmail().equals(userInfo.getEmail()))) {
+            log.debug("### OAUTH2 EMAIL <2> : {}을 {}로 update", user.getEmail(), userInfo.getEmail());
+            user.updateEmail(userInfo.getEmail());
+        }
+        else log.debug("### OAUTH2 EMAIL <2> not update/....");
+    }
 
     private User createUser(OAuth2UserInfo userInfo, ProviderType providerType) {
         User user = User.createUser(