Skip to content

Commit 68b8662

Browse files
committed
♻️ 분리된 update메소드를 통합
1 parent 7e086ea commit 68b8662

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
4848
}
4949
}
5050

51+
@Transactional
5152
protected OAuth2User process(OAuth2UserRequest userRequest, OAuth2User user) {
5253
ProviderType providerType = ProviderType.valueOf(userRequest.getClientRegistration().getRegistrationId().toUpperCase());
5354
OAuth2UserInfo userInfo = OAuth2UserInfoFactory.getOAuth2UserInfo(providerType, user.getAttributes());
@@ -60,7 +61,15 @@ protected OAuth2User process(OAuth2UserRequest userRequest, OAuth2User user) {
6061
" account. Please use your " + savedUser.getProviderType() + " account to login."
6162
);
6263
}
63-
updateUser(userInfo);
64+
//이메일을 업데이트
65+
log.debug("### OAUTH2 EMAIL <1> : {}", userInfo.getEmail());
66+
if(userInfo.getEmail() != null) {
67+
if(savedUser.getEmail() == null || (!savedUser.getEmail().equals(userInfo.getEmail()))) {
68+
log.debug("### OAUTH2 EMAIL <2> : {}을 {}로 update", savedUser.getEmail(), userInfo.getEmail());
69+
savedUser.updateEmail(userInfo.getEmail());
70+
}
71+
}
72+
6473
} else {
6574
//가입한적 없다면 회원가입을 진행.
6675
savedUser = createUser(userInfo, providerType);
@@ -71,17 +80,6 @@ protected OAuth2User process(OAuth2UserRequest userRequest, OAuth2User user) {
7180
return UserPrincipal.create(savedUser, user.getAttributes());
7281
}
7382

74-
@Transactional
75-
public void updateUser( OAuth2UserInfo userInfo) {
76-
User user = userRepository.findByUserIdAndIsDeleted(userInfo.getId(), false);
77-
log.debug("### OAUTH2 EMAIL <1> : {}", userInfo.getEmail());
78-
if(userInfo.getEmail() == null) return;
79-
if(user.getEmail() == null || (!user.getEmail().equals(userInfo.getEmail()))) {
80-
log.debug("### OAUTH2 EMAIL <2> : {}을 {}로 update", user.getEmail(), userInfo.getEmail());
81-
user.updateEmail(userInfo.getEmail());
82-
}
83-
else log.debug("### OAUTH2 EMAIL <2> not update/....");
84-
}
8583

8684
private User createUser(OAuth2UserInfo userInfo, ProviderType providerType) {
8785
User user = User.createUser(

0 commit comments

Comments
 (0)