Merge pull request #101 from tubbynl/develop-100-ApiEnvironmentType

#100 moved pinnedKey to ApiEnvironmentType

Author: OGKevin

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

@@ -5,21 +5,18 @@
 import com.bunq.sdk.model.core.DeviceServerInternal;
 import com.bunq.sdk.model.core.Installation;
 import com.bunq.sdk.model.core.SessionServer;
-import com.bunq.sdk.model.generated.endpoint.DeviceServer;
 import com.bunq.sdk.model.generated.endpoint.Session;
 import com.bunq.sdk.security.SecurityUtils;
 import com.google.gson.Gson;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import org.apache.commons.io.FileUtils;
 import java.io.File;
 import java.io.IOException;
 import java.security.KeyPair;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import org.apache.commons.io.FileUtils;
 
 /**
  * The context to make the API calls in. Consists of:
@@ -228,7 +225,7 @@ public boolean ensureSessionActive() {
 
   public boolean isSessionActive() {
     return sessionContext != null &&
-      getTimeToSessionExpiryInSeconds() < TIME_TO_SESSION_EXPIRY_MINIMUM_SECONDS;
+      getTimeToSessionExpiryInSeconds() > TIME_TO_SESSION_EXPIRY_MINIMUM_SECONDS;
   }
 
   private long getTimeToSessionExpiryInSeconds() {

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

@@ -5,18 +5,28 @@
  */
 public enum ApiEnvironmentType {
 
-  PRODUCTION("api.bunq.com", "v1"),
-  SANDBOX("public-api.sandbox.bunq.com", "v1");
+  PRODUCTION(
+      "api.bunq.com",
+      "v1",
+      "sha256/nI/T/sDfioCBHB5mVppDPyLi2HXYanwk2arpZuHLOu0="
+  ),
+  SANDBOX(
+      "public-api.sandbox.bunq.com",
+      "v1",
+      "sha256/GhNvDokiMyXzhGft+xXWFGchUmmh8R5dQEnO4xu81NY="
+  );
 
   /**
    * Base URI of each given environment.
    */
-  private String baseUri;
-  private String apiVersion;
+  private final String baseUri;
+  private final String apiVersion;
+  private final String pinnedKey;
 
-  ApiEnvironmentType(String baseUri, String apiVersion) {
+  ApiEnvironmentType(String baseUri, String apiVersion, String pinnedKey) {
     this.baseUri = baseUri;
     this.apiVersion = apiVersion;
+    this.pinnedKey = pinnedKey;
   }
 
   /**
@@ -30,4 +40,8 @@ public String getApiVersion() {
     return this.apiVersion;
   }
 
-}
+  public String getPinnedKey() {
+    return pinnedKey;
+  }
+
+}

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

@@ -1,6 +1,7 @@
 package com.bunq.sdk.http;
 
 import com.bunq.sdk.context.ApiContext;
+import com.bunq.sdk.context.ApiEnvironmentType;
 import com.bunq.sdk.context.BunqContext;
 import com.bunq.sdk.context.InstallationContext;
 import com.bunq.sdk.exception.ApiException;
@@ -46,8 +47,10 @@ public class ApiClient {
   /**
    * Error constants.
    */
-  private static final String ERROR_AMI_ENVIRONMENT_NOT_EXPECTED = "ApiEnvironment type \"%s\" is unexpected";
-  private static final String ERROR_COULD_NOT_DETERMINE_RESPONSE_ID = "Could not determine response id.";
+  private static final String ERROR_COULD_NOT_DETERMINE_PINNED_KEY =
+      "Could not determine pinned key.";
+  private static final String ERROR_COULD_NOT_DETERMINE_RESPONSE_ID =
+      "Could not determine response id.";
 
   /**
    * Endpoints not requiring active session for the request to succeed.
@@ -97,12 +100,6 @@ public class ApiClient {
   public static final String GEOLOCATION_ZERO = "0 0 0 0 000";
   private static final String SCHEME_HTTPS = "https";
 
-  /**
-   * Pinned keys.
-   */
-  private static final String PINNED_KEY_SANDBOX = "sha256/GhNvDokiMyXzhGft+xXWFGchUmmh8R5dQEnO4xu81NY=";
-  private static final String PINNED_KEY_PRODUCTION = "sha256/nI/T/sDfioCBHB5mVppDPyLi2HXYanwk2arpZuHLOu0=";
-
   /**
    * Time out constants.
    */
@@ -134,7 +131,9 @@ private OkHttpClient buildOkHttpClient() {
     OkHttpClient.Builder clientBuilder;
 
     clientBuilder = new OkHttpClient().newBuilder()
-        .certificatePinner(determineCertificateToPin())
+        .certificatePinner(
+                determineCertificateToPin(this.apiContext.getEnvironmentType())
+        )
         .connectTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
         .readTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
         .writeTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS);
@@ -156,24 +155,16 @@ private void setProxyIfNeeded(OkHttpClient.Builder httpClientBuilder) {
     }
   }
 
-  /**
-   */
-  private CertificatePinner determineCertificateToPin() {
-    CertificatePinner.Builder certificateBuilder = new CertificatePinner.Builder();
-
-    switch (apiContext.getEnvironmentType()) {
-      case PRODUCTION:
-        return certificateBuilder.add(
-            apiContext.getBaseUri(), PINNED_KEY_PRODUCTION
-        ).build();
-      case SANDBOX:
-        return certificateBuilder.add(
-            apiContext.getBaseUri(), PINNED_KEY_SANDBOX
-        ).build();
-      default:
-        throw new BunqException(
-            String.format(ERROR_AMI_ENVIRONMENT_NOT_EXPECTED, apiContext.getEnvironmentType().toString())
-        );
+  private static CertificatePinner determineCertificateToPin(ApiEnvironmentType environmentType) {
+    if (environmentType != null && environmentType.getPinnedKey() != null) {
+      return new CertificatePinner.Builder()
+          .add(
+              environmentType.getBaseUri(),
+              environmentType.getPinnedKey()
+          )
+          .build();
+    } else {
+      throw new BunqException(ERROR_COULD_NOT_DETERMINE_PINNED_KEY);
     }
   }
 

src/test/java/com/bunq/sdk/http/PaginationScenarioTest.java

@@ -1,18 +1,15 @@
 package com.bunq.sdk.http;
 
 import com.bunq.sdk.BunqSdkTestBase;
-import com.bunq.sdk.Config;
-import com.bunq.sdk.context.ApiContext;
 import com.bunq.sdk.json.BunqGsonBuilder;
 import com.bunq.sdk.model.generated.endpoint.Payment;
+import com.bunq.sdk.model.generated.endpoint.PaymentBatch;
 import com.bunq.sdk.model.generated.object.Amount;
-import com.bunq.sdk.model.generated.object.Pointer;
 import com.google.gson.Gson;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -42,9 +39,14 @@ public class PaginationScenarioTest extends BunqSdkTestBase {
   private static Gson gson = BunqGsonBuilder.buildDefault().create();
 
   private static void EnsureEnoughPayments() {
-    for (int i = NUMBER_ZERO; i < GetPaymentsMissingCount(); ++i) {
-      CreatePayment();
+    int missingPaymentCount = GetPaymentsMissingCount();
+    List<Payment> allPayment = new ArrayList<>();
+
+    for (int i = NUMBER_ZERO; i < missingPaymentCount; ++i) {
+      allPayment.add(createPayment());
     }
+
+    PaymentBatch.create(allPayment);
   }
 
   private static int GetPaymentsMissingCount() {
@@ -62,8 +64,12 @@ private static BunqResponse<List<Payment>> ListPayments(Map<String, String> urlP
     return Payment.list(null, urlParams);
   }
 
-  private static void CreatePayment() {
-    Payment.create(new Amount(PAYMENT_AMOUNT_EUR, PAYMENT_CURRENCY), getPointerBravo(), PAYMENT_DESCRIPTION);
+  private static Payment createPayment() {
+    return new Payment(
+        new Amount(PAYMENT_AMOUNT_EUR, PAYMENT_CURRENCY),
+        getPointerBravo(),
+        PAYMENT_DESCRIPTION
+    );
   }
 
   @Test
@@ -87,4 +93,5 @@ public void apiScenarioPaymentListingWithPaginationTest() {
 
     Assert.assertEquals(allPaymentExpectedSerialized, allPaymentActualSerialized);
   }
+
 }

src/test/java/com/bunq/sdk/model/generated/endpoint/SessionTest.java

@@ -3,6 +3,7 @@
 import com.bunq.sdk.BunqSdkTestBase;
 import com.bunq.sdk.context.BunqContext;
 import com.bunq.sdk.context.SessionContext;
+import com.bunq.sdk.exception.ApiException;
 import com.bunq.sdk.exception.BunqException;
 import com.bunq.sdk.exception.ForbiddenException;
 import org.junit.After;
@@ -30,9 +31,15 @@ public class SessionTest extends BunqSdkTestBase {
   public void deleteSessionTest() {
     SessionContext context = BunqContext.getApiContext().getSessionContext();
     Session.delete(SESSION_ID_DUMMY);
-    User.list();
+    ApiException bunqException = null;
 
-    Assert.assertNotEquals(context, BunqContext.getApiContext().getSessionContext());
+    try {
+      User.list();
+    } catch (ForbiddenException exception) {
+      bunqException = exception;
+    }
+
+    Assert.assertNotNull(bunqException);
   }
 
   /**