Merge remote-tracking branch 'origin/main' into #170-Add-support-for-…

…the-v1.IATSSCD-interface

src/fiskaltrust.Launcher.Common/Configuration/Configuration.cs

@@ -316,7 +316,7 @@ public void Encrypt(IDataProtector dataProtector)
                 {
                     return dataProtector.Protect((string)value);
                 }
-                catch (Exception e)
+                catch
                 {
                     Log.Warning($"Failed to encrypt value of configuration field {name}. Consider using the 'config set' command to set the field's value.", name);
                     return null;

src/fiskaltrust.Launcher/Helpers/PolicyHelper.cs

@@ -13,6 +13,7 @@ public sealed class PolicyHttpClient : IDisposable
     public PolicyHttpClient(LauncherConfiguration configuration, HttpClient httpClient)
     {
         _httpClient = httpClient;
+        _httpClient.Timeout = TimeSpan.FromSeconds(configuration.DownloadTimeoutSec!.Value);
         _policy = GetPolicy(configuration);
     }
 
@@ -24,9 +25,7 @@ private IAsyncPolicy<HttpResponseMessage> GetPolicy(LauncherConfiguration config
                 configuration.DownloadRetry!.Value,
                 retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
 
-        var timeoutPolicy = Policy.TimeoutAsync<HttpResponseMessage>(configuration.DownloadTimeoutSec!.Value);
-
-        return Policy.WrapAsync(retryPolicy, timeoutPolicy);
+        return retryPolicy;
     }
 
     public Task<HttpResponseMessage> SendAsync(Func<HttpRequestMessage> getMessage) => _policy.ExecuteAsync(ct => _httpClient.SendAsync(getMessage(), ct), CancellationToken.None);

test/fiskaltrust.Launcher.IntegrationTest/Download/ConfigurationDownloaderTests.cs

@@ -87,7 +87,7 @@ public async Task DownloadConfigurationAsync_ShouldTimeout()
             var downloader = new ConfigurationDownloader(config, httpClient);
 
             var clientCurve = ECDiffieHellman.Create();
-            await Assert.ThrowsAsync<TimeoutRejectedException>(() => downloader.DownloadConfigurationAsync(clientCurve));
+            await Assert.ThrowsAsync<TaskCanceledException>(() => downloader.DownloadConfigurationAsync(clientCurve));
         }
     }
 }