Skip to content

Commit 27ef479

Browse files
committed
adding simple logging in client
1 parent a697a4f commit 27ef479

File tree

2 files changed

+16
-26
lines changed

2 files changed

+16
-26
lines changed

PAYNLSDK/Net/Client.cs

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Text.Json;
1+
using Microsoft.Extensions.Logging;
2+
using System.Text.Json;
23
using System.Text.Json.Serialization;
34
using PayNLSdk.Api;
45
using PayNLSdk.Exceptions;
@@ -30,18 +31,23 @@ public class Client : IClient
3031
/// </summary>
3132
protected readonly IPayNlConfiguration SecurityConfiguration;
3233

34+
private readonly ILogger<Client> _logger;
35+
3336
/// <inheritdoc />
3437
[SuppressMessage("ReSharper", "MemberCanBeProtected.Global")]
35-
public Client(IPayNlConfiguration securityConfiguration, IProxyConfigurationInjector proxyConfigurationInjector = null)
38+
public Client(IPayNlConfiguration securityConfiguration,
39+
ILogger<Client> logger,
40+
IProxyConfigurationInjector proxyConfigurationInjector)
3641
{
3742
SecurityConfiguration = securityConfiguration;
43+
_logger = logger;
3844
ProxyConfigurationInjector = proxyConfigurationInjector;
3945
}
4046

4147
private const string Endpoint = "https://rest-api.pay.nl";
4248

4349
/// <inheritdoc />
44-
public string ClientVersion => "1.1.0.0";
50+
public string ClientVersion => "2";
4551

4652
/// <inheritdoc />
4753
public string UserAgent => $"PAYNL/SDK/{ClientVersion} DotNet/{Environment.Version.Major}";
@@ -53,35 +59,18 @@ public Client(IPayNlConfiguration securityConfiguration, IProxyConfigurationInje
5359
/// <returns>raw response string</returns>
5460
public string PerformRequest(RequestBase request)
5561
{
62+
_logger.LogInformation("Preparing request to {Url} with {@Parameters}", request.Url, request.GetParameters());
5663
var webRequest = PrepareRequest(request.Url, "POST");
5764
var rawResponse = PerformRoundTrip2(webRequest, HttpStatusCode.OK, () =>
5865
{
59-
using (var requestWriter = new StreamWriter(webRequest.GetRequestStream()))
60-
{
61-
//string serializedResource = resource.Serialize();
62-
string serializedResource = ToQueryString(request);
63-
requestWriter.Write(serializedResource);
64-
}
66+
using var requestWriter = new StreamWriter(webRequest.GetRequestStream());
67+
68+
var serializedResource = ToQueryString(request);
69+
requestWriter.Write(serializedResource);
6570
}
6671
);
6772
request.RawResponse = rawResponse;
6873
return rawResponse;
69-
70-
71-
//var webClient = new WebClient();
72-
//// we are not using the client.Credentials for the reason stated here: https://stackoverflow.com/a/26016919/97615
73-
////string credentials = Convert.ToBase64String(
74-
//// Encoding.ASCII.GetBytes("token:" + _securityConfiguration.ApiToken));
75-
////webClient.Headers[HttpRequestHeader.Authorization] = $"Basic {credentials}";
76-
//webClient.Credentials = new NetworkCredential("token", _securityConfiguration.ApiToken);
77-
//webClient.Headers[HttpRequestHeader.UserAgent] = this.UserAgent;
78-
//webClient.QueryString = GetParameters(request);
79-
//webClient.BaseAddress = Endpoint;
80-
81-
//// download data
82-
//var rawResponse = webClient.DownloadString(request.Url);
83-
84-
return rawResponse;
8574
}
8675

8776
/// <summary>

PAYNLSDK/PayNLSdk.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
99
<PackageId>RoodFluweel.PAYNLSDK</PackageId>
10-
<Version>2.0.0</Version>
10+
<Version>2.0.0-beta001</Version>
1111
<Authors>paynl, dampee, Sebsoft</Authors>
1212
<Company>dampee, paynl</Company>
1313
<PackageLicenseUrl></PackageLicenseUrl>
@@ -36,6 +36,7 @@ Targeting netstandard2.0
3636
<ItemGroup>
3737
<PackageReference Include="System.Text.Json" Version="7.0.3" />
3838
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
39+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
3940
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
4041
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
4142
</ItemGroup>

0 commit comments

Comments
 (0)