Feat: 필터 동작 순서 수정

Author: dungbik

src/main/java/flipnote/apigateway/filter/AuthenticationFilter.java

@@ -3,9 +3,7 @@
 import flipnote.apigateway.client.TokenValidationClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.gateway.filter.GatewayFilter;
-import org.springframework.cloud.gateway.filter.OrderedGatewayFilter;
 import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
-import org.springframework.core.Ordered;
 import org.springframework.http.HttpCookie;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
@@ -27,7 +25,7 @@ public AuthenticationFilter(TokenValidationClient tokenValidationClient) {
 
     @Override
     public GatewayFilter apply(Config config) {
-        GatewayFilter filter = (exchange, chain) -> {
+        return (exchange, chain) -> {
             HttpCookie cookie = exchange.getRequest().getCookies().getFirst(ACCESS_TOKEN_COOKIE);
 
             if (cookie == null) {
@@ -56,7 +54,6 @@ public GatewayFilter apply(Config config) {
                         return onError(exchange, HttpStatus.UNAUTHORIZED);
                     });
         };
-        return new OrderedGatewayFilter(filter, Ordered.LOWEST_PRECEDENCE);
     }
 
     private Mono<Void> onError(ServerWebExchange exchange, HttpStatus status) {

src/main/java/flipnote/apigateway/filter/HeaderCleanupGlobalFilter.java

@@ -0,0 +1,36 @@
+package flipnote.apigateway.filter;
+
+import java.util.List;
+
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.GlobalFilter;
+import org.springframework.core.Ordered;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.stereotype.Component;
+import org.springframework.web.server.ServerWebExchange;
+
+import reactor.core.publisher.Mono;
+
+@Component
+public class HeaderCleanupGlobalFilter implements GlobalFilter, Ordered {
+
+    private static final List<String> HEADERS_TO_REMOVE = List.of(
+            "X-User-Id",
+            "X-User-Email",
+            "X-User-Role"
+    );
+
+    @Override
+    public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
+        ServerHttpRequest request = exchange.getRequest().mutate()
+                .headers(headers -> HEADERS_TO_REMOVE.forEach(headers::remove))
+                .build();
+
+        return chain.filter(exchange.mutate().request(request).build());
+    }
+
+    @Override
+    public int getOrder() {
+        return Ordered.HIGHEST_PRECEDENCE;
+    }
+}

src/main/resources/application.yml

@@ -7,10 +7,6 @@ spring:
 
   cloud:
     gateway:
-      default-filters:
-        - RemoveRequestHeader=X-User-Id
-        - RemoveRequestHeader=X-User-Email
-        - RemoveRequestHeader=X-User-Role
       routes:
         - id: user-private
           uri: http://user-service:8081