Skip to content

Commit 0b5b73e

Browse files
dnl-blkvdnl-blkv
committed
Merge branch 'release-0.12.0'
2 parents 26823da + 57d2154 commit 0b5b73e

File tree

190 files changed

+3679
-2252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+3679
-2252
lines changed

‎.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
BunqSdk/Model/Generated linguist-generated=true
1+
BunqSdk/Model/Generated/* linguist-generated=true

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -265,3 +265,4 @@ bunq.conf
265265
**/Tmp/
266266
bunq-test.conf
267267
config.json
268+
.idea/.idea.BunqSdk/.idea/preferred-vcs.xml

‎BunqSdk.Samples/AttachmentPublicSample.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.IO;
33
using Bunq.Sdk.Context;
44
using Bunq.Sdk.Http;
5-
using Bunq.Sdk.Model.Generated;
5+
using Bunq.Sdk.Model.Generated.Endpoint;
66
using Bunq.Sdk.Samples.Utils;
77

88
namespace Bunq.Sdk.Samples
@@ -11,8 +11,8 @@ public class AttachmentPublicSample : ISample
1111
{
1212
private const string CONTENT_TYPE_IMAGE_JPEG = "image/jpeg";
1313
private const string DESCRIPTION_TEST_JPG_ATTACHMENT = "A test JPG attachment.";
14-
private const string PATH_ATTACHMENT_IN = "Samples/Assets/Attachment.jpg";
15-
private const string PATH_ATTACHMENT_OUT = "Samples/Tmp/AttachmentOut.jpg";
14+
private const string PATH_ATTACHMENT_IN = "Assets/Attachment.jpg";
15+
private const string PATH_ATTACHMENT_OUT = "Tmp/AttachmentOut.jpg";
1616

1717
public void Run()
1818
{

‎BunqSdk.Samples/CardDebitSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using Bunq.Sdk.Context;
4-
using Bunq.Sdk.Model.Generated;
4+
using Bunq.Sdk.Model.Generated.Endpoint;
55
using Bunq.Sdk.Model.Generated.Object;
66
using Bunq.Sdk.Samples.Utils;
77

‎BunqSdk.Samples/CustomerStatementExportSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using Bunq.Sdk.Context;
4-
using Bunq.Sdk.Model.Generated;
4+
using Bunq.Sdk.Model.Generated.Endpoint;
55
using Bunq.Sdk.Samples.Utils;
66

77
namespace Bunq.Sdk.Samples

‎BunqSdk.Samples/MonetaryAccountSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using Bunq.Sdk.Context;
3-
using Bunq.Sdk.Model.Generated;
3+
using Bunq.Sdk.Model.Generated.Endpoint;
44
using Bunq.Sdk.Samples.Utils;
55

66
namespace Bunq.Sdk.Samples

‎BunqSdk.Samples/PaymentBatchSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using Bunq.Sdk.Context;
4-
using Bunq.Sdk.Model.Generated;
4+
using Bunq.Sdk.Model.Generated.Endpoint;
55
using Bunq.Sdk.Model.Generated.Object;
66
using Bunq.Sdk.Samples.Utils;
77

‎BunqSdk.Samples/PaymentListSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.Generic;
33
using Bunq.Sdk.Context;
44
using Bunq.Sdk.Http;
5-
using Bunq.Sdk.Model.Generated;
5+
using Bunq.Sdk.Model.Generated.Endpoint;
66
using Bunq.Sdk.Samples.Utils;
77

88
namespace Bunq.Sdk.Samples

‎BunqSdk.Samples/PaymentSample.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using Bunq.Sdk.Context;
4-
using Bunq.Sdk.Model.Generated;
4+
using Bunq.Sdk.Model.Generated.Endpoint;
55
using Bunq.Sdk.Model.Generated.Object;
66
using Bunq.Sdk.Samples.Utils;
77

@@ -33,6 +33,10 @@ public void Run()
3333
var paymentId = Payment.Create(apiContext, paymentMap, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID).Value;
3434

3535
Console.WriteLine(Payment.Get(apiContext, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID, paymentId));
36+
37+
// Save the API context to account for all the changes that might have occurred to it
38+
// during the sample execution
39+
apiContext.Save();
3640
}
3741
}
3842
}

‎BunqSdk.Samples/RequestSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using Bunq.Sdk.Context;
4-
using Bunq.Sdk.Model.Generated;
4+
using Bunq.Sdk.Model.Generated.Endpoint;
55
using Bunq.Sdk.Model.Generated.Object;
66
using Bunq.Sdk.Samples.Utils;
77

‎BunqSdk.Samples/UserListSample.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using Bunq.Sdk.Context;
3-
using Bunq.Sdk.Model.Generated;
3+
using Bunq.Sdk.Model.Generated.Endpoint;
44
using Bunq.Sdk.Samples.Utils;
55

66
namespace Bunq.Sdk.Samples

‎BunqSdk.Tests/BunqSdkTestBase.cs

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Collections.Generic;
22
using Bunq.Sdk.Context;
33
using Bunq.Sdk.Exception;
4-
using Bunq.Sdk.Model.Generated;
4+
using Bunq.Sdk.Model.Generated.Endpoint;
55

66
namespace Bunq.Sdk.Tests
77
{
@@ -36,17 +36,13 @@ protected static ApiContext GetApiContext()
3636
try
3737
{
3838
apiContext = ApiContext.Restore(FILENAME_CONTEXT_CONF);
39-
User.List(apiContext);
4039
}
4140
catch (BunqException)
4241
{
4342
apiContext = CreateApiContext();
4443
}
45-
catch (ApiException)
46-
{
47-
apiContext = CreateApiContext();
48-
}
4944

45+
apiContext.EnsureSessionActive();
5046
apiContext.Save(FILENAME_CONTEXT_CONF);
5147

5248
return apiContext;

‎BunqSdk.Tests/Config.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System.Collections.Immutable;
2-
using System.IO;
1+
using System.IO;
32
using Bunq.Sdk.Model.Generated.Object;
43
using Newtonsoft.Json.Linq;
54

‎BunqSdk.Tests/Http/PaginationScenarioTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using Bunq.Sdk.Context;
33
using Bunq.Sdk.Http;
44
using Bunq.Sdk.Json;
5-
using Bunq.Sdk.Model.Generated;
5+
using Bunq.Sdk.Model.Generated.Endpoint;
66
using Bunq.Sdk.Model.Generated.Object;
77
using Xunit;
88

‎BunqSdk.Tests/Model/Generated/AttachmentPublicTest.cs renamed to ‎BunqSdk.Tests/Model/Generated/Endpoint/AttachmentPublicTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
using System.IO;
33
using Bunq.Sdk.Context;
44
using Bunq.Sdk.Http;
5-
using Bunq.Sdk.Model.Generated;
5+
using Bunq.Sdk.Model.Generated.Endpoint;
66
using Xunit;
77

8-
namespace Bunq.Sdk.Tests.Model.Generated
8+
namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
99
{
1010
/// <summary>
1111
/// Tests:

‎BunqSdk.Tests/Model/Generated/AvatarTest.cs renamed to ‎BunqSdk.Tests/Model/Generated/Endpoint/AvatarTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
using System.IO;
33
using Bunq.Sdk.Context;
44
using Bunq.Sdk.Http;
5-
using Bunq.Sdk.Model.Generated;
5+
using Bunq.Sdk.Model.Generated.Endpoint;
66
using Xunit;
77

8-
namespace Bunq.Sdk.Tests.Model.Generated
8+
namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
99
{
1010
/// <summary>
1111
/// Tests:

‎BunqSdk.Tests/Model/Generated/CardDebitTest.cs renamed to ‎BunqSdk.Tests/Model/Generated/Endpoint/CardDebitTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
using System;
22
using System.Collections.Generic;
33
using Bunq.Sdk.Context;
4-
using Bunq.Sdk.Model.Generated;
4+
using Bunq.Sdk.Model.Generated.Endpoint;
55
using Bunq.Sdk.Model.Generated.Object;
66
using Xunit;
77

8-
namespace Bunq.Sdk.Tests.Model.Generated
8+
namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
99
{
1010
/// <summary>
1111
/// Tests:

‎BunqSdk.Tests/Model/Generated/DraftShareInviteBankQrCodeContentTest.cs renamed to ‎BunqSdk.Tests/Model/Generated/Endpoint/DraftShareInviteBankQrCodeContentTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using Bunq.Sdk.Context;
5-
using Bunq.Sdk.Model.Generated;
5+
using Bunq.Sdk.Model.Generated.Endpoint;
66
using Bunq.Sdk.Model.Generated.Object;
77
using Xunit;
88

9-
namespace Bunq.Sdk.Tests.Model.Generated
9+
namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
1010
{
1111
/// <summary>
1212
/// Tests:

‎BunqSdk.Tests/Model/Generated/MonetaryAccountBankTest.cs renamed to ‎BunqSdk.Tests/Model/Generated/Endpoint/MonetaryAccountBankTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System.Collections.Generic;
22
using Bunq.Sdk.Context;
3-
using Bunq.Sdk.Model.Generated;
3+
using Bunq.Sdk.Model.Generated.Endpoint;
44
using Xunit;
55

6-
namespace Bunq.Sdk.Tests.Model.Generated
6+
namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
77
{
88
/// <summary>
99
/// Tests:

‎BunqSdk.Tests/Model/Generated/PaymentChatTest.cs renamed to ‎BunqSdk.Tests/Model/Generated/Endpoint/PaymentChatTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System.Collections.Generic;
22
using Bunq.Sdk.Context;
3-
using Bunq.Sdk.Model.Generated;
3+
using Bunq.Sdk.Model.Generated.Endpoint;
44
using Bunq.Sdk.Model.Generated.Object;
55
using Xunit;
66

7-
namespace Bunq.Sdk.Tests.Model.Generated
7+
namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
88
{
99
/// <summary>
1010
/// Tests:

‎BunqSdk.Tests/Model/Generated/PaymentTest.cs renamed to ‎BunqSdk.Tests/Model/Generated/Endpoint/PaymentTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System.Collections.Generic;
22
using Bunq.Sdk.Context;
3-
using Bunq.Sdk.Model.Generated;
3+
using Bunq.Sdk.Model.Generated.Endpoint;
44
using Bunq.Sdk.Model.Generated.Object;
55
using Xunit;
66

7-
namespace Bunq.Sdk.Tests.Model.Generated
7+
namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
88
{
99
/// <summary>
1010
/// Tests:

‎BunqSdk.Tests/Model/Generated/RequestInquiryTest.cs renamed to ‎BunqSdk.Tests/Model/Generated/Endpoint/RequestInquiryTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System.Collections.Generic;
22
using Bunq.Sdk.Context;
3-
using Bunq.Sdk.Model.Generated;
3+
using Bunq.Sdk.Model.Generated.Endpoint;
44
using Bunq.Sdk.Model.Generated.Object;
55
using Xunit;
66

7-
namespace Bunq.Sdk.Tests.Model.Generated
7+
namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
88
{
99
/// <summary>
1010
/// Tests:

‎BunqSdk.Tests/Model/Generated/SessionTest.cs renamed to ‎BunqSdk.Tests/Model/Generated/Endpoint/SessionTest.cs

+13-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
1-
using Bunq.Sdk.Context;
2-
using Bunq.Sdk.Model.Generated;
1+
using System;
2+
using System.IO;
3+
using Bunq.Sdk.Context;
4+
using Bunq.Sdk.Model.Generated.Endpoint;
35
using Xunit;
6+
using Xunit.Sdk;
47

5-
namespace Bunq.Sdk.Tests.Model.Generated
8+
namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
69
{
710
/// <summary>
811
/// Tests:
912
/// Session
1013
/// </summary>
1114
public class SessionTest : BunqSdkTestBase
1215
{
16+
/// <summary>
17+
/// Name of the context configuration file.
18+
/// </summary>
19+
private const string FILENAME_CONTEXT_CONF = "../../../bunq-test.conf";
20+
1321
/// <summary>
1422
/// Config values.
1523
/// </summary>
@@ -29,6 +37,8 @@ public class SessionTest : BunqSdkTestBase
2937
public void TestSessionDeletion()
3038
{
3139
Session.Delete(API_CONTEXT, SESSION_ID_DUMMY);
40+
41+
File.Delete(FILENAME_CONTEXT_CONF);
3242
}
3343
}
3444
}

‎BunqSdk.Tests/Model/Generated/TabUsageSingleTest.cs renamed to ‎BunqSdk.Tests/Model/Generated/Endpoint/TabUsageSingleTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System.Collections.Generic;
22
using Bunq.Sdk.Context;
3-
using Bunq.Sdk.Model.Generated;
3+
using Bunq.Sdk.Model.Generated.Endpoint;
44
using Bunq.Sdk.Model.Generated.Object;
55
using Xunit;
66

7-
namespace Bunq.Sdk.Tests.Model.Generated
7+
namespace Bunq.Sdk.Tests.Model.Generated.Endpoint
88
{
99
/// <summary>
1010
/// Tests:

‎BunqSdk/BunqSdk.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageId>Bunq.Sdk</PackageId>
1111
</PropertyGroup>
1212
<PropertyGroup>
13-
<VersionPrefix>0.11.0.0</VersionPrefix>
13+
<VersionPrefix>0.12.0.0</VersionPrefix>
1414
<VersionSuffix>beta</VersionSuffix>
1515
</PropertyGroup>
1616
<PropertyGroup>

‎BunqSdk/Context/ApiContext.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
using System.Text;
55
using Bunq.Sdk.Exception;
66
using Bunq.Sdk.Json;
7-
using Bunq.Sdk.Model;
8-
using Bunq.Sdk.Model.Generated;
7+
using Bunq.Sdk.Model.Core;
8+
using Bunq.Sdk.Model.Generated.Endpoint;
99
using Bunq.Sdk.Security;
1010
using Newtonsoft.Json;
1111

‎BunqSdk/Context/InstallationContext.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System.Security.Cryptography;
2-
using Bunq.Sdk.Model;
2+
using Bunq.Sdk.Model.Core;
33
using Bunq.Sdk.Security;
44

55
namespace Bunq.Sdk.Context

‎BunqSdk/Context/SessionContext.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System;
2-
using Bunq.Sdk.Model;
2+
using Bunq.Sdk.Model.Core;
33
using Newtonsoft.Json;
44

55
namespace Bunq.Sdk.Context

‎BunqSdk/Exception/ApiException.cs

+4-21
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,15 @@
1-
using System.Collections.Generic;
2-
1+

32
namespace Bunq.Sdk.Exception
43
{
5-
/// <summary>
6-
/// Exception triggered by API requests failed on the server side.
7-
/// </summary>
84
public class ApiException : System.Exception
95
{
10-
/// <summary>
11-
/// Glue to concatenate the error messages.
12-
/// </summary>
13-
private const string GLUE_ERROR_MESSAGES = "\n";
14-
156
public int ResponseCode { get; private set; }
16-
public IList<string> Messages { get; private set; }
177

188
/// <param name="responseCode">The HTTP Response code of the failed request.</param>
19-
/// <param name="messages">The list of messages related to this exception.</param>
20-
public ApiException(int responseCode, IList<string> messages) : base(
21-
ConcatenateMessages(messages))
9+
/// <param name="message">The error message related to this exception.</param>
10+
public ApiException(int responseCode, string message) : base(message)
2211
{
2312
ResponseCode = responseCode;
24-
Messages = messages;
25-
}
26-
27-
private static string ConcatenateMessages(IEnumerable<string> messages)
28-
{
29-
return string.Join(GLUE_ERROR_MESSAGES, messages);
3013
}
31-
}
14+
}
3215
}

‎BunqSdk/Exception/BadRequestException.cs

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
namespace Bunq.Sdk.Exception
2+
{
3+
public class BadRequestException : ApiException
4+
{
5+
public BadRequestException(int responseCode, string message) : base(responseCode, message)
6+
{
7+
}
8+
}
9+
}

0 commit comments

Comments
 (0)