Merge branch 'v3.x.x' into reboot/fix/gradle-release-version-3.1.5-sn…

…apshot Signed-off-by: Pavel Jareš <[email protected]>
zowe · Jan 24, 2025 · faa70df · faa70df
2 parents 6dc9a94 + eb66a46
commit faa70df
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/api-catalog-ui/frontend/.env b/api-catalog-ui/frontend/.env
@@ -7,4 +7,4 @@ REACT_APP_STATUS_UPDATE_MAX_RETRIES=10
 REACT_APP_STATUS_UPDATE_DEBOUNCE=300
 REACT_APP_CA_ENV=false
 REACT_APP_STATUS_UPDATE_SCALING_DURATION=1000
-REACT_APP_ZOWE_BUILD_INFO=3.2.0-SNAPSHOT
+REACT_APP_ZOWE_BUILD_INFO=3.2.2-SNAPSHOT
diff --git a/gateway-service/src/main/java/org/zowe/apiml/gateway/filters/RequestAttributesProvider.java b/gateway-service/src/main/java/org/zowe/apiml/gateway/filters/RequestAttributesProvider.java
@@ -17,6 +17,7 @@
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.core.Ordered;
 import org.springframework.http.server.reactive.AbstractServerHttpRequest;
+import org.springframework.http.server.reactive.ServerHttpRequestDecorator;
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebFilter;
@@ -27,8 +28,18 @@
 @Component
 public class RequestAttributesProvider implements WebFilter, GlobalFilter, Ordered {
 
+    private <R> R getRequest(ServerWebExchange exchange) {
+        Object request = exchange.getRequest();
+        while (request instanceof ServerHttpRequestDecorator) {
+            Object delegatedRequest = ((ServerHttpRequestDecorator) request).getDelegate();
+            if (request == delegatedRequest) break;
+            request = delegatedRequest;
+        }
+        return (R) request;
+    }
+
     private void copyAttributes(ServerWebExchange exchange) {
-        AbstractServerHttpRequest request = (AbstractServerHttpRequest) exchange.getRequest();
+        AbstractServerHttpRequest request = getRequest(exchange);
         RequestFacade requestFacade;
         try {
             requestFacade = request.getNativeRequest();
@@ -56,7 +67,7 @@ public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
 
     @Override
     public int getOrder() {
-        return Ordered.HIGHEST_PRECEDENCE;
+        return Ordered.HIGHEST_PRECEDENCE + 1;
     }
 
 }
diff --git a/...y-service/src/test/java/org/zowe/apiml/gateway/filters/RequestAttributesProviderTest.java b/...y-service/src/test/java/org/zowe/apiml/gateway/filters/RequestAttributesProviderTest.java
@@ -61,8 +61,8 @@ void givenRequestWithAttributes_whenFilter_thenCopyJustMissing(String filterName
     }
 
     @Test
-    void givenRequestAttributesProvider_whenOrder_thenIsTheFirstOne() {
-        assertEquals(Integer.MIN_VALUE, new RequestAttributesProvider().getOrder());
+    void givenRequestAttributesProvider_whenOrder_thenIsTheFirstOneAfterWritableHeaders() {
+        assertEquals(Integer.MIN_VALUE + 1, new RequestAttributesProvider().getOrder());
     }
 
     @ParameterizedTest(name = "givenMockRequest_whenFilter_thenDoNoCrash with {0}")
@@ -75,4 +75,4 @@ void givenMockRequest_whenFilter_thenDoNoCrash(String filterName, BiConsumer<Req
         assertDoesNotThrow(() -> filter.accept(requestAttributesProvider, exchange));
     }
 
-}
+}
diff --git a/onboarding-enabler-nodejs/package-lock.json b/onboarding-enabler-nodejs/package-lock.json
diff --git a/onboarding-enabler-nodejs/package.json b/onboarding-enabler-nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zowe/apiml-onboarding-enabler-nodejs",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "NodeJS enabler for Zowe API Mediation Layer",
   "type": "module",
   "main": "src/index.js",