Merge pull request #447 from Lombiq/issue/OFFI-200

OFFI-200: Add client configuration to CreateAndAuthorizeClientAsync

Author: wAsnk

Lombiq.Tests.UI/CompatibilitySuppressions.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
@@ -15,6 +15,13 @@
     <Right>lib/net8.0/Lombiq.Tests.UI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Lombiq.Tests.UI.Extensions.HttpClientUITestContextExtensions.CreateAndAuthorizeClientAsync(Lombiq.Tests.UI.Services.UITestContext,System.String,System.String,System.String,System.String,System.String)</Target>
+    <Left>lib/net8.0/Lombiq.Tests.UI.dll</Left>
+    <Right>lib/net8.0/Lombiq.Tests.UI.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Lombiq.Tests.UI.Services.WebDriverFactory.CreateInternetExplorerDriverAsync(Lombiq.Tests.UI.Services.BrowserConfiguration,System.TimeSpan)</Target>

Lombiq.Tests.UI/Extensions/HttpClientUITestContextExtensions.cs

@@ -47,7 +47,8 @@ public static async Task<HttpClient> CreateAndAuthorizeClientAsync(
         string clientId = "UITest",
         string clientSecret = "Password",
         string userName = null,
-        string password = null)
+        string password = null,
+        Action<HttpClient> configureClient = null)
     {
         var parameters = new List<KeyValuePair<string, string>>
         {
@@ -65,6 +66,8 @@ public static async Task<HttpClient> CreateAndAuthorizeClientAsync(
         using var requestBody = new FormUrlEncodedContent(parameters);
 
         var client = context.CreateClient();
+        configureClient?.Invoke(client);
+
         var tokenUrl = new Uri(context.Scope.BaseUri, "connect/token");
         using var tokenResponse = await client.PostAsync(tokenUrl, requestBody);
 

Lombiq.Tests.UI/SecurityScanning/OrchardCoreUITestExecutorConfigurationExtensions.cs

@@ -58,6 +58,9 @@ public static Func<IWebApplicationInstance, Task> CreateAppLogAssertionForSecuri
             // Thrown from Microsoft.AspNetCore.Authentication.AuthenticationService.ChallengeAsync() when ZAP sends
             // invalid authentication challenges.
             "System.InvalidOperationException: No authentication handler is registered for the scheme",
+            // If the middleware is enabled, logs like this are emitted next to every exception even if they are
+            // already suppressed by one of these patterns.
+            "Lombiq.Tests.UI.Shortcuts.Middlewares.ExceptionContextLoggingMiddleware: HTTP request when the exception",
         };
 
         permittedErrorLinePatterns.AddRange(additionalPermittedErrorLinePatterns);