Add support for WWW-Authenticate header

Author: gcatanese

src/main/java/com/adyen/constants/ApiConstants.java

@@ -109,6 +109,7 @@ interface RequestProperty {
     String API_KEY = "x-api-key";
     String APPLICATION_JSON_TYPE = "application/json";
     String REQUESTED_VERIFICATION_CODE_HEADER = "x-requested-verification-code";
+    String WWW_AUTHENTICATE_HEADER = "WWW-Authenticate";
   }
 
   interface ThreeDS2Property {

src/main/java/com/adyen/httpclient/AdyenHttpClient.java

@@ -30,6 +30,7 @@
 import static com.adyen.constants.ApiConstants.RequestProperty.IDEMPOTENCY_KEY;
 import static com.adyen.constants.ApiConstants.RequestProperty.REQUESTED_VERIFICATION_CODE_HEADER;
 import static com.adyen.constants.ApiConstants.RequestProperty.USER_AGENT;
+import static com.adyen.constants.ApiConstants.RequestProperty.WWW_AUTHENTICATE_HEADER;
 
 import com.adyen.Client;
 import com.adyen.Config;
@@ -199,6 +200,10 @@ private void setHeaders(
             REQUESTED_VERIFICATION_CODE_HEADER,
             requestOptions.getRequestedVerificationCodeHeader());
       }
+      if (requestOptions.getWwwAuthenticateHeader() != null) {
+        httpUriRequest.addHeader(
+            WWW_AUTHENTICATE_HEADER, requestOptions.getWwwAuthenticateHeader());
+      }
 
       if (requestOptions.getAdditionalServiceHeaders() != null) {
         requestOptions.getAdditionalServiceHeaders().forEach(httpUriRequest::addHeader);

src/main/java/com/adyen/model/RequestOptions.java

@@ -5,6 +5,7 @@
 public class RequestOptions {
   private String idempotencyKey;
   private String requestedVerificationCodeHeader;
+  private String wwwAuthenticateHeader;
   private HashMap<String, String> additionalServiceHeaders;
 
   public RequestOptions idempotencyKey(String idempotencyKey) {
@@ -17,11 +18,24 @@ public RequestOptions requestedVerificationCodeHeader(String requestedVerificati
     return this;
   }
 
+  public RequestOptions wwwAuthenticateHeader(String wwwAuthenticateHeader) {
+    this.wwwAuthenticateHeader = wwwAuthenticateHeader;
+    return this;
+  }
+
   public RequestOptions additionalServiceHeaders(HashMap<String, String> additionalServiceHeaders) {
     this.additionalServiceHeaders = additionalServiceHeaders;
     return this;
   }
 
+  public RequestOptions addAdditionalServiceHeader(String key, String value) {
+    if (this.additionalServiceHeaders == null) {
+      this.additionalServiceHeaders = new HashMap<>();
+    }
+    this.additionalServiceHeaders.put(key, value);
+    return this;
+  }
+
   public String getIdempotencyKey() {
     return idempotencyKey;
   }
@@ -46,6 +60,14 @@ public void setAdditionalServiceHeaders(HashMap<String, String> additionalServic
     this.additionalServiceHeaders = additionalServiceHeaders;
   }
 
+  public String getWwwAuthenticateHeader() {
+    return wwwAuthenticateHeader;
+  }
+
+  public void setWwwAuthenticateHeader(String wwwAuthenticateHeader) {
+    this.wwwAuthenticateHeader = wwwAuthenticateHeader;
+  }
+
   @Override
   public String toString() {
     return "RequestOptions{"
@@ -55,6 +77,9 @@ public String toString() {
         + ", requestedVerificationCodeHeader='"
         + requestedVerificationCodeHeader
         + '\''
+        + ", wwwAuthenticateHeader='"
+        + wwwAuthenticateHeader
+        + '\''
         + ", additionalServiceHeaders="
         + additionalServiceHeaders
         + '}';

src/test/java/com/adyen/httpclient/ClientTest.java

@@ -139,6 +139,17 @@ public void testRequestOptionsBuilderPattern() {
     assertEquals(requestOptions.getAdditionalServiceHeaders(), map);
   }
 
+  @Test
+  public void testRequestOptionsAddAdditionalServiceHeader() {
+    RequestOptions requestOptions =
+        new RequestOptions()
+            .addAdditionalServiceHeader("key1", "value1")
+            .addAdditionalServiceHeader("key2", "value2")
+            .addAdditionalServiceHeader("key3", "value3");
+    assertNotNull(requestOptions.getAdditionalServiceHeaders());
+    assertEquals(3, requestOptions.getAdditionalServiceHeaders().size());
+  }
+
   @Test
   public void testUserAgentWithApplicationName() throws Exception {
 
@@ -186,6 +197,7 @@ public void testRequestWithHttpHeaders() throws Exception {
     RequestOptions requestOptions =
         new RequestOptions()
             .idempotencyKey("test-idempotency-key")
+            .wwwAuthenticateHeader("www-authenticate-header")
             .additionalServiceHeaders(additionalHeaders);
 
     HttpUriRequestBase request =
@@ -205,5 +217,9 @@ public void testRequestWithHttpHeaders() throws Exception {
     Header customHeader = request.getFirstHeader("X-Custom-Header");
     assertNotNull(customHeader);
     assertEquals("custom-value", customHeader.getValue());
+
+    Header wwwAuthenticate = request.getFirstHeader("WWW-Authenticate");
+    assertNotNull(wwwAuthenticate);
+    assertEquals("www-authenticate-header", wwwAuthenticate.getValue());
   }
 }