From e73bf434388a96e237d2d28bbfeee7355868a73a Mon Sep 17 00:00:00 2001
From: Jan Dusil <jan.dusil@wultra.com>
Date: Mon, 7 Aug 2023 17:18:47 +0200
Subject: [PATCH 1/3] 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);

From 6fb7fae1218adb9ae9afdb05967c0f5dfe9e33cc Mon Sep 17 00:00:00 2001
From: Jan Dusil <jan.dusil@wultra.com>
Date: Tue, 8 Aug 2023 16:16:52 +0200
Subject: [PATCH 2/3] Fix #825: Propagate connectionTimeout type change from
 core RestClientConfiguration - Update codeql-analysis.yml

---
 .github/workflows/codeql-analysis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 1d50e7702..86ad61033 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   codeql-analysis:
-    uses: wultra/wultra-infrastructure/.github/workflows/codeql-analysis.yml@develop
+    uses: wultra/wultra-infrastructure/.github/workflows/codeql-analysis.yml@issues/31-internal-repo-codeql
     with:
       languages: "['java']"
       # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]

From 6997ff3faf110e8587f0261e68070cf5a2fea2b2 Mon Sep 17 00:00:00 2001
From: Jan Dusil <jan.dusil@wultra.com>
Date: Thu, 10 Aug 2023 08:02:13 +0200
Subject: [PATCH 3/3] Revert "Fix #825: Propagate connectionTimeout type change
 from core RestClientConfiguration"

This reverts commit 6fb7fae1218adb9ae9afdb05967c0f5dfe9e33cc.
---
 .github/workflows/codeql-analysis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 86ad61033..1d50e7702 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   codeql-analysis:
-    uses: wultra/wultra-infrastructure/.github/workflows/codeql-analysis.yml@issues/31-internal-repo-codeql
+    uses: wultra/wultra-infrastructure/.github/workflows/codeql-analysis.yml@develop
     with:
       languages: "['java']"
       # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]