�fix: findByProviderId Status.ACTIVE 조건 추가 (#299)

* fix: 구글/카카오 로그인 API 수정 * fix: RefreshToken null 체크 로직 추가 * fix: findByProvicderId Status 조건 추가
ShallWeProject · Mar 12, 2024 · 47cc842 · 47cc842
1 parent 18e3311
commit 47cc842
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/main/java/com/shallwe/domain/auth/application/AuthService.java b/src/main/java/com/shallwe/domain/auth/application/AuthService.java
@@ -57,7 +57,7 @@ public class AuthService {
 
     @Transactional
     public SignInRes kakaoGoogleSignIn(final SignInReq signInReq) {
-        Optional<User> optionalUser = userRepository.findByProviderId(signInReq.getProviderId());
+        Optional<User> optionalUser = userRepository.findByProviderIdAndStatus(signInReq.getProviderId(), Status.ACTIVE);
 
         if (optionalUser.isEmpty()) {
             User newUser = User.builder()
@@ -90,7 +90,7 @@ public SignInRes appleSignIn(final AppleSignInReq appleSignInReq) {
         Claims claims = appleJwtUtils.getClaimsBy(appleSignInReq.getIdentityToken());
         String providerId = claims.get("sub").toString();
 
-        Optional<User> optionalUser = userRepository.findByProviderId(providerId);
+        Optional<User> optionalUser = userRepository.findByProviderIdAndStatus(providerId, Status.ACTIVE);
 
         if (optionalUser.isEmpty()) {
             String appleRefreshToken = appleJwtUtils.getAppleToken(appleSignInReq.getAuthorizationCode());

diff --git a/src/main/java/com/shallwe/domain/user/domain/repository/UserRepository.java b/src/main/java/com/shallwe/domain/user/domain/repository/UserRepository.java
@@ -13,14 +13,10 @@
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {
 
-    Boolean existsByEmailAndStatus(String email, Status status);
-
-    Boolean existsByProviderId(String providerId);
-
     Optional<User> findByPhoneNumberAndStatus(String phoneNumber, Status status);
 
     Optional<User> findByEmailAndStatus(String email, Status status);
 
-    Optional<User> findByProviderId(String providerId);
+    Optional<User> findByProviderIdAndStatus(String providerId, Status status);
 
 }