fix: #202 fix logout process

skni-kod · Dec 22, 2024 · 373e411 · 373e411
1 parent 58cb25c
commit 373e411
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 224 deletions.
diff --git a/commons/src/main/java/pl/sknikod/kodemycommons/security/JwtAuthorizationFilter.java b/commons/src/main/java/pl/sknikod/kodemycommons/security/JwtAuthorizationFilter.java
@@ -54,7 +54,7 @@ protected void doFilterInternal(
             @NonNull FilterChain filterChain
     ) throws ServletException, IOException {
         extractBearer(request)
-                .flatMapTry(jwtProvider::parseToken)
+                .flatMap(jwtProvider::parseToken)
                 .map(this::toUserPrincipal)
                 .onFailure(th -> log.debug("Authenticate failure", th))
                 .onSuccess(user -> authenticate(request, user));

diff --git a/commons/src/main/java/pl/sknikod/kodemycommons/security/JwtProvider.java b/commons/src/main/java/pl/sknikod/kodemycommons/security/JwtProvider.java
@@ -204,7 +204,7 @@ public Deserialize(UUID bearerId, Long id, String username, Integer state, Set<S
     @Setter
     @NoArgsConstructor
     public abstract static class Properties {
-        private String secretKey = "";
+        private String secretKey;
         private Integer bearerExpirationMin = 15;
         private Integer delegationExpirationMin = 60;
     }

diff --git a/...eway/util/LogoutGatewayFilterFactory.java → ...util/LogoutRelayGatewayFilterFactory.java b/...eway/util/LogoutGatewayFilterFactory.java → ...util/LogoutRelayGatewayFilterFactory.java
@@ -21,15 +21,15 @@
 
 @Component
 @Slf4j
-public class LogoutGatewayFilterFactory extends AbstractGatewayFilterFactory<Object> {
+public class LogoutRelayGatewayFilterFactory extends AbstractGatewayFilterFactory<Object> {
 
-    public LogoutGatewayFilterFactory() {
+    public LogoutRelayGatewayFilterFactory() {
         super(Object.class);
     }
 
     @Override
     public GatewayFilter apply(Object config) {
-        return new LogoutGatewayFilter();
+        return new LogoutRelayFilter();
     }
 
     @Getter
@@ -41,10 +41,7 @@ public static class Config {
     }
 
     @RequiredArgsConstructor
-    private static final class LogoutGatewayFilter implements GatewayFilter, Ordered {
-        private static final String ACCESS_TOKEN_COOKIE = "AUTH_CONTEXT";
-        private static final String REFRESH_TOKEN_COOKIE = "AUTH_PERSIST";
-
+    private static final class LogoutRelayFilter implements GatewayFilter, Ordered {
         @Override
         public int getOrder() {
             return NettyWriteResponseFilter.WRITE_RESPONSE_FILTER_ORDER;
@@ -67,7 +64,8 @@ private void modifyHeaders(ServerHttpResponse response) {
             }
             response.getHeaders().addAll(
                     HttpHeaders.SET_COOKIE,
-                    List.of(createExpiredCookie(ACCESS_TOKEN_COOKIE).toString(), createExpiredCookie(REFRESH_TOKEN_COOKIE).toString())
+                    List.of(createExpiredCookie(AuthCookies.ACCESS_TOKEN).toString(),
+                            createExpiredCookie(AuthCookies.REFRESH_TOKEN).toString())
             );
         }
 

diff --git a/...rc/main/java/pl/sknikod/kodemygateway/util/RewriteCookieToBearerGatewayFilterFactory.java b/...rc/main/java/pl/sknikod/kodemygateway/util/RewriteCookieToBearerGatewayFilterFactory.java
diff --git a/kodemy-api-gateway/src/main/resources/application.yml b/kodemy-api-gateway/src/main/resources/application.yml
@@ -11,7 +11,7 @@ spring:
           predicates:
             - Path=/api/auth/logout
           filters:
-            - Logout
+            - LogoutRelay
 
         - id: oauth2_auth
           uri: ${service.baseUrl.auth}

diff --git a/kodemy-auth/src/main/resources/application-local.yml b/kodemy-auth/src/main/resources/application-local.yml
@@ -32,7 +32,7 @@ service:
 app:
   security:
     jwt:
-      bearer-expiration-min: 2
+      bearer-expiration-min: 60
     oauth2:
       baseUrl:
         front: http://localhost:3000

diff --git a/...est/groovy/pl/sknikod/kodemyauth/infrastructure/module/auth/AccessTokenServiceSpec.groovy b/...est/groovy/pl/sknikod/kodemyauth/infrastructure/module/auth/AccessTokenServiceSpec.groovy
diff --git a/...t/groovy/pl/sknikod/kodemyauth/infrastructure/module/auth/RefreshTokensServiceSpec.groovy b/...t/groovy/pl/sknikod/kodemyauth/infrastructure/module/auth/RefreshTokensServiceSpec.groovy
diff --git a/...sknikod/kodemyauth/infrastructure/module/oauth2/exchange/github/GithubExchangeSpec.groovy b/...sknikod/kodemyauth/infrastructure/module/oauth2/exchange/github/GithubExchangeSpec.groovy
diff --git a/...h/src/test/groovy/pl/sknikod/kodemyauth/infrastructure/store/RefreshTokenStoreSpec.groovy b/...h/src/test/groovy/pl/sknikod/kodemyauth/infrastructure/store/RefreshTokenStoreSpec.groovy
diff --git a/...y-backend/src/main/java/pl/sknikod/kodemybackend/configuration/SecurityConfiguration.java b/...y-backend/src/main/java/pl/sknikod/kodemybackend/configuration/SecurityConfiguration.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -65,6 +66,7 @@ public JwtAuthorizationFilter jwtAuthorizationFilter(JwtProvider jwtProvider) {
     }
 
     @Component
+    @NoArgsConstructor
     @ConfigurationProperties(prefix = "app.security.jwt")
     public static class JwtProperties extends JwtProvider.Properties {
     }

diff --git a/kodemy-backend/src/main/resources/application-local.yml b/kodemy-backend/src/main/resources/application-local.yml
@@ -21,11 +21,6 @@ service:
   baseUrl:
     auth: http://localhost:8080
 
-app:
-  security:
-    jwt:
-      bearer-expiration-min: 60
-
 eureka:
   client:
     enabled: false