Merge pull request #99 from Adyen/feature/CheckoutAPI_PW_422

Feature/checkout api pw 422

Author: rkewlani

.gitignore

@@ -1,2 +1,4 @@
 .idea
 *.iml
+/target/**
+.DS_Store

src/main/java/com/adyen/ApiKeyAuthenticatedService.java

@@ -0,0 +1,33 @@
+/*
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Java API Library
+ *
+ * Copyright (c) 2018 Adyen B.V.
+ * This file is open source and available under the MIT license.
+ * See the LICENSE file for more info.
+ */
+package com.adyen;
+
+/**
+ * <h1>ApiKeyAuthenticatedService</h1>
+ * The ApiKeyAuthenticatedService is an interface to enable a child service to support API key authentication feature.
+ */
+public class ApiKeyAuthenticatedService extends Service {
+
+    protected ApiKeyAuthenticatedService(Client client) {
+        super(client);
+        setApiKeyRequired(true);
+    }
+}

src/main/java/com/adyen/Client.java

@@ -41,6 +41,10 @@ public class Client {
     public static final String MARKETPAY_NOTIFICATION_API_VERSION = "v1";
     public static final String USER_AGENT_SUFFIX = "adyen-java-api-library/";
     public static final String LIB_VERSION = "1.4.1";
+    public static final String CHECKOUT_ENDPOINT_TEST = "https://checkout-test.adyen.com";
+    public static final String CHECKOUT_ENDPOINT_LIVE = "https://checkout-live.adyen.com";
+    public static final String CHECKOUT_API_VERSION = "v32";
+    public static final String CHECKOUT_UTILITY_API_VERSION = "v1";
 
     public Client() {
         this.config = new Config();
@@ -66,11 +70,14 @@ public void setEnvironment(Environment environment) {
             this.config.setEndpoint(ENDPOINT_TEST);
             this.config.setMarketPayEndpoint(MARKETPAY_ENDPOINT_TEST);
             this.config.setHppEndpoint(HPP_TEST);
+            this.config.setCheckoutEndpoint(CHECKOUT_ENDPOINT_TEST);
+
         } else if (environment.equals(Environment.LIVE)) {
             this.config.setEnvironment(environment);
             this.config.setEndpoint(ENDPOINT_LIVE);
             this.config.setMarketPayEndpoint(MARKETPAY_ENDPOINT_LIVE);
             this.config.setHppEndpoint(HPP_LIVE);
+            this.config.setCheckoutEndpoint(CHECKOUT_ENDPOINT_LIVE);
         } else {
             // throw exception
         }

src/main/java/com/adyen/Config.java

@@ -14,7 +14,7 @@
  *
  * Adyen Java API Library
  *
- * Copyright (c) 2017 Adyen B.V.
+ * Copyright (c) 2018 Adyen B.V.
  * This file is open source and available under the MIT license.
  * See the LICENSE file for more info.
  */
@@ -30,12 +30,17 @@ public class Config {
     protected String endpoint;
     protected String marketPayEndpoint;
     protected String applicationName;
+    protected String apiKey;
 
     //HPP specific
     protected String hppEndpoint;
     protected String skinCode;
     protected String hmacKey;
 
+    //Checkout Specific
+    protected String checkoutEndpoint;
+
+
     public Config() {
         // do nothing
     }
@@ -96,6 +101,14 @@ public void setApplicationName(String applicationName) {
         this.applicationName = applicationName;
     }
 
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
     public String getHppEndpoint() {
         return hppEndpoint;
     }
@@ -119,4 +132,14 @@ public String getHmacKey() {
     public void setHmacKey(String hmacKey) {
         this.hmacKey = hmacKey;
     }
+
+    public String getCheckoutEndpoint() {
+        return checkoutEndpoint;
+    }
+
+    public void setCheckoutEndpoint(String checkoutEndpoint) {
+        this.checkoutEndpoint = checkoutEndpoint;
+    }
+
+
 }

src/main/java/com/adyen/Service.java

@@ -1,4 +1,4 @@
-/**
+/*
  *                       ######
  *                       ######
  * ############    ####( ######  #####. ######  ############   ############
@@ -14,30 +14,38 @@
  *
  * Adyen Java API Library
  *
- * Copyright (c) 2017 Adyen B.V.
+ * Copyright (c) 2018 Adyen B.V.
  * This file is open source and available under the MIT license.
  * See the LICENSE file for more info.
  */
 package com.adyen;
 
 import com.google.gson.Gson;
 
-public class Service{
-	
-	protected static final Gson GSON = new Gson();
-	
-	private Client client;
-	
-	protected Service(Client client){
-		this.client = client;
-	}
-		
-	public Client getClient() {
-		return client;
-	}
-
-	public void setClient(Client client) {
-		this.client = client;
-	}
-	
+public class Service {
+
+    protected static final Gson GSON = new Gson();
+    protected boolean isApiKeyRequired = false;
+    private Client client;
+
+    protected Service(Client client) {
+        this.client = client;
+    }
+
+    public Client getClient() {
+        return client;
+    }
+
+    public void setClient(Client client) {
+        this.client = client;
+    }
+
+    public boolean isApiKeyRequired() {
+        return isApiKeyRequired;
+    }
+
+    public void setApiKeyRequired(boolean apiKeyRequired) {
+        isApiKeyRequired = apiKeyRequired;
+    }
+
 }

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

@@ -1,4 +1,4 @@
-/**
+/*
  *                       ######
  *                       ######
  * ############    ####( ######  #####. ######  ############   ############
@@ -14,19 +14,20 @@
  *
  * Adyen Java API Library
  *
- * Copyright (c) 2017 Adyen B.V.
+ * Copyright (c) 2018 Adyen B.V.
  * This file is open source and available under the MIT license.
  * See the LICENSE file for more info.
  */
 package com.adyen.httpclient;
 
+import com.adyen.Config;
+
 import java.io.IOException;
 import java.util.Map;
-import com.adyen.Config;
 
 public interface ClientInterface {
 
-	String request(String endpoint, String json, Config config) throws IOException, HTTPClientException;
-
-	String post(String endpoint, Map<String, String> postParameters, Config config) throws IOException, HTTPClientException;
+    String request(String endpoint, String json, Config config) throws IOException, HTTPClientException;
+    String request(String endpoint, String json, Config config, boolean isApiKeyRequired) throws IOException, HTTPClientException;
+    String post(String endpoint, Map<String, String> postParameters, Config config) throws IOException, HTTPClientException;
 }

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

@@ -20,6 +20,10 @@
  */
 package com.adyen.httpclient;
 
+import com.adyen.Client;
+import com.adyen.Config;
+import org.apache.commons.codec.binary.Base64;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -30,24 +34,33 @@
 import java.net.URLEncoder;
 import java.util.Map;
 import java.util.Scanner;
-import org.apache.commons.codec.binary.Base64;
-import com.adyen.Client;
-import com.adyen.Config;
 
 public class HttpURLConnectionClient implements ClientInterface {
     private static final String CHARSET = "UTF-8";
     private Proxy proxy;
 
+    /**
+     * Does a POST request.
+     * config is used to obtain basic auth username, password and User-Agent
+     */
     /**
      * Does a POST request.
      * config is used to obtain basic auth username, password and User-Agent
      */
     @Override
     public String request(String requestUrl, String requestBody, Config config) throws IOException, HTTPClientException {
+        return request(requestUrl, requestBody, config, false);
+    }
+
+    @Override
+    public String request(String requestUrl, String requestBody, Config config, boolean isApiKeyRequired) throws IOException, HTTPClientException {
         HttpURLConnection httpConnection = createRequest(requestUrl, config.getApplicationName());
-        setBasicAuthentication(httpConnection, config.getUsername(), config.getPassword());
+        if (isApiKeyRequired) {
+            setApiKey(httpConnection, config.getApiKey());
+        } else {
+            setBasicAuthentication(httpConnection, config.getUsername(), config.getPassword());
+        }
         setContentType(httpConnection, "application/json");
-
         String response = doPostRequest(httpConnection, requestBody);
 
         return response;
@@ -140,6 +153,16 @@ private HttpURLConnection setContentType(HttpURLConnection httpConnection, Strin
         return httpConnection;
     }
 
+    /**
+     * Sets api key
+     */
+    private HttpURLConnection setApiKey(HttpURLConnection httpConnection, String apiKey) {
+        if (apiKey != null && !apiKey.isEmpty()) {
+            httpConnection.setRequestProperty("x-api-key", apiKey);
+        }
+        return httpConnection;
+    }
+
     /**
      * Does a POST request with raw body
      */