Add subdomains for merchants in previuous (#376)

checkout · Mar 15, 2024 · c2ec98a · c2ec98a
1 parent a0bb0ae
commit c2ec98a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/CheckoutSdk/Previous/AbstractCheckoutApmApi.cs b/src/CheckoutSdk/Previous/AbstractCheckoutApmApi.cs
@@ -13,7 +13,9 @@ public abstract class AbstractCheckoutApmApi
         protected AbstractCheckoutApmApi(CheckoutConfiguration configuration)
         {
             var apiClient = new ApiClient(configuration.HttpClientFactory,
-                configuration.Environment.GetAttribute<EnvironmentAttribute>().ApiUri);
+                configuration.EnvironmentSubdomain != null
+                    ? configuration.EnvironmentSubdomain.ApiUri
+                    : configuration.Environment.GetAttribute<EnvironmentAttribute>().ApiUri);
             _idealClient = new IdealClient(apiClient, configuration);
             _klarnaClient = new KlarnaClient(apiClient, configuration);
             _sepaClient = new SepaClient(apiClient, configuration);

diff --git a/src/CheckoutSdk/Previous/CheckoutApi.cs b/src/CheckoutSdk/Previous/CheckoutApi.cs
@@ -31,7 +31,9 @@ public class CheckoutApi : AbstractCheckoutApmApi, ICheckoutApi
         public CheckoutApi(CheckoutConfiguration configuration) : base(configuration)
         {
             var apiClient = new ApiClient(configuration.HttpClientFactory,
-                configuration.Environment.GetAttribute<EnvironmentAttribute>().ApiUri);
+                configuration.EnvironmentSubdomain != null
+                    ? configuration.EnvironmentSubdomain.ApiUri
+                    : configuration.Environment.GetAttribute<EnvironmentAttribute>().ApiUri);
             _tokensClient = new TokensClient(apiClient, configuration);
             _customersClient = new CustomersClient(apiClient, configuration);
             _sourcesClient = new SourcesClient(apiClient, configuration);

diff --git a/test/CheckoutSdkTest/CheckoutDefaultSdkTest.cs b/test/CheckoutSdkTest/CheckoutDefaultSdkTest.cs
@@ -92,7 +92,7 @@ public void ShouldInstantiateClientWithCustomHttpClientFactory()
         }
 
         [Fact]
-        private void ShouldCreateStaticKeysWithSubdomainCheckoutSdks()
+        private async void ShouldCreateStaticKeysWithSubdomainCheckoutSdks()
         {
             var checkoutApi1 = CheckoutSdk
                 .Builder()
@@ -104,7 +104,7 @@ private void ShouldCreateStaticKeysWithSubdomainCheckoutSdks()
                 .Build();
 
             checkoutApi1.ShouldNotBeNull();
-
+            
             var checkoutApi2 = CheckoutSdk
                 .Builder()
                 .StaticKeys()

diff --git a/test/CheckoutSdkTest/SandboxTestFixture.cs b/test/CheckoutSdkTest/SandboxTestFixture.cs
@@ -32,6 +32,7 @@ protected SandboxTestFixture(PlatformType platformType)
                         .PublicKey(System.Environment.GetEnvironmentVariable("CHECKOUT_PREVIOUS_PUBLIC_KEY"))
                         .SecretKey(System.Environment.GetEnvironmentVariable("CHECKOUT_PREVIOUS_SECRET_KEY"))
                         .Environment(Environment.Sandbox)
+                        //.EnvironmentSubdomain(System.Environment.GetEnvironmentVariable("CHECKOUT_MERCHANT_SUBDOMAIN"))
                         .LogProvider(logFactory)
                         .HttpClientFactory(new DefaultHttpClientFactory())
                         .Build();
@@ -42,6 +43,7 @@ protected SandboxTestFixture(PlatformType platformType)
                         .PublicKey(System.Environment.GetEnvironmentVariable("CHECKOUT_DEFAULT_PUBLIC_KEY"))
                         .SecretKey(System.Environment.GetEnvironmentVariable("CHECKOUT_DEFAULT_SECRET_KEY"))
                         .Environment(Environment.Sandbox)
+                        //.EnvironmentSubdomain(System.Environment.GetEnvironmentVariable("CHECKOUT_MERCHANT_SUBDOMAIN"))
                         .LogProvider(logFactory)
                         .Build();
                     break;
@@ -57,6 +59,7 @@ protected SandboxTestFixture(PlatformType platformType)
                             OAuthScope.TransfersView, OAuthScope.BalancesView, OAuthScope.VaultCardMetadata,
                             OAuthScope.FinancialActions)
                         .Environment(Environment.Sandbox)
+                        //.EnvironmentSubdomain(System.Environment.GetEnvironmentVariable("CHECKOUT_MERCHANT_SUBDOMAIN"))
                         .LogProvider(logFactory)
                         .Build();
                     break;