fix: route forward and identity clients to dedicated base URLs

src/main/java/com/checkout/CheckoutApiImpl.java

@@ -137,12 +137,12 @@ public CheckoutApiImpl(final CheckoutConfiguration configuration) {
         this.applePayClient = new ApplePayClientImpl(this.apiClient, configuration);
         this.googlePayClient = new GooglePayClientImpl(this.apiClient, configuration);
         this.complianceClient = new ComplianceClientImpl(this.apiClient, configuration);
-        this.forwardClient = new ForwardClientImpl(this.apiClient, configuration);
-        this.faceAuthenticationClient = new FaceAuthenticationClientImpl(this.apiClient, configuration);
-        this.applicantClient = new ApplicantClientImpl(this.apiClient, configuration);
-        this.identityVerificationClient = new IdentityVerificationClientImpl(this.apiClient, configuration);
-        this.idDocumentVerificationClient = new IdDocumentVerificationClientImpl(this.apiClient, configuration);
-        this.amlScreeningClient = new AmlScreeningClientImpl(this.apiClient, configuration);
+        this.forwardClient = new ForwardClientImpl(getForwardClient(configuration), configuration);
+        this.faceAuthenticationClient = new FaceAuthenticationClientImpl(getIdentityClient(configuration), configuration);
+        this.applicantClient = new ApplicantClientImpl(getIdentityClient(configuration), configuration);
+        this.identityVerificationClient = new IdentityVerificationClientImpl(getIdentityClient(configuration), configuration);
+        this.idDocumentVerificationClient = new IdDocumentVerificationClientImpl(getIdentityClient(configuration), configuration);
+        this.amlScreeningClient = new AmlScreeningClientImpl(getIdentityClient(configuration), configuration);
         this.networkTokensClient = new NetworkTokensClientImpl(this.apiClient, configuration);
         this.standaloneAccountUpdaterClient = new StandaloneAccountUpdaterClientImpl(this.apiClient, configuration);
         this.agenticCommerceClient = new AgenticCommerceClientImpl(this.apiClient, configuration);
@@ -296,6 +296,14 @@ private ApiClient getBalancesClient(final CheckoutConfiguration configuration) {
         return new ApiClientImpl(configuration, new BalancesApiUriStrategy(configuration));
     }
 
+    private ApiClient getForwardClient(final CheckoutConfiguration configuration) {
+        return new ApiClientImpl(configuration, new ForwardApiUriStrategy(configuration));
+    }
+
+    private ApiClient getIdentityClient(final CheckoutConfiguration configuration) {
+        return new ApiClientImpl(configuration, new IdentityApiUriStrategy(configuration));
+    }
+
     private static class FilesApiUriStrategy implements UriStrategy {
 
         private final CheckoutConfiguration configuration;
@@ -341,4 +349,34 @@ public URI getUri() {
 
     }
 
+    private static class ForwardApiUriStrategy implements UriStrategy {
+
+        private final CheckoutConfiguration configuration;
+
+        private ForwardApiUriStrategy(final CheckoutConfiguration configuration) {
+            this.configuration = configuration;
+        }
+
+        @Override
+        public URI getUri() {
+            return configuration.getEnvironment().getForwardApi();
+        }
+
+    }
+
+    private static class IdentityApiUriStrategy implements UriStrategy {
+
+        private final CheckoutConfiguration configuration;
+
+        private IdentityApiUriStrategy(final CheckoutConfiguration configuration) {
+            this.configuration = configuration;
+        }
+
+        @Override
+        public URI getUri() {
+            return configuration.getEnvironment().getIdentityApi();
+        }
+
+    }
+
 }

src/main/java/com/checkout/CustomEnvironment.java

@@ -17,6 +17,10 @@
 
     private URI balancesApi;
 
+    private URI forwardApi;
+
+    private URI identityApi;
+
     private URI oAuthAuthorizationApi;
 
     private boolean sandbox;

src/main/java/com/checkout/Environment.java

@@ -13,32 +13,42 @@
             create("https://files.sandbox.checkout.com/"),
             create("https://transfers.sandbox.checkout.com/"),
             create("https://balances.sandbox.checkout.com/"),
+            create("https://forward.sandbox.checkout.com/"),
+            create("https://identity-verification.sandbox.checkout.com/"),
             create("https://access.sandbox.checkout.com/connect/token"),
             true),
     PRODUCTION(create("https://api.checkout.com/"),
             create("https://files.checkout.com/"),
             create("https://transfers.checkout.com/"),
             create("https://balances.checkout.com/"),
+            create("https://forward.checkout.com/"),
+            create("https://identity-verification.checkout.com/"),
             create("https://access.checkout.com/connect/token"),
             false);
 
     private final URI checkoutApi;
     private final URI filesApi;
     private final URI transfersApi;
     private final URI balancesApi;
+    private final URI forwardApi;
+    private final URI identityApi;
     private final URI oAuthAuthorizationApi;
     private final boolean sandbox;
 
     Environment(final URI checkoutApi,
                 final URI filesApi,
                 final URI transfersApi,
                 final URI balancesApi,
+                final URI forwardApi,
+                final URI identityApi,
                 final URI oAuthAuthorizationApi,
                 final boolean sandbox) {
         this.checkoutApi = checkoutApi;
         this.filesApi = filesApi;
         this.transfersApi = transfersApi;
         this.balancesApi = balancesApi;
+        this.forwardApi = forwardApi;
+        this.identityApi = identityApi;
         this.oAuthAuthorizationApi = oAuthAuthorizationApi;
         this.sandbox = sandbox;
     }

src/main/java/com/checkout/EnvironmentSubdomain.java

@@ -40,7 +40,7 @@
             throw new CheckoutException(e);
         }
 
-        Pattern pattern = Pattern.compile("^[0-9a-z]+$");
+        Pattern pattern = Pattern.compile("^[a-z0-9]+(-[a-z0-9]+)*$");
         Matcher matcher = pattern.matcher(subdomain);
         if (matcher.matches()) {
             String host = originalUrl.getHost();

src/main/java/com/checkout/IEnvironment.java

@@ -12,6 +12,10 @@ public interface IEnvironment {
 
     URI getBalancesApi();
 
+    URI getForwardApi();
+
+    URI getIdentityApi();
+
     URI getOAuthAuthorizationApi();
 
     boolean isSandbox();

src/test/java/com/checkout/DefaultCheckoutConfigurationTest.java

@@ -53,7 +53,7 @@ void shouldCreateConfiguration() {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"a", "ab", "abc", "abc1", "12345domain", "a1b2c3d4", "12345678", "abcdefgh", "1234doma"})
+    @ValueSource(strings = {"a", "ab", "abc", "abc1", "12345domain", "a1b2c3d4", "12345678", "abcdefgh", "1234doma", "test-123", "pl-abc123", "pl-loquesea", "vkuhvk4v"})
     void shouldCreateConfigurationWithSubdomain(String subdomain) {
 
         final StaticKeysSdkCredentials credentials = Mockito.mock(StaticKeysSdkCredentials.class);
@@ -65,7 +65,7 @@ void shouldCreateConfigurationWithSubdomain(String subdomain) {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"", " ", "  ", " - ", "a b", "ab c1"})
+    @ValueSource(strings = {"", " ", "  ", " - ", "a b", "ab c1", "foo-", "-foo", "ABC123", "FOO"})
     void shouldCreateConfigurationWithBadSubdomain(String subdomain) {
 
         final StaticKeysSdkCredentials credentials = Mockito.mock(StaticKeysSdkCredentials.class);
@@ -88,6 +88,28 @@ void shouldCreateConfigurationWithSubdomainForProduction() {
         assertEquals("https://" + subdomain + ".access.checkout.com/connect/token", configuration.getEnvironmentSubdomain().getOAuthAuthorizationApi().toString());
     }
 
+    @Test
+    void shouldHaveCorrectSandboxUrls() {
+
+        assertEquals(create("https://api.sandbox.checkout.com/"), Environment.SANDBOX.getCheckoutApi());
+        assertEquals(create("https://files.sandbox.checkout.com/"), Environment.SANDBOX.getFilesApi());
+        assertEquals(create("https://transfers.sandbox.checkout.com/"), Environment.SANDBOX.getTransfersApi());
+        assertEquals(create("https://balances.sandbox.checkout.com/"), Environment.SANDBOX.getBalancesApi());
+        assertEquals(create("https://forward.sandbox.checkout.com/"), Environment.SANDBOX.getForwardApi());
+        assertEquals(create("https://identity-verification.sandbox.checkout.com/"), Environment.SANDBOX.getIdentityApi());
+    }
+
+    @Test
+    void shouldHaveCorrectProductionUrls() {
+
+        assertEquals(create("https://api.checkout.com/"), Environment.PRODUCTION.getCheckoutApi());
+        assertEquals(create("https://files.checkout.com/"), Environment.PRODUCTION.getFilesApi());
+        assertEquals(create("https://transfers.checkout.com/"), Environment.PRODUCTION.getTransfersApi());
+        assertEquals(create("https://balances.checkout.com/"), Environment.PRODUCTION.getBalancesApi());
+        assertEquals(create("https://forward.checkout.com/"), Environment.PRODUCTION.getForwardApi());
+        assertEquals(create("https://identity-verification.checkout.com/"), Environment.PRODUCTION.getIdentityApi());
+    }
+
     @Test
     void shouldCreateConfiguration_defaultHttpClientBuilderAndExecutor() {
 
@@ -136,6 +158,8 @@ void shouldCreateConfigurationWithCustomEnvironment() {
                 .filesApi(create("https://the.files.uri/"))
                 .transfersApi(create("https://the.transfers.uri/"))
                 .balancesApi(create("https://the.balances.uri/"))
+                .forwardApi(create("https://the.forward.uri/"))
+                .identityApi(create("https://the.identity.uri/"))
                 .build();
 
         final StaticKeysSdkCredentials credentials = Mockito.mock(StaticKeysSdkCredentials.class);
@@ -147,6 +171,8 @@ void shouldCreateConfigurationWithCustomEnvironment() {
         assertEquals(environment.getFilesApi(), configuration.getEnvironment().getFilesApi());
         assertEquals(environment.getTransfersApi(), configuration.getEnvironment().getTransfersApi());
         assertEquals(environment.getBalancesApi(), configuration.getEnvironment().getBalancesApi());
+        assertEquals(environment.getForwardApi(), configuration.getEnvironment().getForwardApi());
+        assertEquals(environment.getIdentityApi(), configuration.getEnvironment().getIdentityApi());
     }
 
     /**