feat: JWT 로직 관련 예외처리 추가 #8

feat: JWT 관련 예외처리 추가 #8
Team-Petudio · Jan 24, 2024 · e961e29 · e961e29
1 parent 071ef8d
commit e961e29
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/src/main/java/com/nice/petudio/api/controller/auth/service/CreateTokenService.java b/src/main/java/com/nice/petudio/api/controller/auth/service/CreateTokenService.java
@@ -8,6 +8,7 @@
 import com.nice.petudio.common.config.redis.constant.RedisKey;
 import com.nice.petudio.common.exception.error.ErrorCode;
 import com.nice.petudio.common.exception.model.UnAuthorizedException;
+import com.nice.petudio.common.exception.model.ValidationException;
 import com.nice.petudio.domain.member.Member;
 import com.nice.petudio.domain.member.repository.MemberRepository;
 import java.util.List;
@@ -35,7 +36,8 @@ public TokenVO createTokenInfo(Long memberId) {
 
     public TokenVO reissueToken(ReissueRequest request) {
         Long memberId = jwtUtils.parseMemberId(request.getAccessToken())
-                .orElseThrow();
+                .orElseThrow(() -> new ValidationException(ErrorCode.INVALID_JWT_TOKEN_EXCEPTION,
+                        String.format("JWT AccessToken 내에 MemberId가 존재하지 않습니다.")));
         Member member = MemberServiceUtils.findMemberById(memberRepository, memberId);
 
         if (!jwtUtils.validateToken(request.getRefreshToken())) {

diff --git a/src/main/java/com/nice/petudio/common/aop/advice/ExceptionControllerAdvice.java b/src/main/java/com/nice/petudio/common/aop/advice/ExceptionControllerAdvice.java
@@ -27,6 +27,9 @@
 @RestControllerAdvice
 public class ExceptionControllerAdvice {
 
+    /**
+     * 400 Bad Request
+     */
     // 사용자가 요청 값 전달은 성공했지만, 해당 값이 유효하지 않은 경우 발생
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ExceptionHandler(ValidationException.class)
@@ -76,7 +79,7 @@ protected ApiResponse<Object> handleInvalidFormatException(final Exception excep
      * 401 UnAuthorized
      */
     // 회원 인증에 실패했을 경우 발생
-    @ResponseStatus(HttpStatus.NOT_FOUND)
+    @ResponseStatus(HttpStatus.UNAUTHORIZED)
     @ExceptionHandler(UnAuthorizedException.class)
     protected ApiResponse<Object> handleUnAuthorizedException(
             UnAuthorizedException exception) {
@@ -88,7 +91,7 @@ protected ApiResponse<Object> handleUnAuthorizedException(
      * 403 Forbidden
      */
     // 요청에 대한 권한이 존재하지 않는 경우 발생
-    @ResponseStatus(HttpStatus.NOT_FOUND)
+    @ResponseStatus(HttpStatus.FORBIDDEN)
     @ExceptionHandler(ForbiddenException.class)
     protected ApiResponse<Object> handleForbiddenException(
             ForbiddenException exception) {

diff --git a/src/main/java/com/nice/petudio/common/auth/handler/AuthCheckHandler.java b/src/main/java/com/nice/petudio/common/auth/handler/AuthCheckHandler.java
@@ -51,6 +51,8 @@ public boolean hasAuthority(String jwtAccessToken, List<MemberRole> requiredRole
                 this.memberId = memberId.get();
                 return isRoleMatch(member, requiredRoles);
             }
+            throw new ValidationException(ErrorCode.INVALID_JWT_TOKEN_EXCEPTION,
+                    String.format("JWT AccessToken 내에 MemberId가 존재하지 않습니다."));
         }
         throw new UnAuthorizedException(ErrorCode.UNAUTHORIZED_JWT_EXCEPTION,
                 ErrorCode.UNAUTHORIZED_JWT_EXCEPTION.getMessage());

diff --git a/src/main/java/com/nice/petudio/common/auth/jwt/JwtUtils.java b/src/main/java/com/nice/petudio/common/auth/jwt/JwtUtils.java
@@ -2,6 +2,8 @@
 
 import com.nice.petudio.common.auth.jwt.constant.JwtKey;
 import com.nice.petudio.common.config.redis.constant.RedisKey;
+import com.nice.petudio.common.exception.error.ErrorCode;
+import com.nice.petudio.common.exception.model.UnAuthorizedException;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.Jwts;
@@ -11,6 +13,7 @@
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.io.DecodingException;
 import io.jsonwebtoken.security.Keys;
+import io.jsonwebtoken.security.SignatureException;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -56,7 +59,8 @@ public List<String> createTokenInfo(Long memberId) {
                 .compact();
 
         redisTemplate.opsForValue()
-                .set(RedisKey.REFRESH_TOKEN.getKey() + memberId, refreshToken, REFRESH_TOKEN_EXPIRE_TIME, TimeUnit.MILLISECONDS);
+                .set(RedisKey.REFRESH_TOKEN.getKey() + memberId, refreshToken, REFRESH_TOKEN_EXPIRE_TIME,
+                        TimeUnit.MILLISECONDS);
 
         return List.of(accessToken, refreshToken);
     }
@@ -74,8 +78,11 @@ private Claims parseClaims(String token) {
         try {
             return Jwts.parserBuilder().setSigningKey(secretKey).build()
                     .parseClaimsJws(token).getBody();
-        } catch (ExpiredJwtException e) {
-            return e.getClaims();
+        } catch (ExpiredJwtException exception) {
+            return exception.getClaims();
+        } catch (SignatureException exception) {
+            throw new UnAuthorizedException(ErrorCode.UNAUTHORIZED_JWT_EXCEPTION,
+                    String.format("입력받은 JWT 토큰의 Signature가 잘못되었습니다. (TOKEN: %s)", token));
         }
     }