[fix] refresh 토큰 내부 로직 수정

TEAM-MODDY · Feb 5, 2024 · 2ce7c36 · 2ce7c36
1 parent 9a8e704
commit 2ce7c36
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/main/java/com/moddy/server/service/auth/AuthService.java b/src/main/java/com/moddy/server/service/auth/AuthService.java
@@ -90,12 +90,13 @@ public void logout(final Long userId) {
     }
 
     public TokenPair refresh(final TokenRequestDto tokenRequestDto) {
-        final String userId = jwtService.getUserIdInToken(tokenRequestDto.accessToken());
-        final User user = userRepository.findById(Long.parseLong(userId)).orElseThrow(() -> new NotFoundException(USER_NOT_FOUND_EXCEPTION));
-        if (!jwtService.compareRefreshToken(userId, tokenRequestDto.refreshToken()))
+        if (!jwtService.verifyToken(tokenRequestDto.refreshToken()))
             throw new UnAuthorizedException(TOKEN_TIME_EXPIRED_EXCEPTION);
 
-        if (!jwtService.verifyToken(tokenRequestDto.refreshToken()))
+        final String userId = jwtService.getUserIdInToken(tokenRequestDto.refreshToken());
+        final User user = userRepository.findById(Long.parseLong(userId)).orElseThrow(() -> new NotFoundException(USER_NOT_FOUND_EXCEPTION));
+
+        if (!jwtService.compareRefreshToken(userId, tokenRequestDto.refreshToken()))
             throw new UnAuthorizedException(TOKEN_TIME_EXPIRED_EXCEPTION);
 
         final TokenPair tokenPair = jwtService.generateTokenPair(userId);