Add option to provide custom auth and api url for spring example project

examples/spring/README.md

@@ -15,6 +15,7 @@ Example to show how the ME endpoints can be used with the Java SDK in a Spring B
 2. Navigate to the path `spring/`.
 3. Register the client credentials in environment variables:
    `CTP_CLIENT_ID`, `CTP_CLIENT_SECRET` and `CTP_PROJECT_KEY`
+4. If your [project region](https://docs.commercetools.com/api/general-concepts#regions) is not GCP Europe, then register [API URL](https://docs.commercetools.com/api/general-concepts#hosts) and [Auth URL](https://docs.commercetools.com/api/authorization#requesting-an-access-token-using-the-composable-commerce-oauth-20-service) in environment variables: `CTP_PROJECT_API_BASE_URL`, `CTP_PROJECT_AUTH_URL`
 
 ## Using the ME Endpoint Checkout App
 

examples/spring/src/main/java/com/commercetools/sdk/examples/spring/config/CtpSecurityConfig.java

@@ -104,6 +104,12 @@ public static class CtpReactiveAuthenticationManagerResolver
         @Value(value = "${ctp.project.key}")
         private String projectKey;
 
+        @Value(value = "${ctp.project.api.base.url:#{null}}")
+        private String apiBaseUrl;
+
+        @Value(value = "${ctp.project.auth.url:#{null}}")
+        private String authUrl;
+
         private ClientCredentials credentials() {
             return ClientCredentials.of().withClientId(clientId).withClientSecret(clientSecret).build();
         }
@@ -123,9 +129,15 @@ private ProjectApiRoot meClient(final ApiHttpClient client, final Mono<WebSessio
             TokenStorage storage = new SessionTokenStorage(session);
 
             ApiRootBuilder builder = ApiRootBuilder.of(client)
-                    .withApiBaseUrl(ServiceRegion.GCP_EUROPE_WEST1.getApiUrl())
-                    .withProjectKey(projectKey)
+                    .withApiBaseUrl(apiBaseUrl != null ? apiBaseUrl: ServiceRegion.GCP_EUROPE_WEST1.getApiUrl())
+                    .withProjectKey(projectKey);
+
+            if (authUrl != null) {
+                builder = builder.withAnonymousRefreshFlow(credentials(), authUrl + "/oauth/" + projectKey + "/anonymous/token", authUrl +  "/oauth/token", storage);
+            } else {
+                builder = builder
                     .withAnonymousRefreshFlow(credentials(), ServiceRegion.GCP_EUROPE_WEST1, storage);
+            }
 
             return builder.build(projectKey);
         }

examples/spring/src/main/java/com/commercetools/sdk/examples/spring/config/MeClientFilter.java

@@ -1,6 +1,8 @@
 
 package com.commercetools.sdk.examples.spring.config;
 
+import java.util.Map;
+
 import com.commercetools.api.client.ProjectApiRoot;
 import com.commercetools.api.defaultconfig.ApiRootBuilder;
 import com.commercetools.api.defaultconfig.ServiceRegion;
@@ -18,8 +20,6 @@
 import org.springframework.web.server.WebSession;
 import reactor.core.publisher.Mono;
 
-import java.util.Map;
-
 @Component
 public class MeClientFilter implements WebFilter {
     private final ApiHttpClient client;
@@ -33,6 +33,12 @@ public class MeClientFilter implements WebFilter {
     @Value(value = "${ctp.project.key}")
     private String projectKey;
 
+    @Value(value = "${ctp.project.api.base.url:#{null}}")
+    private String apiBaseUrl;
+
+    @Value(value = "${ctp.project.auth.url:#{null}}")
+    private String authUrl;
+
     private ClientCredentials credentials() {
         return ClientCredentials.of().withClientId(clientId).withClientSecret(clientSecret).build();
     }
@@ -44,7 +50,8 @@ public MeClientFilter(ApiHttpClient client) {
 
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
-        final ContextApiHttpClient contextClient = contextClient(client, new MDCContext(Map.of("requestId", exchange.getRequest().getId())));
+        final ContextApiHttpClient contextClient = contextClient(client,
+            new MDCContext(Map.of("requestId", exchange.getRequest().getId())));
         final ProjectApiRoot meClient = exchange.getAttributeOrDefault("meClient",
             meClient(contextClient, exchange.getSession()));
         exchange.getAttributes().put("meClient", meClient);
@@ -54,12 +61,18 @@ public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
     }
 
     private ProjectApiRoot meClient(ApiHttpClient client, Mono<WebSession> session) {
-        TokenStorage storage = new SessionTokenStorage(session);
+        final TokenStorage storage = new SessionTokenStorage(session);
 
         ApiRootBuilder builder = ApiRootBuilder.of(client)
-                .withApiBaseUrl(ServiceRegion.GCP_EUROPE_WEST1.getApiUrl())
-                .withProjectKey(projectKey)
-                .withAnonymousRefreshFlow(credentials(), ServiceRegion.GCP_EUROPE_WEST1, storage);
+                .withApiBaseUrl(apiBaseUrl != null ? apiBaseUrl: ServiceRegion.GCP_EUROPE_WEST1.getApiUrl())
+                .withProjectKey(projectKey);
+
+        if (authUrl != null) {
+            builder = builder.withAnonymousRefreshFlow(credentials(), authUrl + "/oauth/" + projectKey + "/anonymous/token", authUrl +  "/oauth/token", storage);
+        } else {
+            builder = builder
+                    .withAnonymousRefreshFlow(credentials(), ServiceRegion.GCP_EUROPE_WEST1, storage);
+        }
 
         return builder.build(projectKey);
     }

examples/spring/src/main/java/com/commercetools/sdk/examples/spring/service/CtpClientBeanService.java

@@ -1,9 +1,6 @@
 
 package com.commercetools.sdk.examples.spring.service;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
 import com.commercetools.api.client.ProjectApiRoot;
 import com.commercetools.api.defaultconfig.ApiRootBuilder;
 
@@ -29,15 +26,26 @@ public class CtpClientBeanService {
     @Value(value = "${ctp.project.key}")
     private String projectKey;
 
+    @Value(value = "${ctp.project.api.base.url:#{null}}")
+    private String apiBaseUrl;
+
+    @Value(value = "${ctp.project.auth.url:#{null}}")
+    private String authUrl;
+
     private ClientCredentials credentials() {
         return ClientCredentials.of().withClientId(clientId).withClientSecret(clientSecret).build();
     }
 
     @Bean
     public ApiHttpClient client() {
-        return ApiRootBuilder.of()
-                .defaultClient(credentials())
-                .buildClient();
+        ApiRootBuilder builder;
+        if (authUrl != null) {
+            builder = ApiRootBuilder.of().defaultClient(credentials(), authUrl + "/oauth/token", apiBaseUrl);
+        } else {
+            builder = ApiRootBuilder.of().defaultClient(credentials());
+        }
+
+        return builder.buildClient();
     }
 
     @Bean

examples/spring/src/main/java/com/commercetools/sdk/examples/spring/service/CtpReactiveAuthenticationManager.java

@@ -9,7 +9,6 @@
 import com.commercetools.api.defaultconfig.ServiceRegion;
 import com.commercetools.api.models.cart.CartReferenceBuilder;
 import com.commercetools.api.models.customer.CustomerSignInResult;
-import com.commercetools.api.models.customer.CustomerSigninBuilder;
 import com.commercetools.api.models.customer.MyCustomerSigninBuilder;
 import com.commercetools.sdk.examples.spring.config.CtpUserDetails;
 import com.commercetools.sdk.examples.spring.config.TokenGrantedAuthority;

examples/spring/src/main/java/com/commercetools/sdk/examples/spring/web/AppController.java

@@ -9,9 +9,7 @@
 import com.commercetools.api.models.product.ProductProjection;
 import com.commercetools.sdk.examples.spring.service.MeRepository;
 import com.commercetools.sdk.examples.spring.service.ProductsRepository;
-import com.commercetools.sdk.examples.spring.service.ProjectRepository;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -49,9 +47,10 @@ public String home(Model model) {
     }
 
     @GetMapping("/p")
-    public String pop(@RequestAttribute("contextRoot") ProjectApiRoot contextRoot, @RequestAttribute("meClient") ProjectApiRoot meClient, Model model, WebSession session) {
+    public String pop(@RequestAttribute("contextRoot") ProjectApiRoot contextRoot,
+            @RequestAttribute("meClient") ProjectApiRoot meClient, Model model, WebSession session) {
 
-        Mono<List<ProductProjection>> products =  new ProductsRepository(contextRoot).products();
+        Mono<List<ProductProjection>> products = new ProductsRepository(contextRoot).products();
         final Mono<Cart> cart = new MeRepository(meClient, session).meCart();
 
         model.addAttribute("products", products);