Merge branch 'release/1.14.0'

bunq · Aug 5, 2020 · 01e8ccf · 01e8ccf
2 parents a502315 + 62cb1cb
commit 01e8ccf
Show file tree

Hide file tree

Showing 249 changed files with 8,325 additions and 10,075 deletions.
diff --git a/.idea/.idea.BunqSdk/.idea/contentModel.xml b/.idea/.idea.BunqSdk/.idea/contentModel.xml
diff --git a/BunqSdk.Tests/BunqSdk.Tests.csproj b/BunqSdk.Tests/BunqSdk.Tests.csproj
@@ -25,4 +25,8 @@
   <ItemGroup>
     <Folder Include="Resources\NotificationUrlJsons" />
   </ItemGroup>
+  <ItemGroup>
+    <None Remove="Resources\chain.cert" />
+    <None Remove="Resources\bunq-psd2-test.conf" />
+  </ItemGroup>
 </Project>
diff --git a/BunqSdk.Tests/BunqSdkTestBase.cs b/BunqSdk.Tests/BunqSdkTestBase.cs
@@ -44,7 +44,7 @@ public class BunqSdkTestBase
         protected const string PathAttachment = "../../../Resources";
         protected const string ContentType = "image/png";
         protected const string AttachmentDescription = "C# sdk image test.";
-        protected const string AttachmentPathIn = "/bunq_App_Icon_Square@4x.png";
+        protected const string AttachmentPathIn = "/vader.png";
 
         /// <summary>
         /// Device registration constants.

diff --git a/BunqSdk.Tests/Http/PaginationScenarioTest.cs b/BunqSdk.Tests/Http/PaginationScenarioTest.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Bunq.Sdk.Context;
 using Bunq.Sdk.Http;
 using Bunq.Sdk.Json;
 using Bunq.Sdk.Model.Generated.Endpoint;
@@ -18,6 +17,7 @@ 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;
 
@@ -81,4 +81,4 @@ private static void CreatePayment()
             Payment.Create(new Amount(PaymentAmountEur, PaymentCurrency), GetPointerBravo(), PaymentDescription);
         }
     }
-}
+}
diff --git a/BunqSdk.Tests/Resources/[email protected] b/BunqSdk.Tests/Resources/[email protected]
diff --git a/BunqSdk.Tests/Resources/chain.cert b/BunqSdk.Tests/Resources/chain.cert
diff --git a/BunqSdk.Tests/Resources/config.example.json b/BunqSdk.Tests/Resources/config.example.json
@@ -7,7 +7,7 @@
     "AttachmentPublicTest": {
         "CONTENT_TYPE": "image/png",
         "DESCRIPTION": "TEST PNG PHP",
-        "PATH_IN": "/bunq_App_Icon_Square@4x.png"
+        "PATH_IN": "/vader.png"
     },
     "TabUsageSingleTest": {
         "CASH_REGISTER_ID": "XXX"

diff --git a/BunqSdk.Tests/Resources/vader.png b/BunqSdk.Tests/Resources/vader.png
diff --git a/BunqSdk/BunqSdk.csproj b/BunqSdk/BunqSdk.csproj
@@ -8,7 +8,7 @@
     <PackageId>Bunq.Sdk</PackageId>
   </PropertyGroup>
   <PropertyGroup>
-    <VersionPrefix>1.13.0</VersionPrefix>
+    <VersionPrefix>1.14.0</VersionPrefix>
   </PropertyGroup>
   <PropertyGroup>
     <RootNamespace>Bunq.Sdk</RootNamespace>
@@ -19,7 +19,7 @@
     <RepositoryUrl>https://github.com/bunq/sdk_csharp</RepositoryUrl>
     <NeutralLanguage>en-US</NeutralLanguage>
     <AssemblyTitle>bunq SDK</AssemblyTitle>
-    <Copyright>bunq 2017</Copyright>
+    <Copyright>bunq 2020</Copyright>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3-*" />

diff --git a/BunqSdk/Http/ApiClient.cs b/BunqSdk/Http/ApiClient.cs
@@ -64,7 +64,7 @@ public class ApiClient
         /// Values for the default headers
         /// </summary>
         private const string CACHE_CONTROL_NONE = "no-cache";
-        private const string USER_AGENT_BUNQ = "bunq-sdk-csharp/1.13.0";
+        private const string USER_AGENT_BUNQ = "bunq-sdk-csharp/1.14.0";
         private const string LANGUAGE_EN_US = "en_US";
         private const string REGION_NL_NL = "nl_NL";
         private const string GEOLOCATION_ZERO = "0 0 0 0 NL";

diff --git a/BunqSdk/Json/BunqContractResolver.cs b/BunqSdk/Json/BunqContractResolver.cs
@@ -7,7 +7,6 @@
 using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Model.Generated.Object;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 
 namespace Bunq.Sdk.Json
@@ -19,7 +18,7 @@ public class BunqContractResolver : DefaultContractResolver
     {
         protected readonly Dictionary<Type, JsonConverter> converterRegistry = new Dictionary<Type, JsonConverter>();
 
-        public BunqContractResolver(IReadOnlyCollection<Type> typesToExclude=null)
+        public BunqContractResolver(IReadOnlyCollection<Type> typesToExclude = null)
         {
             RegisterConverter(typeof(ApiEnvironmentType), new ApiEnvironmentTypeConverter());
             RegisterConverter(typeof(Geolocation), new GeolocationConverter());
@@ -36,9 +35,9 @@ public BunqContractResolver(IReadOnlyCollection<Type> typesToExclude=null)
 
             if (typesToExclude == null)
             {
-                return;                
+                return;
             }
-            
+
             foreach (var type in typesToExclude)
             {
                 converterRegistry.Remove(type);
@@ -71,8 +70,8 @@ private JsonConverter GetCustomConverterOrNull(Type objectType)
                     ? converterRegistry[typeof(IAnchorObjectInterface)]
                     : null;
             }
-            
+
             return converterRegistry.ContainsKey(objectType) ? converterRegistry[objectType] : null;
         }
     }
-}
+}
diff --git a/BunqSdk/Json/BunqMeTabResultInquiryConverter.cs b/BunqSdk/Json/BunqMeTabResultInquiryConverter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Reflection;
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Endpoint;
@@ -9,7 +8,7 @@
 
 namespace Bunq.Sdk.Json
 {
-    public class BunqMeTabResultInquiryConverter: JsonConverter
+    public class BunqMeTabResultInquiryConverter : JsonConverter
     {
         /// <summary>
         /// Field constants.
@@ -31,16 +30,16 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             JObject jsonObject = JObject.Load(reader);
 
             BunqMeTabResultInquiry tabResultInquiry = JsonConvert.DeserializeObject<BunqMeTabResultInquiry>(
-                jsonObject.ToString(), 
+                jsonObject.ToString(),
                 GetSerializerSettingsWithoutTabResultInquiryResolver()
             );
 
             JObject paymentJsonObjectWrapped = (JObject) jsonObject.GetValue(FIELD_PAYMENT);
             JObject paymentJsonObject = (JObject) paymentJsonObjectWrapped.GetValue(OBJECT_TYPE_PAYMENT);
-            
+
             Payment paymentObject = Payment.CreateFromJsonString(paymentJsonObject.ToString());
             tabResultInquiry.Payment = paymentObject;
-            
+
             return tabResultInquiry;
         }
 
@@ -57,4 +56,4 @@ private JsonSerializerSettings GetSerializerSettingsWithoutTabResultInquiryResol
             };
         }
     }
-}
+}
diff --git a/BunqSdk/Model/Core/OauthAccessToken.cs b/BunqSdk/Model/Core/OauthAccessToken.cs
@@ -32,7 +32,7 @@ public class OauthAccessToken : BunqModel
         /// <summary>
         /// Token constants.
         /// </summary>
-        protected const String TOKEN_URI_FORMAT_SANDBOX = "https://api.oauth.sandbox.bunq.com/v1/token?{0}";
+        protected const String TOKEN_URI_FORMAT_SANDBOX = "https://api-oauth.sandbox.bunq.com/v1/token?{0}";
         protected const String TOKEN_URI_FORMAT_PRODUCTION = "https://api.oauth.bunq.com/v1/token?{0}";
 
         [JsonProperty(PropertyName = "access_token")]
@@ -125,4 +125,4 @@ private static String DetermineTokenUriFormat()
             return TOKEN_URI_FORMAT_MAP[BunqContext.ApiContext.EnvironmentType.TypeString];
         }
     }
-}
+}