#1 - Fix: Update User Jwt

route-master · Jul 18, 2023 · 9a9b897 · 9a9b897
1 parent 1a39d14
commit 9a9b897
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/org/routemaster/api/auth/domain/user/jwt/impl/data/UserJwtPayload.java b/src/main/java/org/routemaster/api/auth/domain/user/jwt/impl/data/UserJwtPayload.java
@@ -14,7 +14,6 @@
 @AllArgsConstructor(access = AccessLevel.PROTECTED)
 @Builder
 @Getter
-@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class UserJwtPayload {
 
     private String baseUserId;

diff --git a/src/main/java/org/routemaster/api/auth/domain/user/jwt/impl/data/UserJwtUnit.java b/src/main/java/org/routemaster/api/auth/domain/user/jwt/impl/data/UserJwtUnit.java
@@ -12,7 +12,6 @@
 @AllArgsConstructor
 @Builder
 @Getter
-@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class UserJwtUnit {
 
     private JwtUnit accessToken;

diff --git a/...g/routemaster/api/auth/domain/user/jwt/impl/utils/filter/UserJwtAuthenticationFilter.java b/...g/routemaster/api/auth/domain/user/jwt/impl/utils/filter/UserJwtAuthenticationFilter.java
@@ -49,7 +49,6 @@ public class UserJwtAuthenticationFilter extends OncePerRequestFilter {
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
         FilterChain filterChain) throws ServletException, IOException {
         String token = parseBearerToken(request);
-        log.info("{}", token);
         if (token == null) {
             filterChain.doFilter(request, response);
             return;
@@ -64,7 +63,6 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
         }
 
         UserJwtPayload payload = userJwtService.getPayload(token);
-        log.info("{}", payload);
         if (payload.getJwtType() != JwtType.ACCESS_TOKEN) {
             throw roeFactory.get(
                 UserErrorCode.ROE_102,
@@ -92,6 +90,15 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
             );
         }
 
+        String refreshToken = userDetails.getRefreshToken();
+        if (refreshToken == null) {
+            throw roeFactory.get(
+                UserErrorCode.ROE_102,
+                UserJwtErrorDescription.INVALID_TOKEN,
+                HttpStatus.UNAUTHORIZED
+            );
+        }
+
         request.setAttribute(USER_PAYLOAD, payload);
         request.setAttribute(USER_DETAILS, userDetails);