Merge pull request #12 from bunq/11-proxy

Add proxy support and missing .gitignore entry [#11]

Author: OGKevin

src/main/java/com/bunq/sdk/context/ApiContext.java

@@ -82,6 +82,10 @@ public class ApiContext implements java.io.Serializable {
   @SerializedName("session_context")
   private SessionContext sessionContext;
 
+  @Expose
+  @SerializedName("proxy")
+  private String proxy;
+
   /**
    * Create an empty API context.
    */
@@ -91,19 +95,36 @@ private ApiContext(ApiEnvironmentType environmentType, String apiKey) {
   }
 
   /**
-   * Create and initialize an API Context with current IP as permitted.
+   * Create and initialize an API Context with current IP as permitted and no proxy.
    */
   public static ApiContext create(ApiEnvironmentType environmentType, String apiKey,
       String deviceDescription) {
     return create(environmentType, apiKey, deviceDescription, new ArrayList<>());
   }
 
   /**
-   * Create and initialize an API Context.
+   * Create and initialize an API Context with given permitted ips and no proxy.
    */
   public static ApiContext create(ApiEnvironmentType environmentType, String apiKey,
       String deviceDescription, List<String> permittedIps) {
+    return create(environmentType, apiKey, deviceDescription, permittedIps, null);
+  }
+
+  /**
+   * Create and initialize an API Context with current IP as permitted and a proxy.
+   */
+  public static ApiContext create(ApiEnvironmentType environmentType, String apiKey,
+      String deviceDescription, String proxy) {
+    return create(environmentType, apiKey, deviceDescription, new ArrayList<>(), proxy);
+  }
+
+  /**
+   * Create and initialize an API Context.
+   */
+  public static ApiContext create(ApiEnvironmentType environmentType, String apiKey,
+      String deviceDescription, List<String> permittedIps, String proxy) {
     ApiContext apiContext = new ApiContext(environmentType, apiKey);
+    apiContext.proxy = proxy;
     apiContext.initialize(deviceDescription, permittedIps);
 
     return apiContext;
@@ -289,4 +310,8 @@ public SessionContext getSessionContext() {
     return sessionContext;
   }
 
+  public String getProxy() {
+    return proxy;
+  }
+
 }

src/main/java/com/bunq/sdk/http/ApiClient.java

@@ -11,7 +11,9 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
+import com.sun.jndi.toolkit.url.Uri;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
@@ -21,6 +23,7 @@
 import java.util.Map;
 import java.util.UUID;
 import org.apache.http.Header;
+import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -33,6 +36,7 @@
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.entity.ContentType;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.util.EntityUtils;
@@ -96,13 +100,28 @@ private CloseableHttpClient buildHttpClient() {
       SSLContextBuilder builder = new SSLContextBuilder();
       SSLConnectionSocketFactory sslConnectionSocketFactory =
           new SSLConnectionSocketFactory(builder.build());
+      HttpClientBuilder httpClientBuilder = HttpClients
+          .custom()
+          .setSSLSocketFactory(sslConnectionSocketFactory);
+      setProxyIfNeeded(httpClientBuilder);
 
-      return HttpClients.custom().setSSLSocketFactory(sslConnectionSocketFactory).build();
-    } catch (NoSuchAlgorithmException | KeyManagementException exception) {
+      return httpClientBuilder.build();
+    } catch (NoSuchAlgorithmException | KeyManagementException | MalformedURLException exception) {
       throw new UncaughtExceptionError(exception);
     }
   }
 
+  private void setProxyIfNeeded(HttpClientBuilder httpClientBuilder)
+      throws MalformedURLException {
+    String proxyString = apiContext.getProxy();
+
+    if (proxyString != null) {
+      Uri proxyUri = new Uri(proxyString);
+      HttpHost proxy = new HttpHost(proxyUri.getHost(), proxyUri.getPort(), proxyUri.getScheme());
+      httpClientBuilder.setProxy(proxy);
+    }
+  }
+
   /**
    * Execute a POST request.
    *