Merge pull request #283 from 7-umc-GrowIT/feat/#254

[#254] Feat : 인증 필터 기능 수정

Author: sehyeo

src/main/java/umc/GrowIT/Server/filter/JwtAuthenticationFilter.java

@@ -16,6 +16,7 @@
 import java.io.IOException;
 import io.jsonwebtoken.SignatureException;
 import umc.GrowIT.Server.apiPayload.exception.JwtAuthenticationException;
+import umc.GrowIT.Server.repository.UserRepository;
 import umc.GrowIT.Server.util.JwtTokenUtil;
 
 import static umc.GrowIT.Server.apiPayload.code.status.ErrorStatus.*;
@@ -25,6 +26,7 @@
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
     private final JwtTokenUtil jwtTokenUtil;
+    private final UserRepository userRepository;
 
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
@@ -39,8 +41,13 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
             }
 
             // 토큰에서 사용자 정보 읽어서 탈퇴한 회원인지 확인
-            if (jwtTokenUtil.isUserInactive(token))
-                throw new JwtAuthenticationException(USER_STATUS_INACTIVE);
+            // if (jwtTokenUtil.isUserInactive(token))
+            //    throw new JwtAuthenticationException(USER_STATUS_INACTIVE);
+
+            // 사용자 정보 확인
+            Long userId = jwtTokenUtil.getUserId(token);
+            userRepository.findById(userId)
+                    .orElseThrow(() -> new JwtAuthenticationException(USER_NOT_FOUND));
 
             //토큰이 유효한지 확인
             if (jwtTokenUtil.validateToken(token)) {

src/main/java/umc/GrowIT/Server/util/JwtTokenUtil.java

@@ -115,9 +115,14 @@ public Authentication getAuthentication(String token) {
         );
     }
 
-    public boolean isUserInactive(String token){
+    public boolean isUserInactive(String token) {
         Claims claims = parseClaims(token);
         Long userId = claims.get("userId", Long.class);
         return userQueryService.isUserInactive(userId);
     }
+
+    public Long getUserId(String token) {
+        Claims claims = parseClaims(token);
+        return claims.get("userId", Long.class);
+    }
 }