🚑 Fixed OAuth email duplication problem

kshired · kshired · commit d61f4f65aa67 · 2022-08-12T13:49:20.000+09:00
diff --git a/src/main/kotlin/com/csbroker/apiserver/service/CustomOAuth2UserService.kt b/src/main/kotlin/com/csbroker/apiserver/service/CustomOAuth2UserService.kt
@@ -47,7 +47,8 @@ class CustomOAuth2UserService(
         }
 
         val userInfo = OAuth2UserInfoFactory.getOauth2UserInfo(providerType, attributes)
-        var savedUser = this.userRepository.findUserByProviderId(userInfo.getId())
+        var savedUser = this.userRepository.findByEmail(userInfo.getEmail())
+            ?: this.userRepository.findUserByProviderId(userInfo.getId())
 
         if (savedUser != null) {
             if (providerType != savedUser.providerType) {

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ class CustomOAuth2UserService(`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`val userInfo = OAuth2UserInfoFactory.getOauth2UserInfo(providerType, attributes)`
`50`		`- var savedUser = this.userRepository.findUserByProviderId(userInfo.getId())`
	`50`	`+ var savedUser = this.userRepository.findByEmail(userInfo.getEmail())`
	`51`	`+ ?: this.userRepository.findUserByProviderId(userInfo.getId())`
`51`	`52`
`52`	`53`	`if (savedUser != null) {`
`53`	`54`	`if (providerType != savedUser.providerType) {`