Merge branch 'develop' of https://github.com/bunq/sdk_java into develop

angelomelonas · angelomelonas · commit fde6590351fa · 2020-09-17T12:57:20.000+02:00
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -11,7 +11,7 @@
 [//]: # (If there is a traceback please share it in a quote! You can do this by pasting the traceback text, highlighting it and pressing the quote button.)
 
 ## SDK version and environment
-- Tested on [0.12.4](https://github.com/bunq/sdk_java/releases/tag/0.12.4)
+- Tested on [1.14.1](https://github.com/bunq/sdk_java/releases/tag/1.14.1)
 - [ ] Sandbox
 - [ ] Production
 
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ version '1.14.1'
 
 apply plugin: 'java'
 apply plugin: 'maven'
-sourceCompatibility = 1.7
+sourceCompatibility = 1.8
 
 
 sourceSets {
diff --git a/src/main/java/com/bunq/sdk/context/ApiContext.java b/src/main/java/com/bunq/sdk/context/ApiContext.java
@@ -117,24 +117,31 @@ public static ApiContext create(
     /**
      * 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) {
+    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) {
+    public static ApiContext create(ApiEnvironmentType environmentType,
+                                    String apiKey,
+                                    String deviceDescription,
+                                    String proxy) {
         return create(environmentType, apiKey, deviceDescription, new ArrayList<String>(), proxy);
     }
 
     /**
      * Create and initialize an API Context.
      */
-    public static ApiContext create(ApiEnvironmentType environmentType, String apiKey,
-                                    String deviceDescription, List<String> permittedIps, String proxy) {
+    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);
diff --git a/src/main/java/com/bunq/sdk/context/BunqContext.java b/src/main/java/com/bunq/sdk/context/BunqContext.java
@@ -1,6 +1,7 @@
 package com.bunq.sdk.context;
 
 import com.bunq.sdk.exception.BunqException;
+import com.bunq.sdk.model.core.UserContextHelper;
 
 public final class BunqContext {
 
@@ -16,6 +17,7 @@ public final class BunqContext {
     public static void loadApiContext(ApiContext apiContext) {
         BunqContext.apiContext = apiContext;
         BunqContext.userContext = new UserContext(apiContext);
+        BunqContext.userContext.initMainMonetaryAccount(new UserContextHelper(apiContext));
     }
 
     public static ApiContext getApiContext() {
diff --git a/src/main/java/com/bunq/sdk/context/SessionContext.java b/src/main/java/com/bunq/sdk/context/SessionContext.java
@@ -7,6 +7,7 @@
 import com.bunq.sdk.model.generated.endpoint.UserCompany;
 import com.bunq.sdk.model.generated.endpoint.UserPaymentServiceProvider;
 import com.bunq.sdk.model.generated.endpoint.UserPerson;
+import com.bunq.sdk.util.BunqUtil;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
@@ -45,13 +46,33 @@ public class SessionContext implements java.io.Serializable {
     @SerializedName("user_id")
     private final Integer userId;
 
+    @Expose
+    @SerializedName("user_person")
+    private final UserPerson userPerson;
+
+    @Expose
+    @SerializedName("user_company")
+    private final UserCompany userCompany;
+
+    @Expose
+    @SerializedName("user_api_key")
+    private final UserApiKey userApiKey;
+
+    @Expose
+    @SerializedName("user_payment_service_provider")
+    private final UserPaymentServiceProvider userPaymentServiceProvider;
+
     /**
      * @param sessionServer Object containing the session info.
      */
     SessionContext(SessionServer sessionServer) {
         this.token = sessionServer.getSessionToken().getToken();
         this.expiryTime = calculateExpiryTime(sessionServer);
         this.userId = getUserId(sessionServer.getReferencedUser());
+        this.userPerson = sessionServer.getUserPersonOrNull();
+        this.userCompany = sessionServer.getUserCompanyOrNull();
+        this.userApiKey = sessionServer.getUserApiKeyOrNull();
+        this.userPaymentServiceProvider = sessionServer.getUserPaymentServiceProviderOrNull();
     }
 
     private int getUserId(BunqModel user) {
@@ -111,4 +132,8 @@ Date getExpiryTime() {
     public Integer getUserId() {
         return userId;
     }
+
+    public BunqModel getUserReference() {
+        return BunqUtil.getReferencedUser(userPerson, userCompany, userApiKey, userPaymentServiceProvider);
+    }
 }
diff --git a/src/main/java/com/bunq/sdk/context/UserContext.java b/src/main/java/com/bunq/sdk/context/UserContext.java
@@ -6,7 +6,6 @@
 import com.bunq.sdk.model.generated.endpoint.*;
 
 public class UserContext {
-
     /**
      * Error constants.
      */
@@ -22,7 +21,7 @@ public class UserContext {
 
     public UserContext(ApiContext apiContext) {
         this.apiContext = apiContext;
-        refreshContext();
+        initUser(this.apiContext.getSessionContext().getUserReference());
     }
 
     private void initUser(BunqModel user) {
@@ -39,19 +38,18 @@ private void initUser(BunqModel user) {
         }
     }
 
-    private void initMainMonetaryAccount(MonetaryAccountBank monetaryAccountBank) {
-        this.primaryMonetaryAccountBank = monetaryAccountBank;
+    public void initMainMonetaryAccount(UserContextHelper helper) {
+        if (this.userPaymentServiceProvider != null) {
+            return;
+        }
+
+        this.primaryMonetaryAccountBank = helper.getFirstActiveMonetaryAccountBankByUserId(getUserId());
     }
 
     public void refreshContext() {
         UserContextHelper helper = new UserContextHelper(this.apiContext);
         this.initUser(helper.getFirstUser().getReferencedObject());
-
-        if (this.userPaymentServiceProvider != null) {
-            return;
-        }
-
-        this.initMainMonetaryAccount(helper.getFirstActiveMonetaryAccountBankByUserId(getUserId()));
+        this.initMainMonetaryAccount(helper);
     }
 
     public Integer getUserId() {
diff --git a/src/main/java/com/bunq/sdk/model/core/SessionServer.java b/src/main/java/com/bunq/sdk/model/core/SessionServer.java
@@ -1,23 +1,18 @@
 package com.bunq.sdk.model.core;
 
 import com.bunq.sdk.context.ApiContext;
-import com.bunq.sdk.exception.BunqException;
 import com.bunq.sdk.http.ApiClient;
 import com.bunq.sdk.http.BunqResponse;
 import com.bunq.sdk.http.BunqResponseRaw;
 import com.bunq.sdk.model.generated.endpoint.UserApiKey;
 import com.bunq.sdk.model.generated.endpoint.UserCompany;
 import com.bunq.sdk.model.generated.endpoint.UserPaymentServiceProvider;
 import com.bunq.sdk.model.generated.endpoint.UserPerson;
+import com.bunq.sdk.util.BunqUtil;
 
 import java.util.HashMap;
 
 public class SessionServer extends BunqModel {
-    /**
-     * Error constants.
-     */
-    private static final String ERROR_ALL_FIELD_NULL = "All fields of an extended model or object are null.";
-
     /**
      * Endpoint name.
      */
@@ -94,12 +89,20 @@ public SessionToken getSessionToken() {
         return sessionToken;
     }
 
-    public UserCompany getUserCompany() {
+    public UserPerson getUserPersonOrNull() {
+        return userPerson;
+    }
+
+    public UserCompany getUserCompanyOrNull() {
         return userCompany;
     }
 
-    public UserPerson getUserPerson() {
-        return userPerson;
+    public UserApiKey getUserApiKeyOrNull() {
+        return userApiKey;
+    }
+
+    public UserPaymentServiceProvider getUserPaymentServiceProviderOrNull() {
+        return userPaymentServiceProvider;
     }
 
     @Override
@@ -124,16 +127,6 @@ public boolean isAllFieldNull() {
     }
 
     public BunqModel getReferencedUser() {
-        if (this.userCompany == null && this.userApiKey == null && this.userPerson != null && this.userPaymentServiceProvider == null) {
-            return this.userPerson;
-        } else if (this.userPerson == null && this.userApiKey == null && this.userCompany != null && this.userPaymentServiceProvider == null) {
-            return this.userCompany;
-        } else if (this.userPerson == null && this.userCompany == null && this.userApiKey != null && this.userPaymentServiceProvider == null) {
-            return this.userApiKey;
-        } else if (this.userPerson == null && this.userCompany == null && this.userApiKey == null && this.userPaymentServiceProvider != null) {
-            return this.userPaymentServiceProvider;
-        } else {
-            throw new BunqException(ERROR_ALL_FIELD_NULL);
-        }
+        return BunqUtil.getReferencedUser(userPerson, userCompany, userApiKey, userPaymentServiceProvider);
     }
 }
diff --git a/src/main/java/com/bunq/sdk/security/SecurityUtils.java b/src/main/java/com/bunq/sdk/security/SecurityUtils.java
@@ -171,7 +171,7 @@ private static String getPrivateKeyFormattedString(PrivateKey privateKey) {
     }
 
     /**
-     * @param publicKeyString X509 Public Key string
+     * @param publicKeyString  X509 Public Key string
      * @param privateKeyString PKCS8 Private Key string
      */
     public static KeyPair createKeyPairFromFormattedStrings(String publicKeyString,
@@ -538,10 +538,11 @@ public static Certificate getCertificateFromFile(String path) throws IOException
         File certificateFile = new File(path);
         if (certificateFile.exists()) {
             Certificate certificate = new Certificate();
-            certificate.setCertificate(FileUtils.readFileToString(certificateFile));
+            certificate.setCertificate(FileUtils.readFileToString(certificateFile, "UTF-8"));
             return certificate;
+        } else {
+            throw new FileNotFoundException();
         }
-        throw new FileNotFoundException();
     }
 
     private static byte[] getResponseHeadBytes(int code, List<BunqBasicHeader> headers) {
diff --git a/src/main/java/com/bunq/sdk/util/BunqUtil.java b/src/main/java/com/bunq/sdk/util/BunqUtil.java
@@ -1,10 +1,22 @@
 package com.bunq.sdk.util;
 
+import com.bunq.sdk.exception.BunqException;
+import com.bunq.sdk.model.core.BunqModel;
+import com.bunq.sdk.model.generated.endpoint.UserApiKey;
+import com.bunq.sdk.model.generated.endpoint.UserCompany;
+import com.bunq.sdk.model.generated.endpoint.UserPaymentServiceProvider;
+import com.bunq.sdk.model.generated.endpoint.UserPerson;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 public class BunqUtil {
+    /**
+     * Error constants.
+     */
+    private static final String ERROR_ALL_FIELD_NULL = "All fields of an extended model or object are null.";
+
     public static <T> T getValueFromMapOrDefault(Map<String, T> map, String key, T defaultValue) {
         return map.getOrDefault(key, defaultValue);
     }
@@ -23,4 +35,23 @@ public static List<String> getChunksFromString(String stringToSplit, int chunkSi
 
         return chunkList;
     }
+
+    public static BunqModel getReferencedUser(
+            UserPerson userPerson,
+            UserCompany userCompany,
+            UserApiKey userApiKey,
+            UserPaymentServiceProvider userPaymentServiceProvider
+    ) {
+        if (userCompany == null && userApiKey == null && userPerson != null && userPaymentServiceProvider == null) {
+            return userPerson;
+        } else if (userPerson == null && userApiKey == null && userCompany != null && userPaymentServiceProvider == null) {
+            return userCompany;
+        } else if (userPerson == null && userCompany == null && userApiKey != null && userPaymentServiceProvider == null) {
+            return userApiKey;
+        } else if (userPerson == null && userCompany == null && userApiKey == null && userPaymentServiceProvider != null) {
+            return userPaymentServiceProvider;
+        } else {
+            throw new BunqException(ERROR_ALL_FIELD_NULL);
+        }
+    }
 }
diff --git a/src/test/java/com/bunq/sdk/BunqSdkTestBase.java b/src/test/java/com/bunq/sdk/BunqSdkTestBase.java
@@ -48,7 +48,7 @@ public class BunqSdkTestBase {
     protected static final String ATTACHMENT_PATH_IN = "assets/vader.png";
     protected static final String SCHEME_HTTPS = "https://";
     protected static final String URL_PATH_SEPARATOR = "/";
-    protected static final String URL_PATH_SANDBOX_USER = "/sandbox-user";
+    protected static final String URL_PATH_SANDBOX_USER = "/sandbox-user-person";
     protected static final String CURRENCY_EUR = "EUR";
     protected static final String ACCOUNT_DESCRIPTION = "test account java";
     protected static final String SPENDING_MONEY_AMOUNT = "500";
diff --git a/src/test/java/com/bunq/sdk/context/UserContextTest.java b/src/test/java/com/bunq/sdk/context/UserContextTest.java
@@ -1,6 +1,7 @@
 package com.bunq.sdk.context;
 
 import com.bunq.sdk.BunqSdkTestBase;
+import com.bunq.sdk.model.core.UserContextHelper;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
@@ -9,9 +10,10 @@ public class UserContextTest extends BunqSdkTestBase {
 
     @Test
     public void buildUserContext() {
-        ApiContext context = getApiContext();
+        ApiContext apiContext = getApiContext();
 
-        UserContext userContext = new UserContext(context);
+        UserContext userContext = new UserContext(apiContext);
+        userContext.initMainMonetaryAccount(new UserContextHelper(apiContext));
 
         assertNotNull(userContext.getUserId());
         assertNotNull(userContext.getMainMonetaryAccountId());
