dotnet format

Author: Erwinvandervalk

access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementTests.cs

@@ -627,7 +627,11 @@ public async Task dpop_nonce_retry_should_use_fresh_client_assertion()
                 var content = m.Content!.ReadAsStringAsync().Result;
                 var pairs = System.Web.HttpUtility.ParseQueryString(content);
                 var assertion = pairs["client_assertion"];
-                if (assertion != null) capturedAssertions.Add(assertion);
+                if (assertion != null)
+                {
+                    capturedAssertions.Add(assertion);
+                }
+
                 return true;
             })
             .Respond(HttpStatusCode.BadRequest,
@@ -642,7 +646,11 @@ [new KeyValuePair<string, string>("DPoP-Nonce", "some_nonce")],
                 var content = m.Content!.ReadAsStringAsync().Result;
                 var pairs = System.Web.HttpUtility.ParseQueryString(content);
                 var assertion = pairs["client_assertion"];
-                if (assertion != null) capturedAssertions.Add(assertion);
+                if (assertion != null)
+                {
+                    capturedAssertions.Add(assertion);
+                }
+
                 return true;
             })
             .Respond(_ => Some.TokenHttpResponse());

access-token-management/test/AccessTokenManagement.Tests/UserTokenManagementTests.cs

@@ -8,7 +8,6 @@
 using Duende.AccessTokenManagement.OpenIdConnect;
 using Duende.IdentityModel;
 using Duende.IdentityModel.Client;
-using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;

access-token-management/test/AccessTokenManagement.Tests/UserTokenManagementWithDPoPTests.cs

@@ -161,7 +161,11 @@ public async Task dpop_nonce_retry_should_use_fresh_client_assertion_on_refresh(
                 var content = request.Content!.ReadAsStringAsync().Result;
                 var pairs = System.Web.HttpUtility.ParseQueryString(content);
                 var assertion = pairs["client_assertion"];
-                if (assertion != null) capturedAssertions.Add(assertion);
+                if (assertion != null)
+                {
+                    capturedAssertions.Add(assertion);
+                }
+
                 return true;
             })
             .Respond(HttpStatusCode.BadRequest, headers: new Dictionary<string, string>
@@ -186,7 +190,10 @@ public async Task dpop_nonce_retry_should_use_fresh_client_assertion_on_refresh(
                 var content = request.Content!.ReadAsStringAsync().Result;
                 var pairs = System.Web.HttpUtility.ParseQueryString(content);
                 var assertion = pairs["client_assertion"];
-                if (assertion != null) capturedAssertions.Add(assertion);
+                if (assertion != null)
+                {
+                    capturedAssertions.Add(assertion);
+                }
 
                 // Also verify the nonce is in the DPoP proof
                 var dpopProof = request.Headers.GetValues("DPoP").SingleOrDefault();
@@ -244,7 +251,11 @@ public async Task dpop_nonce_retry_during_code_exchange_should_use_fresh_client_
                 var content = request.Content!.ReadAsStringAsync().Result;
                 var pairs = System.Web.HttpUtility.ParseQueryString(content);
                 var assertion = pairs["client_assertion"];
-                if (assertion != null) capturedAssertions.Add(assertion);
+                if (assertion != null)
+                {
+                    capturedAssertions.Add(assertion);
+                }
+
                 return true;
             })
             .Respond(HttpStatusCode.BadRequest, headers: new Dictionary<string, string>
@@ -269,7 +280,10 @@ public async Task dpop_nonce_retry_during_code_exchange_should_use_fresh_client_
                 var content = request.Content!.ReadAsStringAsync().Result;
                 var pairs = System.Web.HttpUtility.ParseQueryString(content);
                 var assertion = pairs["client_assertion"];
-                if (assertion != null) capturedAssertions.Add(assertion);
+                if (assertion != null)
+                {
+                    capturedAssertions.Add(assertion);
+                }
 
                 // Verify the nonce is present in the DPoP proof
                 var dpopProof = request.Headers.GetValues("DPoP").SingleOrDefault();
@@ -300,13 +314,10 @@ private class CountingClientAssertionService(Func<string> valueFactory) : IClien
         public Task<ClientAssertion?> GetClientAssertionAsync(
             ClientCredentialsClientName? clientName = null,
             TokenRequestParameters? parameters = null,
-            CancellationToken ct = default)
-        {
-            return Task.FromResult<ClientAssertion?>(new ClientAssertion
+            CancellationToken ct = default) => Task.FromResult<ClientAssertion?>(new ClientAssertion
             {
                 Type = OidcConstants.ClientAssertionTypes.JwtBearer,
                 Value = valueFactory()
             });
-        }
     }
 }

identity-model-oidc-client/src/IdentityModel.OidcClient.Extensions/DPoP/OidcClientExtensions.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-using Duende.IdentityModel.Client;
-
 namespace Duende.IdentityModel.OidcClient.DPoP;
 
 /// <summary>

identity-model-oidc-client/src/IdentityModel.OidcClient.Extensions/DPoP/ProofTokenMessageHandler.cs

@@ -127,8 +127,8 @@ private async Task RebuildContentWithNewAssertionAsync(HttpRequestMessage reques
         // Parse the application/x-www-form-urlencoded body manually.
         // We use a list of pairs to preserve insertion order and multi-value keys.
         var pairs = new List<KeyValuePair<string, string>>();
-        bool assertionTypeSet = false;
-        bool assertionValueSet = false;
+        var assertionTypeSet = false;
+        var assertionValueSet = false;
 
         if (!string.IsNullOrEmpty(bodyString))
         {

identity-model-oidc-client/test/IdentityModel.OidcClient.Tests/DPoP/DPoPTests.cs

@@ -152,7 +152,10 @@ public async Task when_nonce_required_client_assertion_factory_should_be_called_
                 : string.Empty;
             var pairs = HttpUtility.ParseQueryString(body);
             var assertion = pairs["client_assertion"];
-            if (assertion != null) capturedAssertions.Add(assertion);
+            if (assertion != null)
+            {
+                capturedAssertions.Add(assertion);
+            }
 
             callCount++;
             if (callCount == 1)
@@ -229,7 +232,10 @@ public async Task when_no_client_assertion_factory_nonce_retry_does_not_modify_b
                 : string.Empty;
             var pairs = HttpUtility.ParseQueryString(body);
             var assertion = pairs["client_assertion"];
-            if (assertion != null) capturedAssertions.Add(assertion);
+            if (assertion != null)
+            {
+                capturedAssertions.Add(assertion);
+            }
 
             callCount++;
             if (callCount == 1)