소셜 연동할때 email null인거 허용 (#281)

wafflestudio · Oct 6, 2024 · 22bc3ef · 22bc3ef
1 parent 7715dbb
commit 22bc3ef
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/core/src/main/kotlin/users/service/UserService.kt b/core/src/main/kotlin/users/service/UserService.kt
@@ -401,11 +401,13 @@ class UserServiceImpl(
     ): TokenResponse {
         val token = socialLoginRequest.token
         val oauth2UserResponse = authService.socialLoginWithAccessToken(socialProvider, token)
-        val presentUser = userRepository.findByEmailIgnoreCaseAndIsEmailVerifiedTrueAndActiveTrue(oauth2UserResponse.email!!)
-
-        if (presentUser != null && presentUser.id != user.id) {
-            throw DuplicateEmailException(socialProvider)
+        if (oauth2UserResponse.email != null) {
+            val presentUser = userRepository.findByEmailIgnoreCaseAndIsEmailVerifiedTrueAndActiveTrue(oauth2UserResponse.email)
+            if (presentUser != null && presentUser.id != user.id) {
+                throw DuplicateEmailException(socialProvider)
+            }
         }
+
         when (socialProvider) {
             SocialProvider.FACEBOOK -> {
                 if (user.credential.fbId != null) throw AlreadySocialAccountException