SUPPORT-29677 fix login for all regions

commercetools · Nov 26, 2024 · 1bd0f64 · 1bd0f64
1 parent f5d4917
commit 1bd0f64
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.../spring/src/main/java/com/commercetools/sdk/examples/spring/config/CtpSecurityConfig.java b/.../spring/src/main/java/com/commercetools/sdk/examples/spring/config/CtpSecurityConfig.java
@@ -122,7 +122,7 @@ public CtpReactiveAuthenticationManagerResolver(final ApiHttpClient apiHttpClien
         @Override
         public Mono<ReactiveAuthenticationManager> resolve(final ServerWebExchange context) {
             return Mono.just(new CtpReactiveAuthenticationManager(meClient(apiHttpClient, context.getSession()),
-                credentials(), projectKey));
+                credentials(), projectKey, authUrl));
         }
 
         private ProjectApiRoot meClient(final ApiHttpClient client, final Mono<WebSession> session) {

diff --git a/.../java/com/commercetools/sdk/examples/spring/service/CtpReactiveAuthenticationManager.java b/.../java/com/commercetools/sdk/examples/spring/service/CtpReactiveAuthenticationManager.java
@@ -25,6 +25,7 @@
 import reactor.core.publisher.Mono;
 
 public class CtpReactiveAuthenticationManager implements ReactiveAuthenticationManager {
+    private final String authUrl;
     VrapHttpClient client;
     ProjectApiRoot apiRoot;
 
@@ -33,11 +34,12 @@ public class CtpReactiveAuthenticationManager implements ReactiveAuthenticationM
     private final String projectKey;
 
     public CtpReactiveAuthenticationManager(final ProjectApiRoot apiRoot, final ClientCredentials credentials,
-            final String projectKey) {
+            final String projectKey, final String authUrl) {
         this.apiRoot = apiRoot;
         this.client = HttpClientSupplier.of().get();
         this.credentials = credentials;
         this.projectKey = projectKey;
+        this.authUrl = authUrl;
     }
 
     @Override
@@ -54,10 +56,12 @@ public Mono<Authentication> authenticate(Authentication authentication) {
                     .fromFuture(
                         apiRoot.me().login().post(customerSignin.build()).execute().exceptionally(throwable -> null))
                     .flatMap(customerSignInResultApiHttpResponse -> {
+                        String passwordFlowTokenURL = this.authUrl != null
+                                ? this.authUrl + "/oauth/" + projectKey + "/customers/token"
+                                : ServiceRegion.GCP_EUROPE_WEST1.getPasswordFlowTokenURL(projectKey);
                         GlobalCustomerPasswordTokenSupplier supplier = new GlobalCustomerPasswordTokenSupplier(
                             credentials.getClientId(), credentials.getClientSecret(), authentication.getName(),
-                            authentication.getCredentials().toString(), null,
-                            ServiceRegion.GCP_EUROPE_WEST1.getPasswordFlowTokenURL(projectKey), client);
+                            authentication.getCredentials().toString(), null, passwordFlowTokenURL, client);
 
                         return Mono.zip(Mono.fromFuture(supplier.getToken().exceptionally(throwable -> null)),
                             Mono.just(customerSignInResultApiHttpResponse.getBody()));