Upgrade OpenApiGenerator to v7.16.0 to generate new .NET models/services to support allOf/type, System.Text.Json

Adyen.IntegrationTest/Adyen.IntegrationTest.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
         <LangVersion>12</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>disable</Nullable>

Adyen.IntegrationTest/BaseTest.cs

@@ -3,12 +3,9 @@
 
 using System.Threading.Tasks;
 using Adyen.Model;
-using Adyen.Model.BinLookup;
 using Adyen.Model.Checkout;
 using Adyen.Model.Payment;
 using Adyen.Service;
-using Adyen.Service.Checkout;
-using Amount = Adyen.Model.Checkout;
 using PaymentRequest = Adyen.Model.Payment.PaymentRequest;
 using PaymentResult = Adyen.Model.Payment.PaymentResult;
 using Environment = Adyen.Model.Environment;
@@ -59,7 +56,7 @@ public PaymentResult CreatePaymentResultWithIdempotency(string idempotency)
             return paymentResult;
         }
 
-        public PaymentResult CreatePaymentResultWithRecurring(Recurring.ContractEnum contract)
+        public PaymentResult CreatePaymentResultWithRecurring(Model.Payment.Recurring.ContractEnum contract)
         {
             var client = CreateApiKeyTestClient();
             var payment = new PaymentService(client);
@@ -144,14 +141,14 @@ protected AdjustAuthorisationRequest CreateAdjustAuthorisationtestRequest(string
 
         #endregion
 
-        protected Client CreateApiKeyTestClient()
+        protected AdyenClient CreateApiKeyTestClient()
         {
             var config = new Config()
             {
                 XApiKey = ClientConstants.Xapikey,
                 Environment = Environment.Test
             };
-            return new Client(config);        
+            return new AdyenClient(config);        
         }
 
         private PaymentRequest CreateFullPaymentRequest()
@@ -178,17 +175,17 @@ private PaymentRequest CreateFullPaymentRequest()
             return paymentRequest;
         }
 
-        private PaymentRequest CreateFullPaymentRequestWithRecurring(Recurring.ContractEnum contract)
+        private Model.Payment.PaymentRequest CreateFullPaymentRequestWithRecurring(Model.Payment.Recurring.ContractEnum contract)
         {
-            var paymentRequest = new PaymentRequest
+            var paymentRequest = new Model.Payment.PaymentRequest
             {
                 MerchantAccount = ClientConstants.MerchantAccount,
                 Amount = new Model.Payment.Amount("EUR", 1500),
                 Card = CreateTestCard(),
                 Reference = "payment - " + DateTime.Now.ToString("yyyyMMdd"),
                 ShopperReference = "test-1234",
                 AdditionalData = CreateAdditionalData(),
-                Recurring = new Recurring { Contract = contract },
+                Recurring = new Model.Payment.Recurring() { Contract = contract },
                 ApplicationInfo = new Model.Payment.ApplicationInfo()
                 {
                     ExternalPlatform = new Model.Payment.ExternalPlatform()

Adyen.IntegrationTest/CancellationTokenTest.cs

@@ -17,7 +17,7 @@ public class CancellationTokenTest : BaseTest
         [TestMethod]
         public void CancellationTokenDelayTest()
         {
-            var client = new Client(new Config())
+            var client = new AdyenClient(new Config())
             {
                 HttpClient = new MyDelayedClient(new Config(), new System.Net.Http.HttpClient())
             };

Adyen.IntegrationTest/Checkout/PaymentsServiceIntegrationTest.cs

@@ -0,0 +1,58 @@
+using Adyen.Checkout.Extensions;
+using Adyen.Checkout.Models;
+using Adyen.Checkout.Services;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.Extensions.Hosting;
+using Adyen.Core.Options;
+
+namespace Adyen.IntegrationTest.Checkout
+{
+    [TestClass]
+    public class PaymentsServiceIntegrationTest
+    {
+        private readonly IPaymentsService _paymentsApiService;
+
+        public PaymentsServiceIntegrationTest()
+        {
+            IHost host = Host.CreateDefaultBuilder()
+              .ConfigureCheckout((context, services, config) =>
+              {
+                  config.ConfigureAdyenOptions(options =>
+                  {
+                      options.AdyenApiKey = context.Configuration["ADYEN_API_KEY"];
+                      options.Environment = AdyenEnvironment.Test;
+                  });
+              })
+              .Build();
+
+            _paymentsApiService = host.Services.GetRequiredService<IPaymentsService>();
+        }
+
+        [TestMethod]
+        public async Task Given_Payments_When_CardDetails_Provided_Returns_OK()
+        {
+            // Arrange
+            var request = new PaymentRequest(
+                amount: new Amount("EUR", 1999),
+                merchantAccount: "HeapUnderflowECOM",
+                reference: "reference",
+                returnUrl: "https://adyen.com/",
+                paymentMethod: new CheckoutPaymentMethod(
+                    new CardDetails(
+                        type: CardDetails.TypeEnum.Scheme,
+                        encryptedCardNumber: "test_4111111111111111",
+                        encryptedExpiryMonth: "test_03",
+                        encryptedExpiryYear: "test_2030",
+                        encryptedSecurityCode: "test_737",
+                        holderName: "John Smith"
+                    )
+                )
+            );
+            IPaymentsApiResponse response = await _paymentsApiService.PaymentsAsync(Guid.NewGuid().ToString(), request);
+
+            response.TryDeserializeOkResponse(out var result);
+            Assert.AreEqual(result?.MerchantReference, "reference");
+        }
+    }
+}

Adyen.IntegrationTest/CheckoutTest.cs

@@ -12,7 +12,7 @@ namespace Adyen.IntegrationTest
     [TestClass]
     public class CheckoutTest : BaseTest
     {
-        private Client _client;
+        private AdyenClient _adyenClient;
         private PaymentsService _checkout;
         private RecurringService _recurring;
         private ModificationsService _modifications;
@@ -23,19 +23,19 @@ public class CheckoutTest : BaseTest
         [TestInitialize]
         public void Init()
         {
-            _client = CreateApiKeyTestClient();
-            _checkout = new PaymentsService(_client);
-            _recurring = new RecurringService(_client);
-            _modifications = new ModificationsService(_client);
-            _paymentLinksService = new PaymentLinksService(_client);
+            _adyenClient = CreateApiKeyTestClient();
+            _checkout = new PaymentsService(_adyenClient);
+            _recurring = new RecurringService(_adyenClient);
+            _modifications = new ModificationsService(_adyenClient);
+            _paymentLinksService = new PaymentLinksService(_adyenClient);
             // _classicCheckoutSdkService = new ClassicCheckoutSDKService(_client);
-            _paymentsService = new PaymentsService(_client);
+            _paymentsService = new PaymentsService(_adyenClient);
         }
 
         [TestMethod]
         public void PaymentsFlowWithInvalidApiKey()
         {
-            _client.Config.XApiKey = "InvalidKey";
+            _adyenClient.Config.XApiKey = "InvalidKey";
             try
             {
                 var paymentResponse = _checkout.Payments(CreatePaymentRequestCheckout());
@@ -49,7 +49,7 @@ public void PaymentsFlowWithInvalidApiKey()
         [TestMethod]
         public void PaymentsFlowWithEmptyApiKey()
         {
-            _client.Config.XApiKey = null;
+            _adyenClient.Config.XApiKey = null;
             try
             {
                 var paymentResponse = _checkout.Payments(CreatePaymentRequestCheckout());
@@ -63,8 +63,8 @@ public void PaymentsFlowWithEmptyApiKey()
         [TestMethod]
         public void PaymentsFlowWithPartiallyCorrectKeyApiKey()
         {
-            var key = _client.Config.XApiKey;
-            _client.Config.XApiKey = "1" + key;
+            var key = _adyenClient.Config.XApiKey;
+            _adyenClient.Config.XApiKey = "1" + key;
             try
             {
                 var paymentResponse = _checkout.Payments(CreatePaymentRequestCheckout());

Adyen.IntegrationTest/ErrorTest.cs

@@ -17,14 +17,14 @@ namespace Adyen.IntegrationTest
     [TestClass]
     public class ErrorTest : BaseTest
     {
-        private Client _client; 
+        private AdyenClient _adyenClient; 
         private static readonly string MerchantAccount = ClientConstants.MerchantAccount;
         private HttpClientWrapper _httpClientWrapper;
 
         [TestInitialize]
         public void Init()
         {
-            _client = CreateApiKeyTestClient();
+            _adyenClient = CreateApiKeyTestClient();
             _httpClientWrapper =
                 new HttpClientWrapper(new Config() { Environment = Environment.Test, XApiKey = ClientConstants.Xapikey },
                     new System.Net.Http.HttpClient());
@@ -33,7 +33,7 @@ public void Init()
         [TestMethod]
         public void TestClassicPaymentErrorHandling()
         {
-            var payments = new PaymentService(_client);
+            var payments = new PaymentService(_adyenClient);
             var request = new PaymentRequest {
                 Amount = new Amount(){
                     Value = 1500,
@@ -49,9 +49,9 @@ public void TestClassicPaymentErrorHandling()
                 ShopperEmail = "[email protected]",
                 ShopperIP = "61.294.12.12",
                 ShopperReference = "test-1234",
-                Recurring = new Recurring()
+                Recurring = new Model.Payment.Recurring()
                 {
-                    Contract = Recurring.ContractEnum.RECURRING
+                    Contract = Model.Payment.Recurring.ContractEnum.RECURRING
                 },
                 ShopperInteraction = PaymentRequest.ShopperInteractionEnum.Ecommerce,
                 MerchantAccount = MerchantAccount
@@ -69,7 +69,7 @@ public void TestClassicPaymentErrorHandling()
         [TestMethod]
         public void TestCheckoutErrorHandling()
         {
-            var payments = new PaymentsService(_client);
+            var payments = new PaymentsService(_adyenClient);
             var request = new Model.Checkout.PaymentRequest {
                 Amount = new Model.Checkout.Amount(){
                     Value = 1500,

Adyen.IntegrationTest/PaymentTest.cs

@@ -65,7 +65,7 @@ public void ApiIdemptotencyKeySuccessTest()
         [TestMethod]
         public void StoredValueIssueFailIntegrationTest()
         {
-            var client = new Client(new Config()
+            var client = new AdyenClient(new Config()
             {
                 Environment = Environment.Test,
                 XApiKey = ClientConstants.Xapikey

Adyen.IntegrationTest/PayoutTest.cs

@@ -11,18 +11,18 @@ namespace Adyen.IntegrationTest
     [TestClass]
     public class PayoutTest : BaseTest
     {
-        private Client _client;
+        private AdyenClient _adyenClient;
         private InstantPayoutsService _instantPayoutsService;
         private InitializationService _initializationService;
         private ReviewingService _reviewingService;
 
         [TestInitialize]
         public void Init()
         {
-            _client = this.CreateApiKeyTestClient();
-            _instantPayoutsService = new InstantPayoutsService(_client);
-            _initializationService = new InitializationService(_client);
-            _reviewingService = new ReviewingService(_client);
+            _adyenClient = this.CreateApiKeyTestClient();
+            _instantPayoutsService = new InstantPayoutsService(_adyenClient);
+            _initializationService = new InitializationService(_adyenClient);
+            _reviewingService = new ReviewingService(_adyenClient);
         }
 
         [TestMethod]

Adyen.IntegrationTest/RecurringTest.cs

@@ -40,7 +40,7 @@ private RecurringDetailsRequest CreateRecurringDetailsRequest()
             {
                 ShopperReference = "test-1234",
                 MerchantAccount = ClientConstants.MerchantAccount,
-                Recurring = new Recurring { Contract = ContractEnum.RECURRING }
+                Recurring = new Model.Recurring.Recurring { Contract = ContractEnum.RECURRING }
             };
             return request;
         }

Adyen.Test/AcsWebhooks/AcsWebhooksTest.cs

@@ -0,0 +1,112 @@
+using Adyen.AcsWebhooks.Extensions;
+using Adyen.AcsWebhooks.Models;
+using Adyen.AcsWebhooks.Client;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.Extensions.Hosting;
+using System.Text.Json;
+
+namespace Adyen.Test.AcsWebhooks
+{
+    [TestClass]
+    public class AcsWebhooksTest
+    {
+        private readonly JsonSerializerOptionsProvider _jsonSerializerOptionsProvider;
+
+        public AcsWebhooksTest()
+        {
+          IHost host = Host.CreateDefaultBuilder()
+            .ConfigureAcsWebhooks((context, services, config) =>
+            {
+            })
+            .Build();
+
+          _jsonSerializerOptionsProvider = host.Services.GetRequiredService<JsonSerializerOptionsProvider>();
+        }
+
+        [TestMethod]
+        public async Task Deserialize_Authentication_Webhook_OOB_TRIGGER_FL_Returns_Object()
+        {
+            // Arrange
+            string json = @"
+{
+  ""data"": {
+    ""authentication"": {
+      ""acsTransId"": ""6a4c1709-a42e-4c7f-96c7-1043adacfc97"",
+      ""challenge"": {
+        ""flow"": ""OOB_TRIGGER_FL"",
+        ""lastInteraction"": ""2022-12-22T15:49:03+01:00""
+      },
+      ""challengeIndicator"": ""01"",
+      ""createdAt"": ""2022-12-22T15:45:03+01:00"",
+      ""deviceChannel"": ""app"",
+      ""dsTransID"": ""a3b86754-444d-46ca-95a2-ada351d3f42c"",
+      ""exemptionIndicator"": ""lowValue"",
+      ""inPSD2Scope"": true,
+      ""messageCategory"": ""payment"",
+      ""messageVersion"": ""2.2.0"",
+      ""riskScore"": 0,
+      ""threeDSServerTransID"": ""6edcc246-23ee-4e94-ac5d-8ae620bea7d9"",
+      ""transStatus"": ""Y"",
+      ""type"": ""challenge""
+    },
+    ""balancePlatform"": ""YOUR_BALANCE_PLATFORM"",
+    ""id"": ""497f6eca-6276-4993-bfeb-53cbbbba6f08"",
+    ""paymentInstrumentId"": ""PI3227C223222B5BPCMFXD2XG"",
+    ""purchase"": {
+      ""date"": ""2022-12-22T15:49:03+01:00"",
+      ""merchantName"": ""MyShop"",
+      ""originalAmount"": {
+        ""currency"": ""EUR"",
+        ""value"": 1000
+      }
+    },
+    ""status"": ""authenticated""
+  },
+  ""environment"": ""test"",
+  ""timestamp"": ""2022-12-22T15:42:03+01:00"",
+  ""type"": ""balancePlatform.authentication.created""
+}
+";
+            // Act
+            AuthenticationNotificationRequest r = JsonSerializer.Deserialize<AuthenticationNotificationRequest>(json, _jsonSerializerOptionsProvider.Options);
+
+            // Assert
+            Assert.IsNotNull(r);
+            Assert.AreEqual(AuthenticationNotificationRequest.TypeEnum.BalancePlatformAuthenticationCreated, r.Type);
+            Assert.AreEqual("test", r.Environment);
+            Assert.AreEqual(DateTime.Parse("2022-12-22T15:42:03+01:00"), r.Timestamp);
+
+            Assert.IsNotNull(r.Data);
+            Assert.AreEqual("497f6eca-6276-4993-bfeb-53cbbbba6f08", r.Data.Id);
+            Assert.AreEqual("YOUR_BALANCE_PLATFORM", r.Data.BalancePlatform);
+            Assert.AreEqual("PI3227C223222B5BPCMFXD2XG", r.Data.PaymentInstrumentId);
+            Assert.AreEqual(AuthenticationNotificationData.StatusEnum.Authenticated, r.Data.Status);
+
+            Assert.IsNotNull(r.Data.Purchase);
+            Assert.AreEqual("2022-12-22T15:49:03+01:00", r.Data.Purchase.Date);
+            Assert.AreEqual("MyShop", r.Data.Purchase.MerchantName);
+            Assert.AreEqual("EUR", r.Data.Purchase.OriginalAmount.Currency);
+            Assert.AreEqual(1000, r.Data.Purchase.OriginalAmount.Value);
+
+            Assert.IsNotNull(r.Data.Authentication);
+            Assert.AreEqual("6a4c1709-a42e-4c7f-96c7-1043adacfc97", r.Data.Authentication.AcsTransId);
+            Assert.AreEqual(AuthenticationInfo.ChallengeIndicatorEnum._01, r.Data.Authentication.ChallengeIndicator);
+            Assert.AreEqual(DateTime.Parse("2022-12-22T15:45:03+01:00"), r.Data.Authentication.CreatedAt);
+            Assert.AreEqual(AuthenticationInfo.DeviceChannelEnum.App, r.Data.Authentication.DeviceChannel);
+            Assert.AreEqual("a3b86754-444d-46ca-95a2-ada351d3f42c", r.Data.Authentication.DsTransID);
+            Assert.AreEqual(AuthenticationInfo.ExemptionIndicatorEnum.LowValue, r.Data.Authentication.ExemptionIndicator);
+            Assert.IsTrue(r.Data.Authentication.InPSD2Scope);
+            Assert.AreEqual(AuthenticationInfo.MessageCategoryEnum.Payment, r.Data.Authentication.MessageCategory);
+            Assert.AreEqual("2.2.0", r.Data.Authentication.MessageVersion);
+            Assert.AreEqual(0, r.Data.Authentication.RiskScore);
+            Assert.AreEqual("6edcc246-23ee-4e94-ac5d-8ae620bea7d9", r.Data.Authentication.ThreeDSServerTransID);
+            Assert.AreEqual(AuthenticationInfo.TransStatusEnum.Y, r.Data.Authentication.TransStatus);
+            Assert.AreEqual(AuthenticationInfo.TypeEnum.Challenge, r.Data.Authentication.Type);
+
+            Assert.IsNotNull(r.Data.Authentication.Challenge);
+            Assert.AreEqual(ChallengeInfo.FlowEnum.OOBTRIGGERFL, r.Data.Authentication.Challenge.Flow);
+            Assert.AreEqual(DateTime.Parse("2022-12-22T15:49:03+01:00"), r.Data.Authentication.Challenge.LastInteraction);
+        }
+    }
+}