fix: cookie on http response with status code

postfinance · Nov 21, 2023 · 93e85c2 · 93e85c2
1 parent 1ff9c14
commit 93e85c2
Show file tree

Hide file tree

Showing 2 changed files with 166 additions and 200 deletions.
diff --git a/...ints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessageConverter.java b/...ints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessageConverter.java
@@ -20,6 +20,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import jakarta.servlet.http.Cookie;
@@ -54,6 +55,10 @@ public HttpMessageConverter(CookieConverter cookieConverter) {
         this.cookieConverter = cookieConverter;
     }
 
+    private static String resolveCookieValue(TestContext context, Cookie cookie) {
+        return Objects.isNull(context) ? cookie.getValue() : context.replaceDynamicContentInString(cookie.getValue());
+    }
+
     @Override
     public HttpEntity<?> convertOutbound(Message message,
                                          HttpEndpointConfiguration endpointConfiguration,
@@ -63,15 +68,15 @@ public HttpEntity<?> convertOutbound(Message message,
 
         HttpHeaders httpHeaders = createHttpHeaders(httpMessage, endpointConfiguration);
 
+        for (Cookie cookie : httpMessage.getCookies()) {
+            httpHeaders.add(
+                    HttpHeaders.COOKIE,
+                    cookie.getName() + "=" + resolveCookieValue(context, cookie));
+        }
+
         Object payload = httpMessage.getPayload();
         if (httpMessage.getStatusCode() != null) {
             return new ResponseEntity<>(payload, httpHeaders, httpMessage.getStatusCode());
-        } else {
-            for (Cookie cookie : httpMessage.getCookies()) {
-                httpHeaders.add(
-                        HttpHeaders.COOKIE,
-                        cookie.getName() + "=" + context.replaceDynamicContentInString(cookie.getValue()));
-            }
         }
 
         RequestMethod method = determineRequestMethod(endpointConfiguration, httpMessage);