Merge branch 'release/1.14.1'

Author: angelomelonas

.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_csharp/releases/tag/0.12.4)
+- Tested on [1.14.0](https://github.com/bunq/sdk_csharp/releases/tag/1.14.0)
 - [ ] Sandbox
 - [ ] Production
 

.idea/.idea.BunqSdk/.idea/contentModel.xml

@@ -1,7 +1,7 @@
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Threading;
 using Bunq.Sdk.Context;
 using Bunq.Sdk.Exception;
 using Bunq.Sdk.Json;
@@ -37,39 +37,39 @@ public class BunqSdkTestBase
         /// Constants for monetary account.
         /// </summary>
         protected const string MonetaryAccountDescription = "Test C# monetary account";
-        
+
         /// <summary>
         /// Image constants.
         /// </summary>
         protected const string PathAttachment = "../../../Resources";
         protected const string ContentType = "image/png";
         protected const string AttachmentDescription = "C# sdk image test.";
         protected const string AttachmentPathIn = "/vader.png";
-        
+
         /// <summary>
         /// Device registration constants.
         /// </summary>
         private const string DeviceDescription = "Csharp test device";
-        
+
         /// <summary>
         /// Pointer type constants.
         /// </summary>
         private const string PointerTypeEmail = "EMAIL";
-        
+
         /// <summary>
         /// Email constants.
         /// </summary>
         private const string EmailBravo = "[email protected]";
         private const string EmailSuggarDaddy = "[email protected]";
-        
+
         /// <summary>
         /// Spending money constants.
         /// </summary>
         private const string SpendingMoneyAmount = "50.00";
         private const string SpendingMoneyRequestDescription = "sdk c# test, thanks daddy.";
 
         protected static MonetaryAccountBank SecondMonetaryAccountBank;
-        
+
         /// <summary>
         /// Gets an Api Context, re-creates if needed and returns it.
         /// </summary>
@@ -78,7 +78,7 @@ protected static void SetUpTestCase()
             SetUpApiContext();
             SecondMonetaryAccountBank = SetUpSecondMonetaryAccount();
             RequestSpendingMoney();
-            System.Threading.Thread.Sleep(500); // ensure requests are auto accepted.
+            Thread.Sleep(500); // ensure requests are auto accepted.
             BunqContext.UserContext.RefreshUserContext();
         }
 
@@ -96,12 +96,12 @@ protected static ApiContext SetUpApiContext()
                 var sandboxUser = GenerateNewSandboxUser();
                 apiContext = ApiContext.Create(ApiEnvironmentType.SANDBOX, sandboxUser.ApiKey, DeviceDescription);
             }
-            
+
             BunqContext.LoadApiContext(apiContext);
 
             return apiContext;
         }
-        
+
         private static SandboxUser GenerateNewSandboxUser()
         {
             var httpClient = new HttpClient();
@@ -117,7 +117,7 @@ private static SandboxUser GenerateNewSandboxUser()
 
             var responseString = requestTask.Result.Content.ReadAsStringAsync().Result;
             var responseJson = BunqJsonConvert.DeserializeObject<JObject>(responseString);
-            
+
             return BunqJsonConvert.DeserializeObject<SandboxUser>(responseJson.First.First.First.First.First
                 .ToString());
         }
@@ -136,38 +136,38 @@ private static void RequestSpendingMoney()
                 new Pointer(PointerTypeEmail, EmailSuggarDaddy),
                 SpendingMoneyRequestDescription,
                 false
-                );
-            
+            );
+
             RequestInquiry.Create(
                 new Amount(SpendingMoneyAmount, PaymentCurrency),
                 new Pointer(PointerTypeEmail, EmailSuggarDaddy),
                 SpendingMoneyRequestDescription,
                 false,
                 SecondMonetaryAccountBank.Id
-                );
+            );
         }
 
         protected static Pointer GetPointerBravo()
         {
             return new Pointer(PointerTypeEmail, EmailBravo);
         }
-        
+
         protected static Pointer GetAlias()
         {
-            var userContex = BunqContext.UserContext;
+            var userContext = BunqContext.UserContext;
 
-            if (userContex.IsOnlyUserPersonSet())
+            if (userContext.IsOnlyUserPersonSet())
             {
-                return userContex.UserPerson.Alias.First();
+                return userContext.UserPerson.Alias.First();
             }
-            else if (userContex.IsOnlyUserCompanySet())
+            else if (userContext.IsOnlyUserCompanySet())
             {
-                return userContex.UserCompany.Alias.First();
+                return userContext.UserCompany.Alias.First();
             }
             else
             {
                 throw new BunqException(ErrorCouldNotDetermineUserAlias);
             }
         }
     }
-}
+}

BunqSdk.Tests/BunqSdkTestBase.cs

@@ -86,9 +86,9 @@ public static string[] GetPermittedIps()
         {
             var permittedIpsString = GetConfig()[FIELD_PERMITTED_IPS].ToString();
 
-            return permittedIpsString.Length == LENGTH_NONE ?
-                new string[LENGTH_NONE] :
-                permittedIpsString.Split(DELIMITER_IPS);
+            return permittedIpsString.Length == LENGTH_NONE
+                ? new string[LENGTH_NONE]
+                : permittedIpsString.Split(DELIMITER_IPS);
         }
 
         public static string GetApiKey()
@@ -108,4 +108,4 @@ private static JObject GetConfig()
             return JObject.Parse(fileContentString);
         }
     }
-}
+}

BunqSdk.Tests/Config.cs

@@ -17,7 +17,7 @@ public class ApiContextTest : BunqSdkTestBase, IClassFixture<ApiContextTest>
         private const string ContextFilenameTest = "context-save-restore-test.conf";
 
         /// <summary>
-        /// Field constatns.
+        /// Field constants.
         /// </summary>
         private const string FieldSessionContext = "session_context";
         private const string FieldExpiryTime = "expiry_time";
@@ -62,16 +62,16 @@ public void TestAutoApiContextReLoad()
             contextJson.SelectToken(FieldSessionContext)[FieldExpiryTime] = expiredTime.ToString();
 
             var expiredApiContext = ApiContext.FromJson(contextJson.ToString());
-         
+
             Assert.NotEqual(apiContext, expiredApiContext);
-            
+
             BunqContext.UpdateApiContext(expiredApiContext);
-            
+
             Assert.Equal(expiredApiContext, BunqContext.ApiContext);
-            
+
             BunqContext.UserContext.RefreshUserContext();
-            
+
             Assert.True(BunqContext.ApiContext.IsSessionActive());
         }
     }
-}
+}

BunqSdk.Tests/Context/ApiContextTest.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using Bunq.Sdk.Context;
@@ -7,19 +6,17 @@
 using Bunq.Sdk.Security;
 using Bunq.Sdk.Tests.Util;
 using Xunit;
-using Assert = Xunit.Assert;
 
 namespace Bunq.Sdk.Tests.Context
 {
     [TestCaseOrderer("Bunq.Sdk.Tests.Util.TestPriorityOrderer", "Psd2ApiContextTest")]
-    public class Psd2ApiContextTest: IClassFixture<Psd2ApiContextTest>
+    public class Psd2ApiContextTest : IClassFixture<Psd2ApiContextTest>
     {
         /// <summary>
         /// File constants.
         /// </summary>
         private const string FILE_TEST_CONFIGURATION = "../../../Resources/bunq-psd2-test.conf";
         private const string FILE_TEST_OAUTH = "../../../Resources/bunq-oauth-test.conf";
-
         private const string FILE_TEST_CREDENTIALS = "../../../Resources/credentials.pfx";
         private const string FILE_TEST_CERTIFICATE_CHAIN = "../../../Resources/chain.cert";
 
@@ -37,11 +34,11 @@ public void TestCreatePsd2Context()
             {
                 apiContext = ApiContext.Restore(FILE_TEST_CONFIGURATION);
                 Assert.NotNull(apiContext);
-                
+
                 BunqContext.LoadApiContext(apiContext);
                 return;
             }
-            
+
             apiContext = CreateApiContext();
             BunqContext.LoadApiContext(apiContext);
 
@@ -55,13 +52,13 @@ public void TestCreateOauthClient()
             {
                 return;
             }
-            
+
             int clientId = OauthClient.Create().Value;
             OauthClient oauthClient = OauthClient.Get(clientId).Value;
             Assert.NotNull(oauthClient);
 
             File.WriteAllText(
-                FILE_TEST_OAUTH, 
+                FILE_TEST_OAUTH,
                 BunqJsonConvert.SerializeObject(oauthClient)
             );
             Assert.True(File.Exists(FILE_TEST_OAUTH));
@@ -70,13 +67,13 @@ public void TestCreateOauthClient()
         private ApiContext CreateApiContext()
         {
             ApiContext apiContext = ApiContext.CreateForPsd2(
-                    ApiEnvironmentType.SANDBOX,
-                    SecurityUtils.GetCertificateFromFile(FILE_TEST_CREDENTIALS, TEST_PASSPHRASE_CREDENTIALS),
-                    SecurityUtils.GetCertificateCollectionFromAllPath(
-                        new[] { FILE_TEST_CERTIFICATE_CHAIN }
-                    ),
-                    TEST_DEVICE_DESCRIPTION,
-                    new List<string>()
+                ApiEnvironmentType.SANDBOX,
+                SecurityUtils.GetCertificateFromFile(FILE_TEST_CREDENTIALS, TEST_PASSPHRASE_CREDENTIALS),
+                SecurityUtils.GetCertificateCollectionFromAllPath(
+                    new[] {FILE_TEST_CERTIFICATE_CHAIN}
+                ),
+                TEST_DEVICE_DESCRIPTION,
+                new List<string>()
             );
             apiContext.Save(FILE_TEST_CONFIGURATION);
 

BunqSdk.Tests/Context/Psd2ApiContextTest.cs

@@ -17,7 +17,6 @@ public class PaginationScenarioTest : BunqSdkTestBase
         /// Constants for scenario testing.
         /// </summary>
         private const int PaymentListingPageSize = 2;
-
         private const int PaymentRequiredCountMinimum = PaymentListingPageSize * 2;
         private const int NumberZero = 0;
 

BunqSdk.Tests/Http/PaginationScenarioTest.cs

@@ -166,4 +166,4 @@ public void TestGetUrlParamsNextPageFromPaginationWithNoNextPage()
             Assert.Throws<BunqException>(() => pagination.UrlParamsNextPage);
         }
     }
-}
+}

BunqSdk.Tests/Http/PaginationTest.cs

@@ -10,12 +10,12 @@ public class ResponseIdOnNotFoundRequestTest : BunqSdkTestBase
         public void TestBadRequestWithResponseId()
         {
             SetUpTestCase();
-            
+
             var caughtException = Assert.Throws<NotFoundException>(
                 () => Payment.Get(0)
             );
-            
+
             Assert.NotNull(caughtException.ResponseId);
         }
     }
-}
+}