Merge branch 'release-0.12.0'

bunq · Oct 11, 2017 · 0b5b73e · 0b5b73e
2 parents 26823da + 57d2154
commit 0b5b73e
Show file tree

Hide file tree

Showing 190 changed files with 3,679 additions and 2,252 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-BunqSdk/Model/Generated linguist-generated=true
+BunqSdk/Model/Generated/* linguist-generated=true
diff --git a/.gitignore b/.gitignore
@@ -265,3 +265,4 @@ bunq.conf
 **/Tmp/
 bunq-test.conf
 config.json
+.idea/.idea.BunqSdk/.idea/preferred-vcs.xml
diff --git a/BunqSdk.Samples/AttachmentPublicSample.cs b/BunqSdk.Samples/AttachmentPublicSample.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using Bunq.Sdk.Context;
 using Bunq.Sdk.Http;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Samples.Utils;
 
 namespace Bunq.Sdk.Samples
@@ -11,8 +11,8 @@ public class AttachmentPublicSample : ISample
     {
         private const string CONTENT_TYPE_IMAGE_JPEG = "image/jpeg";
         private const string DESCRIPTION_TEST_JPG_ATTACHMENT = "A test JPG attachment.";
-        private const string PATH_ATTACHMENT_IN = "Samples/Assets/Attachment.jpg";
-        private const string PATH_ATTACHMENT_OUT = "Samples/Tmp/AttachmentOut.jpg";
+        private const string PATH_ATTACHMENT_IN = "Assets/Attachment.jpg";
+        private const string PATH_ATTACHMENT_OUT = "Tmp/AttachmentOut.jpg";
 
         public void Run()
         {

diff --git a/BunqSdk.Samples/CardDebitSample.cs b/BunqSdk.Samples/CardDebitSample.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Bunq.Sdk.Context;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Model.Generated.Object;
 using Bunq.Sdk.Samples.Utils;
 

diff --git a/BunqSdk.Samples/CustomerStatementExportSample.cs b/BunqSdk.Samples/CustomerStatementExportSample.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Bunq.Sdk.Context;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Samples.Utils;
 
 namespace Bunq.Sdk.Samples

diff --git a/BunqSdk.Samples/MonetaryAccountSample.cs b/BunqSdk.Samples/MonetaryAccountSample.cs
@@ -1,6 +1,6 @@
 using System;
 using Bunq.Sdk.Context;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Samples.Utils;
 
 namespace Bunq.Sdk.Samples

diff --git a/BunqSdk.Samples/PaymentBatchSample.cs b/BunqSdk.Samples/PaymentBatchSample.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Bunq.Sdk.Context;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Model.Generated.Object;
 using Bunq.Sdk.Samples.Utils;
 

diff --git a/BunqSdk.Samples/PaymentListSample.cs b/BunqSdk.Samples/PaymentListSample.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Bunq.Sdk.Context;
 using Bunq.Sdk.Http;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Samples.Utils;
 
 namespace Bunq.Sdk.Samples

diff --git a/BunqSdk.Samples/PaymentSample.cs b/BunqSdk.Samples/PaymentSample.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Bunq.Sdk.Context;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Model.Generated.Object;
 using Bunq.Sdk.Samples.Utils;
 
@@ -33,6 +33,10 @@ public void Run()
             var paymentId = Payment.Create(apiContext, paymentMap, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID).Value;
 
             Console.WriteLine(Payment.Get(apiContext, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID, paymentId));
+
+            // Save the API context to account for all the changes that might have occurred to it
+            // during the sample execution
+            apiContext.Save();
         }
     }
 }
diff --git a/BunqSdk.Samples/RequestSample.cs b/BunqSdk.Samples/RequestSample.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Bunq.Sdk.Context;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Model.Generated.Object;
 using Bunq.Sdk.Samples.Utils;
 

diff --git a/BunqSdk.Samples/UserListSample.cs b/BunqSdk.Samples/UserListSample.cs
@@ -1,6 +1,6 @@
 using System;
 using Bunq.Sdk.Context;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Samples.Utils;
 
 namespace Bunq.Sdk.Samples

diff --git a/BunqSdk.Tests/BunqSdkTestBase.cs b/BunqSdk.Tests/BunqSdkTestBase.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Bunq.Sdk.Context;
 using Bunq.Sdk.Exception;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 
 namespace Bunq.Sdk.Tests
 {
@@ -36,17 +36,13 @@ protected static ApiContext GetApiContext()
             try
             {
                 apiContext = ApiContext.Restore(FILENAME_CONTEXT_CONF);
-                User.List(apiContext);
             }
             catch (BunqException)
             {
                 apiContext = CreateApiContext();
             }
-            catch (ApiException)
-            {
-                apiContext = CreateApiContext();
-            }
 
+            apiContext.EnsureSessionActive();
             apiContext.Save(FILENAME_CONTEXT_CONF);
 
             return apiContext;

diff --git a/BunqSdk.Tests/Config.cs b/BunqSdk.Tests/Config.cs
@@ -1,5 +1,4 @@
-using System.Collections.Immutable;
-using System.IO;
+using System.IO;
 using Bunq.Sdk.Model.Generated.Object;
 using Newtonsoft.Json.Linq;
 

diff --git a/BunqSdk.Tests/Http/PaginationScenarioTest.cs b/BunqSdk.Tests/Http/PaginationScenarioTest.cs
@@ -2,7 +2,7 @@
 using Bunq.Sdk.Context;
 using Bunq.Sdk.Http;
 using Bunq.Sdk.Json;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Model.Generated.Object;
 using Xunit;
 

diff --git a/...s/Model/Generated/AttachmentPublicTest.cs → ...enerated/Endpoint/AttachmentPublicTest.cs b/...s/Model/Generated/AttachmentPublicTest.cs → ...enerated/Endpoint/AttachmentPublicTest.cs
@@ -2,10 +2,10 @@
 using System.IO;
 using Bunq.Sdk.Context;
 using Bunq.Sdk.Http;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Xunit;
 
-namespace Bunq.Sdk.Tests.Model.Generated
+namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
 {
     /// <summary>
     /// Tests:

diff --git a/BunqSdk.Tests/Model/Generated/AvatarTest.cs → ...ts/Model/Generated/Endpoint/AvatarTest.cs b/BunqSdk.Tests/Model/Generated/AvatarTest.cs → ...ts/Model/Generated/Endpoint/AvatarTest.cs
@@ -2,10 +2,10 @@
 using System.IO;
 using Bunq.Sdk.Context;
 using Bunq.Sdk.Http;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Xunit;
 
-namespace Bunq.Sdk.Tests.Model.Generated
+namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
 {
     /// <summary>
     /// Tests:

diff --git a/...dk.Tests/Model/Generated/CardDebitTest.cs → ...Model/Generated/Endpoint/CardDebitTest.cs b/...dk.Tests/Model/Generated/CardDebitTest.cs → ...Model/Generated/Endpoint/CardDebitTest.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using Bunq.Sdk.Context;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Model.Generated.Object;
 using Xunit;
 
-namespace Bunq.Sdk.Tests.Model.Generated
+namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
 {
     /// <summary>
     /// Tests:

diff --git a/.../DraftShareInviteBankQrCodeContentTest.cs → .../DraftShareInviteBankQrCodeContentTest.cs b/.../DraftShareInviteBankQrCodeContentTest.cs → .../DraftShareInviteBankQrCodeContentTest.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.IO;
 using Bunq.Sdk.Context;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Model.Generated.Object;
 using Xunit;
 
-namespace Bunq.Sdk.Tests.Model.Generated
+namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
 {
     /// <summary>
     /// Tests:

diff --git a/...odel/Generated/MonetaryAccountBankTest.cs → ...rated/Endpoint/MonetaryAccountBankTest.cs b/...odel/Generated/MonetaryAccountBankTest.cs → ...rated/Endpoint/MonetaryAccountBankTest.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using Bunq.Sdk.Context;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Xunit;
 
-namespace Bunq.Sdk.Tests.Model.Generated
+namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
 {
     /// <summary>
     /// Tests:

diff --git a/....Tests/Model/Generated/PaymentChatTest.cs → ...del/Generated/Endpoint/PaymentChatTest.cs b/....Tests/Model/Generated/PaymentChatTest.cs → ...del/Generated/Endpoint/PaymentChatTest.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using Bunq.Sdk.Context;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Model.Generated.Object;
 using Xunit;
 
-namespace Bunq.Sdk.Tests.Model.Generated
+namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
 {
     /// <summary>
     /// Tests:

diff --git a/BunqSdk.Tests/Model/Generated/PaymentTest.cs → ...s/Model/Generated/Endpoint/PaymentTest.cs b/BunqSdk.Tests/Model/Generated/PaymentTest.cs → ...s/Model/Generated/Endpoint/PaymentTest.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using Bunq.Sdk.Context;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Model.Generated.Object;
 using Xunit;
 
-namespace Bunq.Sdk.Tests.Model.Generated
+namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
 {
     /// <summary>
     /// Tests:

diff --git a/...sts/Model/Generated/RequestInquiryTest.cs → .../Generated/Endpoint/RequestInquiryTest.cs b/...sts/Model/Generated/RequestInquiryTest.cs → .../Generated/Endpoint/RequestInquiryTest.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using Bunq.Sdk.Context;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Model.Generated.Object;
 using Xunit;
 
-namespace Bunq.Sdk.Tests.Model.Generated
+namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
 {
     /// <summary>
     /// Tests:

diff --git a/BunqSdk.Tests/Model/Generated/SessionTest.cs → ...s/Model/Generated/Endpoint/SessionTest.cs b/BunqSdk.Tests/Model/Generated/SessionTest.cs → ...s/Model/Generated/Endpoint/SessionTest.cs
@@ -1,15 +1,23 @@
-using Bunq.Sdk.Context;
-using Bunq.Sdk.Model.Generated;
+using System;
+using System.IO;
+using Bunq.Sdk.Context;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Xunit;
+using Xunit.Sdk;
 
-namespace Bunq.Sdk.Tests.Model.Generated
+namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
 {
     /// <summary>
     /// Tests:
     ///     Session
     /// </summary>
     public class SessionTest : BunqSdkTestBase
     {
+        /// <summary>
+        /// Name of the context configuration file.
+        /// </summary>
+        private const string FILENAME_CONTEXT_CONF = "../../../bunq-test.conf";
+
         /// <summary>
         /// Config values.
         /// </summary>
@@ -29,6 +37,8 @@ public class SessionTest : BunqSdkTestBase
         public void TestSessionDeletion()
         {
             Session.Delete(API_CONTEXT, SESSION_ID_DUMMY);
+
+            File.Delete(FILENAME_CONTEXT_CONF);
         }
     }
 }
diff --git a/...sts/Model/Generated/TabUsageSingleTest.cs → .../Generated/Endpoint/TabUsageSingleTest.cs b/...sts/Model/Generated/TabUsageSingleTest.cs → .../Generated/Endpoint/TabUsageSingleTest.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using Bunq.Sdk.Context;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Model.Generated.Object;
 using Xunit;
 
-namespace Bunq.Sdk.Tests.Model.Generated
+namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
 {
     /// <summary>
     /// Tests:

diff --git a/BunqSdk/BunqSdk.csproj b/BunqSdk/BunqSdk.csproj
@@ -10,7 +10,7 @@
     <PackageId>Bunq.Sdk</PackageId>
   </PropertyGroup>
   <PropertyGroup>
-    <VersionPrefix>0.11.0.0</VersionPrefix>
+    <VersionPrefix>0.12.0.0</VersionPrefix>
     <VersionSuffix>beta</VersionSuffix>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/BunqSdk/Context/ApiContext.cs b/BunqSdk/Context/ApiContext.cs
@@ -4,8 +4,8 @@
 using System.Text;
 using Bunq.Sdk.Exception;
 using Bunq.Sdk.Json;
-using Bunq.Sdk.Model;
-using Bunq.Sdk.Model.Generated;
+using Bunq.Sdk.Model.Core;
+using Bunq.Sdk.Model.Generated.Endpoint;
 using Bunq.Sdk.Security;
 using Newtonsoft.Json;
 

diff --git a/BunqSdk/Context/InstallationContext.cs b/BunqSdk/Context/InstallationContext.cs
@@ -1,5 +1,5 @@
 using System.Security.Cryptography;
-using Bunq.Sdk.Model;
+using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Security;
 
 namespace Bunq.Sdk.Context

diff --git a/BunqSdk/Context/SessionContext.cs b/BunqSdk/Context/SessionContext.cs
@@ -1,5 +1,5 @@
 using System;
-using Bunq.Sdk.Model;
+using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
 
 namespace Bunq.Sdk.Context

diff --git a/BunqSdk/Exception/ApiException.cs b/BunqSdk/Exception/ApiException.cs
@@ -1,32 +1,15 @@
-using System.Collections.Generic;
-
+
 namespace Bunq.Sdk.Exception
 {
-    /// <summary>
-    /// Exception triggered by API requests failed on the server side.
-    /// </summary>
     public class ApiException : System.Exception
     {
-        /// <summary>
-        /// Glue to concatenate the error messages.
-        /// </summary>
-        private const string GLUE_ERROR_MESSAGES = "\n";
-
         public int ResponseCode { get; private set; }
-        public IList<string> Messages { get; private set; }
 
         /// <param name="responseCode">The HTTP Response code of the failed request.</param>
-        /// <param name="messages">The list of messages related to this exception.</param>
-        public ApiException(int responseCode, IList<string> messages) : base(
-            ConcatenateMessages(messages))
+        /// <param name="message">The error message related to this exception.</param>
+        public ApiException(int responseCode, string message) : base(message)
         {
             ResponseCode = responseCode;
-            Messages = messages;
-        }
-
-        private static string ConcatenateMessages(IEnumerable<string> messages)
-        {
-            return string.Join(GLUE_ERROR_MESSAGES, messages);
         }
-    }
+    }   
 }
diff --git a/BunqSdk/Exception/BadRequestException.cs b/BunqSdk/Exception/BadRequestException.cs
@@ -0,0 +1,9 @@
+namespace Bunq.Sdk.Exception
+{
+    public class BadRequestException : ApiException
+    {
+        public BadRequestException(int responseCode, string message) : base(responseCode, message)
+        {
+        }
+    }
+}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		BunqSdk/Model/Generated linguist-generated=true
		BunqSdk/Model/Generated/* linguist-generated=true