♻️ refactor login logic

woowacourse-teams · Jul 28, 2024 · 2fd419b · 2fd419b
1 parent ad29037
commit 2fd419b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/backend/src/main/java/net/pengcook/authentication/service/LoginService.java b/backend/src/main/java/net/pengcook/authentication/service/LoginService.java
@@ -28,12 +28,13 @@ public GoogleLoginResponse loginWithGoogle(GoogleLoginRequest googleLoginRequest
         FirebaseToken decodedToken = decodeIdToken(googleLoginRequest.idToken());
         String email = decodedToken.getEmail();
 
-        if (!userRepository.existsByEmail(email)) {
+        User user = userRepository.findByEmail(email).orElse(null);
+
+        if (user == null) {
             return new GoogleLoginResponse(false, null);
         }
-        User user = userRepository.findByEmail(email).orElseThrow();
-        String accessToken = jwtTokenManager.createToken(new TokenPayload(user.getId(), user.getEmail()));
 
+        String accessToken = jwtTokenManager.createToken(new TokenPayload(user.getId(), user.getEmail()));
         return new GoogleLoginResponse(true, accessToken);
     }