v13.1.0: Migrate from Newtonsoft.Json to System.Text.Json (#5)

umbracotrd · web-flow · commit 81f42a1be295 · 2023-12-28T17:20:29.000+07:00
diff --git a/.gitignore b/.gitignore
@@ -472,3 +472,5 @@ $RECYCLE.BIN/
 ## Umbraco Commerce specific
 ##
 /local_pack.bat
+**/packages.lock.json
+
diff --git a/Umbraco.Commerce.PaymentProviders.Buckaroo.sln b/Umbraco.Commerce.PaymentProviders.Buckaroo.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 17.7.34024.191
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Commerce.PaymentProviders.Buckaroo", "src\Umbraco.Commerce.PaymentProviders.Buckaroo\Umbraco.Commerce.PaymentProviders.Buckaroo.csproj", "{9F79EF0C-CA7C-4A1A-AD82-E335EBA5BEB8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests", "tests\Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests\Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests.csproj", "{72D33F40-9F9F-4471-A969-C35FC1C9BA4B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{9F79EF0C-CA7C-4A1A-AD82-E335EBA5BEB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9F79EF0C-CA7C-4A1A-AD82-E335EBA5BEB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9F79EF0C-CA7C-4A1A-AD82-E335EBA5BEB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72D33F40-9F9F-4471-A969-C35FC1C9BA4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72D33F40-9F9F-4471-A969-C35FC1C9BA4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72D33F40-9F9F-4471-A969-C35FC1C9BA4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72D33F40-9F9F-4471-A969-C35FC1C9BA4B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Umbraco.Commerce.PaymentProviders.Buckaroo/BuckarooOneTimePaymentProvider.cs b/src/Umbraco.Commerce.PaymentProviders.Buckaroo/BuckarooOneTimePaymentProvider.cs
@@ -1,23 +1,21 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using BuckarooSdk.Connection;
 using BuckarooSdk.DataTypes;
 using BuckarooSdk.DataTypes.RequestBases;
 using Microsoft.AspNetCore.Http;
-using Newtonsoft.Json;
 using Umbraco.Commerce.Common.Logging;
 using Umbraco.Commerce.Core.Api;
 using Umbraco.Commerce.Core.Models;
 using Umbraco.Commerce.Core.PaymentProviders;
 using Umbraco.Commerce.PaymentProviders.Buckaroo.Extensions;
 using Umbraco.Commerce.PaymentProviders.Buckaroo.Webhooks;
+using Umbraco.Commerce.PaymentProviders.Buckaroo.Webhooks.Exceptions;
 
 namespace Umbraco.Commerce.PaymentProviders.Buckaroo
 {
@@ -136,43 +134,31 @@ public override async Task<CallbackResult> ProcessCallbackAsync(PaymentProviderC
             request.Headers.TryGetValues("Authorization", out IEnumerable<string>? headers);
             if (headers == null || string.IsNullOrEmpty(headers.FirstOrDefault()))
             {
-                return null;
+                throw new BuckarooWebhookInvalidAuthorizationHeaderException(context.Order.OrderNumber, context.Order.CartNumber, request.RequestUri!);
             }
 
             if (request.Content == null)
             {
-                return null;
+                throw new BuckarooWebhookEmptyBodyException(context.Order.OrderNumber, context.Order.CartNumber, request.RequestUri!);
             }
 
-            string authorizationHeader = headers.First();
-            BuckarooApiCredentials apiCredentials = context.Settings.GetApiCredentials();
-            byte[] requestBody = await request.Content.ReadAsByteArrayAsync(cancellationToken).ConfigureAwait(false);
-            SignatureCalculationService signatureService = new();
-
 #pragma warning disable CA1308 // Do not normalize strings to uppercase because Buckaroo asks for lowercase string ¯\_(ツ)_/¯
             string webhookHostname = !string.IsNullOrWhiteSpace(context.Settings.WebhookHostnameOverwrite) ? context.Settings.WebhookHostnameOverwrite : request.RequestUri!.Authority;
             string encodedUri = WebUtility.UrlEncode(webhookHostname + request.RequestUri!.PathAndQuery).ToLowerInvariant();
 #pragma warning restore CA1308 // Normalize strings to uppercase
 
+            byte[] requestBody = await request.Content.ReadAsByteArrayAsync(cancellationToken).ConfigureAwait(false);
+            string authorizationHeader = headers.First();
+            BuckarooApiCredentials apiCredentials = context.Settings.GetApiCredentials();
+
+            SignatureCalculationService signatureService = new();
             bool signatureVerified = signatureService.VerifySignature(requestBody, request.Method.Method.ToUpperInvariant(), encodedUri, apiCredentials.SecretKey, authorizationHeader);
             if (!signatureVerified)
             {
-                Logger.Error("Buckaroo - Invalid signature. OrderNumber: '{OrderNumber}', CartNumber: '{CartNumber}'. encodedUri: '{encodedUri}'", context.Order.OrderNumber, context.Order.CartNumber, encodedUri);
-                return null;
+                throw new BuckarooWebhookInvalidSignatureException(context.Order.OrderNumber, context.Order.CartNumber, encodedUri);
             }
 
-            Stream stream = new MemoryStream(requestBody);
-            if (stream.CanSeek)
-            {
-                stream.Seek(0, SeekOrigin.Begin);
-            }
-
-            using (var reader = new StreamReader(stream, Encoding.UTF8))
-            {
-                string requestBodyContent = await reader.ReadToEndAsync(cancellationToken).ConfigureAwait(false);
-                BuckarooWebhookTransaction buckarooEvent = JsonConvert.DeserializeObject<BuckarooWebhookResponse?>(requestBodyContent)?.Transaction ?? throw new NotImplementedException("Unable to parse buckaroo push message to object");
-                return buckarooEvent;
-            }
+            return BuckarooWebhookHelper.ParseDataFromBytes(requestBody);
         }
 
         public override Task<ApiResult> FetchPaymentStatusAsync(PaymentProviderContext<BuckarooOneTimeSettings> context, CancellationToken cancellationToken = default)
diff --git a/src/Umbraco.Commerce.PaymentProviders.Buckaroo/BuckarooPaymentProviderBase.cs b/src/Umbraco.Commerce.PaymentProviders.Buckaroo/BuckarooPaymentProviderBase.cs
@@ -21,23 +21,21 @@ protected BuckarooPaymentProviderBase(
 
         public override string GetCancelUrl(PaymentProviderContext<TSettings> context)
         {
-            ArgumentNullException.ThrowIfNull(context);
-            ArgumentNullException.ThrowIfNull(context.Settings, "settings");
-            ArgumentNullException.ThrowIfNull(context.Settings.CancelUrl, "settings.CancelUrl");
+            ArgumentNullException.ThrowIfNull(context?.Settings.CancelUrl, "settings.CancelUrl");
 
             return context.Settings.CancelUrl;
         }
 
         public override string GetContinueUrl(PaymentProviderContext<TSettings> context)
         {
-            ArgumentNullException.ThrowIfNull(context);
+            ArgumentNullException.ThrowIfNull(context?.Settings.ContinueUrl);
 
-            return context.Settings.ContinueUrl; // + (settings.ContinueUrl.Contains("?") ? "&" : "?") + "session_id={CHECKOUT_SESSION_ID}";
+            return context.Settings.ContinueUrl;
         }
 
         public override string GetErrorUrl(PaymentProviderContext<TSettings> context)
         {
-            ArgumentNullException.ThrowIfNull(context);
+            ArgumentNullException.ThrowIfNull(context?.Settings.ErrorUrl);
 
             return context.Settings.ErrorUrl;
         }
diff --git a/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Extensions/BuckarooClientHelper.cs b/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Extensions/BuckarooClientHelper.cs
@@ -11,13 +11,19 @@ internal class BuckarooClientHelper
         /// Get a new instance of <see cref="AuthenticatedRequest"/> each time it is called.
         /// </summary>
         /// <param name="settings"></param>
+        /// <exception cref="BuckarooInvalidSettingsException"></exception>
         /// <returns></returns>
         public static AuthenticatedRequest GetAuthenticatedRequest(BuckarooSettingsBase settings)
         {
-            BuckarooApiCredentials input = settings.GetApiCredentials();
+            BuckarooApiCredentials credentials = settings.GetApiCredentials();
+            if (string.IsNullOrWhiteSpace(credentials.SecretKey) || string.IsNullOrWhiteSpace(credentials.WebsiteKey))
+            {
+                throw new BuckarooInvalidSettingsException();
+            }
+
             return new SdkClient()
                 .CreateRequest()
-                .Authenticate(input.WebsiteKey, input.SecretKey, input.IsLive, CultureInfo.CurrentCulture);
+                .Authenticate(credentials.WebsiteKey, credentials.SecretKey, credentials.IsLive, CultureInfo.CurrentCulture);
         }
     }
 }
diff --git a/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Extensions/BuckarooInvalidSettingsException.cs b/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Extensions/BuckarooInvalidSettingsException.cs
@@ -0,0 +1,22 @@
+using System;
+
+namespace Umbraco.Commerce.PaymentProviders.Buckaroo.Extensions
+{
+    public class BuckarooInvalidSettingsException : Exception
+    {
+        private const string DefaultMessage = "Invalid payment provider settings. Please make sure that website key and secret key are set correctly in Umbraco backoffice.";
+
+
+        public BuckarooInvalidSettingsException() : base(DefaultMessage)
+        {
+        }
+
+        public BuckarooInvalidSettingsException(string message = DefaultMessage) : base(message)
+        {
+        }
+
+        public BuckarooInvalidSettingsException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Extensions/BuckarooSettingBaseExtensions.cs b/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Extensions/BuckarooSettingBaseExtensions.cs
@@ -8,7 +8,6 @@ internal static class BuckarooSettingBaseExtensions
         /// Get Buckaroo api credentials from backoffice settings.
         /// </summary>
         /// <param name="settings"></param>
-        /// <returns>Live credentials or test credentials depends on <see cref="BuckarooSettingsBase.IsTestMode"/> value.</returns>
         public static BuckarooApiCredentials GetApiCredentials(this BuckarooSettingsBase settings) => new BuckarooApiCredentials
         {
             WebsiteKey = settings.WebsiteKey,
diff --git a/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Umbraco.Commerce.PaymentProviders.Buckaroo.csproj b/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Umbraco.Commerce.PaymentProviders.Buckaroo.csproj
@@ -6,6 +6,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="BuckarooSdk" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" />
diff --git a/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Webhooks/BuckarooWebhookHelper.cs b/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Webhooks/BuckarooWebhookHelper.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Text.Json;
+
+namespace Umbraco.Commerce.PaymentProviders.Buckaroo.Webhooks
+{
+    internal static class BuckarooWebhookHelper
+    {
+        public static BuckarooWebhookTransaction ParseDataFromBytes(byte[] data)
+        {
+            string jsonContent = System.Text.Encoding.UTF8.GetString(data);
+            BuckarooWebhookTransaction buckarooEvent = JsonSerializer.Deserialize<BuckarooWebhookResponse?>(jsonContent)?.Transaction ?? throw new NotImplementedException("Unable to parse buckaroo push message to object");
+            return buckarooEvent;
+        }
+    }
+}
diff --git a/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Webhooks/Exceptions/BuckarooWebhookEmptyBodyException.cs b/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Webhooks/Exceptions/BuckarooWebhookEmptyBodyException.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Globalization;
+using System.Text;
+
+namespace Umbraco.Commerce.PaymentProviders.Buckaroo.Webhooks.Exceptions
+{
+    public class BuckarooWebhookEmptyBodyException : Exception
+    {
+        private static readonly CompositeFormat _messageFormat = CompositeFormat.Parse("Buckaroo - Empty body content. OrderNumber: '{0}', CartNumber: '{1}'. encodedUri: '{2}'");
+
+        public BuckarooWebhookEmptyBodyException(
+            string orderNumber,
+            string cartNumber,
+            Uri webhookUri)
+            : base(string.Format(CultureInfo.InvariantCulture, _messageFormat, orderNumber, cartNumber, webhookUri))
+        {
+        }
+
+        public BuckarooWebhookEmptyBodyException(string message) : base(message)
+        {
+        }
+
+        public BuckarooWebhookEmptyBodyException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Webhooks/Exceptions/BuckarooWebhookInvalidAuthorizationHeaderException.cs b/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Webhooks/Exceptions/BuckarooWebhookInvalidAuthorizationHeaderException.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Globalization;
+using System.Text;
+
+namespace Umbraco.Commerce.PaymentProviders.Buckaroo.Webhooks.Exceptions
+{
+    public class BuckarooWebhookInvalidAuthorizationHeaderException : Exception
+    {
+        private static readonly CompositeFormat _messageFormat = CompositeFormat.Parse("Buckaroo - Authorization header was not found. OrderNumber: '{0}', CartNumber: '{1}'. encodedUri: '{2}'");
+
+        public BuckarooWebhookInvalidAuthorizationHeaderException(
+            string orderNumber,
+            string cartNumber,
+            Uri webhookUri)
+            : base(string.Format(CultureInfo.InvariantCulture, _messageFormat, orderNumber, cartNumber, webhookUri))
+        {
+        }
+
+        public BuckarooWebhookInvalidAuthorizationHeaderException(string message) : base(message)
+        {
+        }
+
+        public BuckarooWebhookInvalidAuthorizationHeaderException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Webhooks/Exceptions/BuckarooWebhookInvalidSignatureException.cs b/src/Umbraco.Commerce.PaymentProviders.Buckaroo/Webhooks/Exceptions/BuckarooWebhookInvalidSignatureException.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Globalization;
+using System.Text;
+
+namespace Umbraco.Commerce.PaymentProviders.Buckaroo.Webhooks.Exceptions
+{
+    public class BuckarooWebhookInvalidSignatureException : Exception
+    {
+        private static readonly CompositeFormat _messageFormat = CompositeFormat.Parse("Buckaroo - Invalid signature. OrderNumber: '{0}', CartNumber: '{1}'. encodedUri: '{2}'");
+
+        public BuckarooWebhookInvalidSignatureException(
+            string orderNumber,
+            string cartNumber,
+            string encodedWebhookPath)
+            : base(string.Format(CultureInfo.InvariantCulture, _messageFormat, orderNumber, cartNumber, encodedWebhookPath))
+        {
+        }
+
+        public BuckarooWebhookInvalidSignatureException(string message) : base(message)
+        {
+        }
+
+        public BuckarooWebhookInvalidSignatureException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/tests/Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests/BuckarooOneTimePaymentProviderTests.cs b/tests/Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests/BuckarooOneTimePaymentProviderTests.cs
@@ -0,0 +1,60 @@
+using FluentAssertions;
+using Umbraco.Commerce.PaymentProviders.Buckaroo.Webhooks;
+
+namespace Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests
+{
+    public class BuckarooOneTimePaymentProviderTests
+    {
+        [Fact()]
+        public void ParseDataFromBytes_Should_Returns_Data()
+        {
+            // setup
+            string json = @"
+                {
+                  ""Transaction"": {
+                    ""Key"": ""7691587684B745B685D08DF0A2C4CB9E"",
+                    ""Invoice"": ""ORDER-01437-26779-SJRWY"",
+                    ""ServiceCode"": ""ideal"",
+                    ""Status"": {
+                      ""Code"": {
+                        ""Code"": 190,
+                        ""Description"": ""Success""
+                      },
+                      ""SubCode"": {
+                        ""Code"": ""C000"",
+                        ""Description"": ""Success""
+                      },
+                      ""DateTime"": ""2023-12-08T08:29:00""
+                    },
+                    ""IsTest"": true,
+                    ""Order"": ""ORDER-01437-26779-SJRWY"",
+                    ""Currency"": ""EUR"",
+                    ""AmountCredit"": 22.6,
+                    ""AmountDebit"": 21.6,
+                    ""TransactionType"": ""C021"",
+                    ""Services"": null,
+                    ""CustomParameters"": null,
+                    ""AdditionalParameters"": null,
+                    ""MutationType"": 1,
+                    ""RelatedTransactions"": null,
+                    ""IsCancelable"": false,
+                    ""IssuingCountry"": null,
+                    ""StartRecurrent"": false,
+                    ""Recurring"": false,
+                    ""CustomerName"": ""J. de Tèster"",
+                    ""PayerHash"": ""93c6784fdfe3336d1fad2b0ff676d8509ab6834d882eac8263af035139c036ee4e93992502862d332c4a48c2af0fd7d67b8845067de45a420a059d49c8cb6923"",
+                    ""PaymentKey"": ""90EB5506375A425480285F0EEA833182"",
+                    ""Description"": ""ORDER-01437-26779-SJRWY""
+                  }
+                }";
+            byte[] data = System.Text.Encoding.UTF8.GetBytes(json);
+
+            // execute
+            BuckarooWebhookTransaction? actual = BuckarooWebhookHelper.ParseDataFromBytes(data);
+
+            // asserts
+            actual.Should().NotBeNull();
+            TestHelpers.AssertAllPropertiesAreNotNull(actual);
+        }
+    }
+}
diff --git a/tests/Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests/GlobalUsings.cs b/tests/Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Xunit;
diff --git a/tests/Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests/TestHelpers.cs b/tests/Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests/TestHelpers.cs
@@ -0,0 +1,17 @@
+using FluentAssertions;
+
+namespace Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests
+{
+    internal class TestHelpers
+    {
+        public static void AssertAllPropertiesAreNotNull(object obj)
+        {
+            System.Reflection.PropertyInfo[] properties = obj.GetType().GetProperties();
+            foreach (System.Reflection.PropertyInfo property in properties)
+            {
+                var value = property.GetValue(obj);
+                value.Should().NotBeNull("property '{0}' should not be null", property.Name);
+            }
+        }
+    }
+}
diff --git a/tests/Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests/Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests.csproj b/tests/Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests/Umbraco.Commerce.PaymentProviders.Buckaroo.UnitTests.csproj
diff --git a/version.json b/version.json

Original file line number	Diff line number	Diff line change
`@@ -21,23 +21,21 @@ protected BuckarooPaymentProviderBase(`
`21`	`21`
`22`	`22`	`public override string GetCancelUrl(PaymentProviderContext<TSettings> context)`
`23`	`23`	`{`
`24`		`- ArgumentNullException.ThrowIfNull(context);`
`25`		`- ArgumentNullException.ThrowIfNull(context.Settings, "settings");`
`26`		`- ArgumentNullException.ThrowIfNull(context.Settings.CancelUrl, "settings.CancelUrl");`
	`24`	`+ ArgumentNullException.ThrowIfNull(context?.Settings.CancelUrl, "settings.CancelUrl");`
`27`	`25`
`28`	`26`	`return context.Settings.CancelUrl;`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`public override string GetContinueUrl(PaymentProviderContext<TSettings> context)`
`32`	`30`	`{`
`33`		`- ArgumentNullException.ThrowIfNull(context);`
	`31`	`+ ArgumentNullException.ThrowIfNull(context?.Settings.ContinueUrl);`
`34`	`32`
`35`		`- return context.Settings.ContinueUrl; // + (settings.ContinueUrl.Contains("?") ? "&" : "?") + "session_id={CHECKOUT_SESSION_ID}";`
	`33`	`+ return context.Settings.ContinueUrl;`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`public override string GetErrorUrl(PaymentProviderContext<TSettings> context)`
`39`	`37`	`{`
`40`		`- ArgumentNullException.ThrowIfNull(context);`
	`38`	`+ ArgumentNullException.ThrowIfNull(context?.Settings.ErrorUrl);`
`41`	`39`
`42`	`40`	`return context.Settings.ErrorUrl;`
`43`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,19 @@ internal class BuckarooClientHelper`
`11`	`11`	`/// Get a new instance of <see cref="AuthenticatedRequest"/> each time it is called.`
`12`	`12`	`/// </summary>`
`13`	`13`	`/// <param name="settings"></param>`
	`14`	`+ /// <exception cref="BuckarooInvalidSettingsException"></exception>`
`14`	`15`	`/// <returns></returns>`
`15`	`16`	`public static AuthenticatedRequest GetAuthenticatedRequest(BuckarooSettingsBase settings)`
`16`	`17`	`{`
`17`		`- BuckarooApiCredentials input = settings.GetApiCredentials();`
	`18`	`+ BuckarooApiCredentials credentials = settings.GetApiCredentials();`
	`19`	`+ if (string.IsNullOrWhiteSpace(credentials.SecretKey) \|\| string.IsNullOrWhiteSpace(credentials.WebsiteKey))`
	`20`	`+ {`
	`21`	`+ throw new BuckarooInvalidSettingsException();`
	`22`	`+ }`
	`23`	`+`
`18`	`24`	`return new SdkClient()`
`19`	`25`	`.CreateRequest()`
`20`		`- .Authenticate(input.WebsiteKey, input.SecretKey, input.IsLive, CultureInfo.CurrentCulture);`
	`26`	`+ .Authenticate(credentials.WebsiteKey, credentials.SecretKey, credentials.IsLive, CultureInfo.CurrentCulture);`
`21`	`27`	`}`
`22`	`28`	`}`
`23`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ internal static class BuckarooSettingBaseExtensions`
`8`	`8`	`/// Get Buckaroo api credentials from backoffice settings.`
`9`	`9`	`/// </summary>`
`10`	`10`	`/// <param name="settings"></param>`
`11`		`- /// <returns>Live credentials or test credentials depends on <see cref="BuckarooSettingsBase.IsTestMode"/> value.</returns>`
`12`	`11`	`public static BuckarooApiCredentials GetApiCredentials(this BuckarooSettingsBase settings) => new BuckarooApiCredentials`
`13`	`12`	`{`
`14`	`13`	`WebsiteKey = settings.WebsiteKey,`