diff --git a/src/main/java/com/shallwe/domain/auth/application/AuthService.java b/src/main/java/com/shallwe/domain/auth/application/AuthService.java index 88620c2..6ee15ed 100644 --- 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 optionalUser = userRepository.findByProviderId(signInReq.getProviderId()); + Optional 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 optionalUser = userRepository.findByProviderId(providerId); + Optional 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 index 797eb64..67969dc 100644 --- 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 { - Boolean existsByEmailAndStatus(String email, Status status); - - Boolean existsByProviderId(String providerId); - Optional findByPhoneNumberAndStatus(String phoneNumber, Status status); Optional findByEmailAndStatus(String email, Status status); - Optional findByProviderId(String providerId); + Optional findByProviderIdAndStatus(String providerId, Status status); }