From 92bd8718a28bad162559cb14652978270c2e7fd8 Mon Sep 17 00:00:00 2001
From: Jan Dusil <134381434+jandusil@users.noreply.github.com>
Date: Thu, 10 Aug 2023 08:09:56 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20#825:=20Propagate=20connectionTimeout=20t?=
 =?UTF-8?q?ype=20change=20from=20core=20RestClien=E2=80=A6=20(#826)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix #825: Propagate connectionTimeout type change from core RestClientConfiguration
- Update usage of Duration-type connectionTimeout property
---
 .../presencecheck/iproov/config/IProovConfig.java             | 4 ++--
 .../rest/RestOnboardingProviderAutoConfiguration.java         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/enrollment-server-onboarding/src/main/java/com/wultra/app/onboardingserver/presencecheck/iproov/config/IProovConfig.java b/enrollment-server-onboarding/src/main/java/com/wultra/app/onboardingserver/presencecheck/iproov/config/IProovConfig.java
index bd8a4f18d..7f5655563 100644
--- a/enrollment-server-onboarding/src/main/java/com/wultra/app/onboardingserver/presencecheck/iproov/config/IProovConfig.java
+++ b/enrollment-server-onboarding/src/main/java/com/wultra/app/onboardingserver/presencecheck/iproov/config/IProovConfig.java
@@ -172,7 +172,7 @@ private static ReactiveOAuth2AccessTokenResponseClient<OAuth2ClientCredentialsGr
 
     private static WebClient createWebClient(final ExchangeFilterFunction filter, IProovConfigProps configProps, final String logContext) {
         final RestClientConfiguration restClientConfig = configProps.getRestClientConfig();
-        final Integer connectionTimeout = restClientConfig.getConnectionTimeout();
+        final Duration connectionTimeout = restClientConfig.getConnectionTimeout();
         final Duration responseTimeout = restClientConfig.getResponseTimeout();
         final Duration maxIdleTime = Objects.requireNonNull(restClientConfig.getMaxIdleTime(), "maxIdleTime must be specified");
         logger.info("Setting {} connectionTimeout: {}, responseTimeout: {}, maxIdleTime: {}", logContext, connectionTimeout, responseTimeout, maxIdleTime);
@@ -181,7 +181,7 @@ private static WebClient createWebClient(final ExchangeFilterFunction filter, IP
                 .maxIdleTime(maxIdleTime)
                 .build();
         HttpClient httpClient = HttpClient.create(connectionProvider)
-                .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, connectionTimeout)
+                .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, Math.toIntExact(connectionTimeout.toMillis()))
                 .responseTimeout(responseTimeout);
 
         if (restClientConfig.isProxyEnabled()) {
diff --git a/enrollment-server-onboarding/src/main/java/com/wultra/app/onboardingserver/provider/rest/RestOnboardingProviderAutoConfiguration.java b/enrollment-server-onboarding/src/main/java/com/wultra/app/onboardingserver/provider/rest/RestOnboardingProviderAutoConfiguration.java
index d2c121076..fc2838667 100644
--- a/enrollment-server-onboarding/src/main/java/com/wultra/app/onboardingserver/provider/rest/RestOnboardingProviderAutoConfiguration.java
+++ b/enrollment-server-onboarding/src/main/java/com/wultra/app/onboardingserver/provider/rest/RestOnboardingProviderAutoConfiguration.java
@@ -65,7 +65,7 @@ public RestClient restClient(
 
         final RestClientConfiguration config = new RestClientConfiguration();
         config.setBaseUrl(url);
-        config.setConnectionTimeout((int) configuration.getConnectionTimeout().toMillis());
+        config.setConnectionTimeout(configuration.getConnectionTimeout());
         config.setResponseTimeout(configuration.getResponseTimeout());
         config.setHandshakeTimeout(configuration.getHandshakeTimeout());
         config.setDefaultHttpHeaders(headers);