[Fix] :: auth signIn fix

Team-C0nnect · May 14, 2024 · 945a10d · 945a10d
1 parent 543c7dc
commit 945a10d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/main/java/com/project/qvick/domain/auth/service/AuthServiceImpl.java b/src/main/java/com/project/qvick/domain/auth/service/AuthServiceImpl.java
@@ -56,11 +56,13 @@ public void adminSignUp(SignUpRequest request) {
 
     @Override
     public JsonWebTokenResponse signIn(SignInRequest request) {
-        userUtil.userCheck(request.getEmail());
         String password = userRepository.getByEmail(request.getEmail()).getPassword();
         if (!encoder.matches(request.getPassword(), password))
             throw PasswordWrongException.EXCEPTION;
-        User user = userUtil.findUser();
+        User user = userRepository
+                .findByEmail(request.getEmail())
+                .map(userMapper::toUser)
+                .orElseThrow(()->UserNotFoundException.EXCEPTION);
         return JsonWebTokenResponse.builder()
                 .accessToken(jwtProvider.generateAccessToken(request.getEmail(),user.getUserRole()))
                 .refreshToken(jwtProvider.generateRefreshToken(request.getEmail(), user.getUserRole()))

diff --git a/src/main/java/com/project/qvick/global/common/util/user/UserUtil.java b/src/main/java/com/project/qvick/global/common/util/user/UserUtil.java
@@ -23,12 +23,6 @@ public void userExistCheck(String email){
         }
     }
 
-    public void userCheck(String email){
-        if (userRepository.findByEmail(email).isEmpty()){
-            throw UserNotFoundException.EXCEPTION;
-        }
-    }
-
     public void userCheckById(Long id){
         if (userRepository.findById(id).isEmpty()){
             throw UserNotFoundException.EXCEPTION;