fix: Method getNewAccessToken does not work properly

eTachkaMarketplace · Jan 15, 2024 · 90e41e2 · 90e41e2
1 parent d2a8b53
commit 90e41e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/com/sellbycar/marketplace/auth/AuthServiceImpl.java b/src/main/java/com/sellbycar/marketplace/auth/AuthServiceImpl.java
@@ -26,10 +26,13 @@ public void saveJwtRefreshToken(String email, String jwtRefreshToken) {
         refreshStorage.put(email, jwtRefreshToken);
     }
 
-    public JwtResponse getJwtAccessToken(@NotNull String refreshToken) {
-        Authentication authentication = authenticateWithRefreshToken(refreshToken);
-        String accessToken = jwtUtils.generateJwtToken(authentication);
-        return new JwtResponse(accessToken, refreshToken);
+    public JwtResponse getJwtAccessToken(@NotNull String refreshToken) throws AuthException {
+        if (jwtUtils.validateRefreshToken(refreshToken)) {
+            Authentication authentication = authenticateWithRefreshToken(refreshToken);
+            String accessToken = jwtUtils.generateJwtToken(authentication);
+            return new JwtResponse(accessToken, null);
+        }
+        throw new AuthException("Invalid token");
     }
 
     public JwtResponse getJwtRefreshToken(@NotNull String refreshToken) {

diff --git a/src/main/java/com/sellbycar/marketplace/config/SecurityConfig.java b/src/main/java/com/sellbycar/marketplace/config/SecurityConfig.java
@@ -69,7 +69,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                         .requestMatchers(
                                 HttpMethod.POST,
                                 "/advertisement",
-                                "/auth/refresh/**",
                                 "/image"
                         )
                         .authenticated()