adyen-examples · Kwok-he-Chu · Aug 15, 2023 · Aug 10, 2023 · Aug 10, 2023 · Aug 10, 2023
diff --git a/authorisation-adjustment-example/Controllers/AdminController.cs b/authorisation-adjustment-example/Controllers/AdminController.cs
@@ -74,7 +74,7 @@ public IActionResult Result(string reference, string status, [FromQuery(Name = "
         }
 
         [HttpPost("admin/update-payment-amount")]
-        public async Task<ActionResult<PaymentAmountUpdateResource>> UpdatePaymentAmount([FromBody] UpdatePaymentAmountRequest request, CancellationToken cancellationToken = default)
+        public async Task<ActionResult<PaymentAmountUpdateResponse>> UpdatePaymentAmount([FromBody] UpdatePaymentAmountRequest request, CancellationToken cancellationToken = default)
         {
             PaymentModel payment = _repository.FindLatestPaymentByReference(request.Reference);
 
@@ -85,15 +85,15 @@ public async Task<ActionResult<PaymentAmountUpdateResource>> UpdatePaymentAmount
 
             try
             {
-                var createPaymentAmountUpdateRequest = new CreatePaymentAmountUpdateRequest()
+                var paymentAmountUpdateRequest = new PaymentAmountUpdateRequest()
                 {
                     MerchantAccount = _merchantAccount, // Required
                     Amount = new Amount() { Value = request.Amount, Currency = payment.Currency },
                     Reference = payment.Reference,
-                    IndustryUsage = CreatePaymentAmountUpdateRequest.IndustryUsageEnum.DelayedCharge,
+                    IndustryUsage = PaymentAmountUpdateRequest.IndustryUsageEnum.DelayedCharge,
                 };
 
-                var response = await _modificationsService.UpdateAuthorisedAmountAsync(payment.GetOriginalPspReference(), createPaymentAmountUpdateRequest, cancellationToken: cancellationToken);
+                var response = await _modificationsService.UpdateAuthorisedAmountAsync(payment.GetOriginalPspReference(), paymentAmountUpdateRequest, cancellationToken: cancellationToken);
                 return Ok(response);
             }
             catch (HttpClientException e)
@@ -104,7 +104,7 @@ public async Task<ActionResult<PaymentAmountUpdateResource>> UpdatePaymentAmount
         }
 
         [HttpPost("admin/capture-payment")]
-        public async Task<ActionResult<PaymentCaptureResource>> CapturePayment([FromBody] CreateCapturePaymentRequest request, CancellationToken cancellationToken = default)
+        public async Task<ActionResult<PaymentCaptureResponse>> CapturePayment([FromBody] CreateCapturePaymentRequest request, CancellationToken cancellationToken = default)
         {
             PaymentModel payment = _repository.FindLatestPaymentByReference(request.Reference);
 
@@ -115,14 +115,14 @@ public async Task<ActionResult<PaymentCaptureResource>> CapturePayment([FromBody
 
             try
             {
-                var createPaymentCaptureRequest = new CreatePaymentCaptureRequest()
+                var paymentCaptureRequest = new PaymentCaptureRequest()
                 {
                     MerchantAccount = _merchantAccount, // Required.
                     Amount = new Amount() { Value = payment.Amount, Currency = payment.Currency }, // Required.
                     Reference = payment.Reference
                 };
 
-                var response = await _modificationsService.CaptureAuthorisedPaymentAsync(payment.GetOriginalPspReference(), createPaymentCaptureRequest, cancellationToken: cancellationToken);
+                var response = await _modificationsService.CaptureAuthorisedPaymentAsync(payment.GetOriginalPspReference(), paymentCaptureRequest, cancellationToken: cancellationToken);
                 return Ok(response); // Note that the response will have a different PSPReference compared to the initial pre-authorisation.
             }
             catch (HttpClientException e)
@@ -133,7 +133,7 @@ public async Task<ActionResult<PaymentCaptureResource>> CapturePayment([FromBody
         }
 
         [HttpPost("admin/reversal-payment")]
-        public async Task<ActionResult<PaymentReversalResource>> ReversalPayment([FromBody] CreateReversalPaymentRequest request, CancellationToken cancellationToken = default)
+        public async Task<ActionResult<PaymentReversalResponse>> ReversalPayment([FromBody] CreateReversalPaymentRequest request, CancellationToken cancellationToken = default)
         {
             PaymentModel payment = _repository.FindLatestPaymentByReference(request.Reference);
 
@@ -144,13 +144,13 @@ public async Task<ActionResult<PaymentReversalResource>> ReversalPayment([FromBo
 
             try
             {
-                var createPaymentReversalRequest = new CreatePaymentReversalRequest()
+                var paymentReversalRequest = new PaymentReversalRequest()
                 {
                     MerchantAccount = _merchantAccount, // Required.
                     Reference = payment.Reference
                 };
 
-                var response = await _modificationsService.RefundOrCancelPaymentAsync(payment.GetOriginalPspReference(), createPaymentReversalRequest, cancellationToken: cancellationToken);
+                var response = await _modificationsService.RefundOrCancelPaymentAsync(payment.GetOriginalPspReference(), paymentReversalRequest, cancellationToken: cancellationToken);
                 return Ok(response);
             }
             catch (HttpClientException e)

diff --git a/authorisation-adjustment-example/Controllers/ApiController.cs b/authorisation-adjustment-example/Controllers/ApiController.cs
@@ -55,7 +55,7 @@ public async Task<ActionResult<PaymentMethodsResponse>> GetPaymentMethods(Cancel
         }
 
         [HttpPost("api/submitAdditionalDetails")]
-        public async Task<ActionResult<PaymentDetailsResponse>> SubmitAdditionalDetails(DetailsRequest request, CancellationToken cancellationToken = default)
+        public async Task<ActionResult<PaymentDetailsResponse>> SubmitAdditionalDetails(PaymentDetailsRequest request, CancellationToken cancellationToken = default)
         {
             try
             {
@@ -73,7 +73,7 @@ public async Task<ActionResult<PaymentDetailsResponse>> SubmitAdditionalDetails(
         [HttpGet("api/handleRedirect")]
         public async Task<IActionResult> HandleRedirect(string payload = null, string redirectResult = null, CancellationToken cancellationToken = default)
         {
-            var detailsRequest = new DetailsRequest();
+            var detailsRequest = new PaymentDetailsRequest();
             if (!string.IsNullOrWhiteSpace(redirectResult))
             {
                 detailsRequest.Details = new PaymentCompletionDetails() { RedirectResult = redirectResult };

diff --git a/authorisation-adjustment-example/Startup.cs b/authorisation-adjustment-example/Startup.cs
@@ -11,6 +11,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
+using System.Net.Http;
+using System.Threading;
+using System;
 
 namespace adyen_dotnet_authorisation_adjustment_example
 {
@@ -51,22 +54,31 @@ public void ConfigureServices(IServiceCollection services)
             services.AddHttpContextAccessor()
                 .AddTransient<IUrlService, UrlService>();
 
-            // Register your dependencies.
-            services.AddSingleton(provider =>
+            // Register Adyen.Client as singleton.
+            string httpClientName = "HttpClientName";
+
+            services.AddSingleton((IServiceProvider provider) =>
+            {
+                AdyenOptions options = provider.GetRequiredService<IOptions<AdyenOptions>>().Value;
+                Config config = new Config()
+                {
+                    // Get your `API Key` from AdyenOptions using the Options pattern.
+                    XApiKey = options.ADYEN_API_KEY,
+                    // Test environment.
+                    Environment = Adyen.Model.Environment.Test,
+                };
+                return new Client(config, provider.GetRequiredService<IHttpClientFactory>(), httpClientName);
+            });
+
+            // Register named HttpClient.
+            services.AddHttpClient(httpClientName)
+            .ConfigurePrimaryHttpMessageHandler((IServiceProvider provider) =>
             {
-                var options = provider.GetRequiredService<IOptions<AdyenOptions>>();
-                return new Client(
-                    new Config()
-                    {
-                        // Get your `API Key`, `HMAC Key` and `MerchantAccount` from AdyenOptions using the Options pattern.
-                        XApiKey = options.Value.ADYEN_API_KEY,
-                        HmacKey = options.Value.ADYEN_HMAC_KEY,
-                        MerchantAccount = options.Value.ADYEN_MERCHANT_ACCOUNT,
-
-                        // Test environment.
-                        Environment = Environment.Test,
-                    });
-            }).AddHttpClient(); // Add HttpClient.
+                return new SocketsHttpHandler()
+                {
+                    PooledConnectionLifetime = TimeSpan.FromMinutes(1)
+                };
+            }).SetHandlerLifetime(Timeout.InfiniteTimeSpan);
 
             services.AddSingleton<IPaymentsService, PaymentsService>(); // Used to be called "Checkout.cs" in Adyen .NET 9.x.x and below, see https://github.com/Adyen/adyen-dotnet-api-library/blob/9.2.1/Adyen/Service/Checkout.cs.
             services.AddSingleton<IModificationsService, ModificationsService>();

diff --git a/authorisation-adjustment-example/adyen-dotnet-authorisation-adjustment-example.csproj b/authorisation-adjustment-example/adyen-dotnet-authorisation-adjustment-example.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>adyen_dotnet_authorisation_adjustment_example</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Adyen" Version="10.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.18" />
+    <PackageReference Include="Adyen" Version="11.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.21" />
   </ItemGroup>
 </Project>
diff --git a/checkout-example-advanced/Controllers/ApiController.cs b/checkout-example-advanced/Controllers/ApiController.cs
@@ -94,7 +94,7 @@ public async Task<ActionResult<PaymentResponse>> InitiatePayment(PaymentRequest
         }
 
         [HttpPost("api/submitAdditionalDetails")]
-        public async Task<ActionResult<PaymentDetailsResponse>> SubmitAdditionalDetails(DetailsRequest request, CancellationToken cancellationToken = default)
+        public async Task<ActionResult<PaymentDetailsResponse>> SubmitAdditionalDetails(PaymentDetailsRequest request, CancellationToken cancellationToken = default)
         {
             try
             {
@@ -112,7 +112,7 @@ public async Task<ActionResult<PaymentDetailsResponse>> SubmitAdditionalDetails(
         [HttpGet("api/handleShopperRedirect")]
         public async Task<IActionResult> HandleShoppperRedirect(string payload = null, string redirectResult = null, CancellationToken cancellationToken = default)
         {
-            var detailsRequest = new DetailsRequest();
+            var detailsRequest = new PaymentDetailsRequest();
             if (!string.IsNullOrWhiteSpace(redirectResult))
             {
                 detailsRequest.Details = new PaymentCompletionDetails() { RedirectResult = redirectResult };

diff --git a/checkout-example-advanced/Startup.cs b/checkout-example-advanced/Startup.cs
@@ -1,5 +1,4 @@
 using Adyen;
-using Adyen.Model;
 using Adyen.Service.Checkout;
 using Adyen.Util;
 using adyen_dotnet_checkout_example_advanced.Options;
@@ -10,6 +9,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
+using System;
+using System.Net.Http;
+using System.Threading;
 
 namespace adyen_dotnet_checkout_example_advanced
 {
@@ -51,21 +53,31 @@ public void ConfigureServices(IServiceCollection services)
             services.AddHttpContextAccessor()
                 .AddTransient<IUrlService, UrlService>();
 
-            // Register your dependencies.
-            services.AddSingleton(provider =>
+            // Register Adyen.Client as singleton.
+            string httpClientName = "HttpClientName";
+
+            services.AddSingleton((IServiceProvider provider) =>
+            {
+                AdyenOptions options = provider.GetRequiredService<IOptions<AdyenOptions>>().Value;
+                Config config = new Config()
+                {
+                    // Get your `API Key` from AdyenOptions using the Options pattern.
+                    XApiKey = options.ADYEN_API_KEY,
+                    // Test environment.
+                    Environment = Adyen.Model.Environment.Test,
+                };
+                return new Client(config, provider.GetRequiredService<IHttpClientFactory>(), httpClientName);
+            });
+
+            // Register named HttpClient.
+            services.AddHttpClient(httpClientName)
+            .ConfigurePrimaryHttpMessageHandler((IServiceProvider provider) =>
             {
-                var options = provider.GetRequiredService<IOptions<AdyenOptions>>();
-                return new Client(
-                    new Config()
-                    {
-                        // Get your `API Key`, `HMAC Key` and `MerchantAccount` from AdyenOptions using the Options pattern.
-                        XApiKey = options.Value.ADYEN_API_KEY,
-                        HmacKey = options.Value.ADYEN_HMAC_KEY,
-                        MerchantAccount = options.Value.ADYEN_MERCHANT_ACCOUNT,
-                        // Test environment.
-                        Environment = Environment.Test,
-                    });
-            }).AddHttpClient(); // Add HttpClient.
+                return new SocketsHttpHandler()
+                {
+                    PooledConnectionLifetime = TimeSpan.FromMinutes(1)
+                };
+            }).SetHandlerLifetime(Timeout.InfiniteTimeSpan);
 
             services.AddSingleton<IPaymentsService, PaymentsService>(); // Used to be called "Checkout.cs" in Adyen .NET 9.x.x and below, see https://github.com/Adyen/adyen-dotnet-api-library/blob/9.2.1/Adyen/Service/Checkout.cs.
             services.AddSingleton<HmacValidator>();

diff --git a/checkout-example-advanced/adyen-dotnet-checkout-example-advanced.csproj b/checkout-example-advanced/adyen-dotnet-checkout-example-advanced.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Adyen" Version="10.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.19" />
+    <PackageReference Include="Adyen" Version="11.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.21" />
   </ItemGroup>
 </Project>
diff --git a/checkout-example/Startup.cs b/checkout-example/Startup.cs
@@ -1,5 +1,4 @@
 using Adyen;
-using Adyen.Model;
 using Adyen.Service.Checkout;
 using Adyen.Util;
 using adyen_dotnet_checkout_example.Options;
@@ -10,6 +9,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
+using System;
+using System.Net.Http;
+using System.Threading;
 
 namespace adyen_dotnet_checkout_example
 {
@@ -32,15 +34,15 @@ public void ConfigureServices(IServiceCollection services)
                 {
                     // Public key used for client-side authentication: https://docs.adyen.com/development-resources/client-side-authentication.
                     options.ADYEN_CLIENT_KEY = Configuration[nameof(AdyenOptions.ADYEN_CLIENT_KEY)];
-                    
+
                     // Your secret API Key: https://docs.adyen.com/development-resources/api-credentials#generate-your-api-key.
                     options.ADYEN_API_KEY = Configuration[nameof(AdyenOptions.ADYEN_API_KEY)];
-                    
+
                     // Your Merchant Account name: https://docs.adyen.com/account/account-structure.
                     options.ADYEN_MERCHANT_ACCOUNT = Configuration[nameof(AdyenOptions.ADYEN_MERCHANT_ACCOUNT)];
 
                     // HMAC Key used to validate your webhook signatures: https://docs.adyen.com/development-resources/webhooks/verify-hmac-signatures.
-                    options.ADYEN_HMAC_KEY = Configuration[nameof(AdyenOptions.ADYEN_HMAC_KEY)]; 
+                    options.ADYEN_HMAC_KEY = Configuration[nameof(AdyenOptions.ADYEN_HMAC_KEY)];
                 }
             );
 
@@ -51,21 +53,31 @@ public void ConfigureServices(IServiceCollection services)
             services.AddHttpContextAccessor()
                 .AddTransient<IUrlService, UrlService>();
 
-            // Register your dependencies.
-            services.AddSingleton(provider =>
+            // Register Adyen.Client as singleton.
+            string httpClientName = "HttpClientName";
+
+            services.AddSingleton((IServiceProvider provider) =>
+            {
+                AdyenOptions options = provider.GetRequiredService<IOptions<AdyenOptions>>().Value;
+                Config config = new Config()
+                {
+                    // Get your `API Key` from AdyenOptions using the Options pattern.
+                    XApiKey = options.ADYEN_API_KEY,
+                    // Test environment.
+                    Environment = Adyen.Model.Environment.Test,
+                };
+                return new Client(config, provider.GetRequiredService<IHttpClientFactory>(), httpClientName);
+            });
+
+            // Register named HttpClient.
+            services.AddHttpClient(httpClientName)
+            .ConfigurePrimaryHttpMessageHandler((IServiceProvider provider) =>
             {
-                var options = provider.GetRequiredService<IOptions<AdyenOptions>>();
-                return new Client(
-                    new Config()
-                    {
-                        // Get your `API Key`, `HMAC Key` and `MerchantAccount` from AdyenOptions using the Options pattern.
-                        XApiKey = options.Value.ADYEN_API_KEY,
-                        HmacKey = options.Value.ADYEN_HMAC_KEY,
-                        MerchantAccount = options.Value.ADYEN_MERCHANT_ACCOUNT,
-                        // Test environment.
-                        Environment = Environment.Test,
-                    });
-            }).AddHttpClient(); // Add HttpClient.
+                return new SocketsHttpHandler()
+                {
+                    PooledConnectionLifetime = TimeSpan.FromMinutes(1)
+                };
+            }).SetHandlerLifetime(Timeout.InfiniteTimeSpan);
 
             services.AddSingleton<IPaymentsService, PaymentsService>(); // Used to be called "Checkout.cs" in Adyen .NET 9.x.x and below, see https://github.com/Adyen/adyen-dotnet-api-library/blob/9.2.1/Adyen/Service/Checkout.cs.
             services.AddSingleton<HmacValidator>();

diff --git a/checkout-example/adyen-dotnet-checkout-example.csproj b/checkout-example/adyen-dotnet-checkout-example.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Adyen" Version="10.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.19" />
+    <PackageReference Include="Adyen" Version="11.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.21" />
   </ItemGroup>
 </Project>