Merge pull request #232 from DuendeSoftware/dh/atm-tests-lint

Some clean up/linting in ATM

Author: Erwinvandervalk

access-token-management/test/AccessTokenManagement.Tests/AccessTokenHandler/AccessTokenHandlerTests.cs

@@ -3,12 +3,13 @@
 
 using System.Net;
 using System.Text.Json;
-using Duende.AccessTokenManagement.AccessTokenHandlers.Fixtures;
+using Duende.AccessTokenManagement.AccessTokenHandler.Fixtures;
+using Duende.AccessTokenManagement.AccessTokenHandler.Helpers;
 using Duende.AccessTokenManagement.DPoP;
 using Duende.IdentityServer.Configuration;
 using Microsoft.IdentityModel.Tokens;
 
-namespace Duende.AccessTokenManagement;
+namespace Duende.AccessTokenManagement.AccessTokenHandler;
 
 public class AccessTokenHandlerTests(ITestOutputHelper output)
 {

access-token-management/test/AccessTokenManagement.Tests/AccessTokenHandler/Fixtures/AccessTokenHandlingBaseFixture.cs

@@ -1,25 +1,28 @@
 // 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.AccessTokenManagement.AccessTokenHandlers.Helpers;
+using Duende.AccessTokenManagement.AccessTokenHandler.Helpers;
 using Duende.AccessTokenManagement.DPoP;
 using Duende.AccessTokenManagement.Framework;
-using Duende.AccessTokenManagement.Tests;
-
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace Duende.AccessTokenManagement.AccessTokenHandlers.Fixtures;
+namespace Duende.AccessTokenManagement.AccessTokenHandler.Fixtures;
 
 internal abstract class AccessTokenHandlingBaseFixture : IAsyncDisposable
 {
-    public TestData The { get; } = new TestData();
-    public TestDataBuilder Some => new TestDataBuilder(The);
+    public TestData The { get; } = new();
+
+    public TestDataBuilder Some => new(The);
+
+    public readonly ApiHttpMessageHandler ApiEndpoint = new();
+
+    public readonly TokenHttpMessageHandler TokenEndpoint = new();
 
-    public readonly ApiHttpMessageHandler ApiEndpoint = new ApiHttpMessageHandler();
-    public readonly TokenHttpMessageHandler TokenEndpoint = new TokenHttpMessageHandler();
     protected ServiceCollection Services = null!;
+
     public ServiceProvider ServiceProvider { get; private set; } = null!;
+
     public HttpClient HttpClient { get; private set; } = null!;
 
     public ValueTask DisposeAsync() => ValueTask.CompletedTask;

access-token-management/test/AccessTokenManagement.Tests/AccessTokenHandler/Fixtures/ClientCredentialsFixture.cs

@@ -5,7 +5,7 @@
 using Duende.AccessTokenManagement.DPoP;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Duende.AccessTokenManagement.AccessTokenHandlers.Fixtures;
+namespace Duende.AccessTokenManagement.AccessTokenHandler.Fixtures;
 
 internal class ClientCredentialsFixture : AccessTokenHandlingBaseFixture
 {

access-token-management/test/AccessTokenManagement.Tests/AccessTokenHandler/Fixtures/ClientCredentialsFixtureWithAutoTuning.cs

@@ -1,11 +1,10 @@
 // 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.AccessTokenManagement.DPoP;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Duende.AccessTokenManagement.AccessTokenHandlers.Fixtures;
+namespace Duende.AccessTokenManagement.AccessTokenHandler.Fixtures;
 
 internal class ClientCredentialsFixtureWithAutotuning : AccessTokenHandlingBaseFixture
 {

access-token-management/test/AccessTokenManagement.Tests/AccessTokenHandler/Fixtures/OidcClientFixture.cs

@@ -1,15 +1,14 @@
 // 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.AccessTokenManagement.AccessTokenHandlers.Helpers;
+using Duende.AccessTokenManagement.AccessTokenHandler.Helpers;
 using Duende.AccessTokenManagement.DPoP;
 using Duende.AccessTokenManagement.OpenIdConnect;
-
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Duende.AccessTokenManagement.AccessTokenHandlers.Fixtures;
+namespace Duende.AccessTokenManagement.AccessTokenHandler.Fixtures;
 
 internal class OidcClientFixture : AccessTokenHandlingBaseFixture
 {
@@ -29,9 +28,9 @@ public override async ValueTask InitializeAsync(DPoPProofKey? dPoPJsonWebKey)
             });
         Services.AddSingleton<IHttpContextAccessor>(sp =>
         {
-            return new FakeHttpContextAccessor()
+            return new FakeHttpContextAccessor
             {
-                HttpContext = new DefaultHttpContext()
+                HttpContext = new DefaultHttpContext
                 {
                     User = sp.GetRequiredService<FakeAuthenticationService>().Principal,
                     RequestServices = sp
@@ -45,7 +44,7 @@ public override async ValueTask InitializeAsync(DPoPProofKey? dPoPJsonWebKey)
         });
 
 
-        Services.AddClientAccessTokenHttpClient("httpClient", new UserTokenRequestParameters()
+        Services.AddClientAccessTokenHttpClient("httpClient", new UserTokenRequestParameters
         {
 
         })

access-token-management/test/AccessTokenManagement.Tests/AccessTokenHandler/Fixtures/OidcUserFixture.cs

@@ -1,15 +1,14 @@
 // 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.AccessTokenManagement.AccessTokenHandlers.Helpers;
+using Duende.AccessTokenManagement.AccessTokenHandler.Helpers;
 using Duende.AccessTokenManagement.DPoP;
 using Duende.AccessTokenManagement.OpenIdConnect;
-
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Duende.AccessTokenManagement.AccessTokenHandlers.Fixtures;
+namespace Duende.AccessTokenManagement.AccessTokenHandler.Fixtures;
 
 internal class OidcUserFixture : AccessTokenHandlingBaseFixture
 {
@@ -33,7 +32,7 @@ public override async ValueTask InitializeAsync(DPoPProofKey? dPoPJsonWebKey)
         {
             var httpContextAccessor = new FakeHttpContextAccessor
             {
-                HttpContext = new DefaultHttpContext()
+                HttpContext = new DefaultHttpContext
                 {
                     User = sp.GetRequiredService<FakeAuthenticationService>().Principal,
                     RequestServices = sp
@@ -48,10 +47,7 @@ public override async ValueTask InitializeAsync(DPoPProofKey? dPoPJsonWebKey)
         });
 
 
-        Services.AddClientAccessTokenHttpClient("httpClient", new UserTokenRequestParameters()
-        {
-
-        })
+        Services.AddClientAccessTokenHttpClient("httpClient", new UserTokenRequestParameters())
             .ConfigureHttpClient(c =>
             {
                 c.BaseAddress = ApiEndpoint.Uri;

access-token-management/test/AccessTokenManagement.Tests/AccessTokenHandler/Helpers/ApiHttpMessageHandler.cs

@@ -4,16 +4,16 @@
 using System.Net;
 using RichardSzalay.MockHttp;
 
-namespace Duende.AccessTokenManagement.AccessTokenHandlers.Helpers;
+namespace Duende.AccessTokenManagement.AccessTokenHandler.Helpers;
 
 public class ApiHttpMessageHandler : MockHttpMessageHandler
 {
-    public Uri Uri = new Uri("https://api");
+    public readonly Uri Uri = new("https://api");
 
     public string LastUsedAccessToken = "";
 
     public void ExpectCallWithoutNonce(string replyWithNonce) => this.Expect(Uri.ToString())
-            .Respond((request) =>
+            .Respond(request =>
             {
                 request.EnsureRequestUsesScheme("Bearer");
                 request.GetNonce().ShouldBeNull();
@@ -22,7 +22,7 @@ public void ExpectCallWithoutNonce(string replyWithNonce) => this.Expect(Uri.ToS
             });
 
     public void ExpectCallWithNonce(string expectedNonce, string replyWithNonce) => this.Expect(Uri.ToString())
-            .Respond((request) =>
+            .Respond(request =>
             {
                 request.EnsureRequestUsesScheme("Bearer");
                 request.GetNonce().ShouldBe(expectedNonce);
@@ -31,15 +31,14 @@ public void ExpectCallWithNonce(string expectedNonce, string replyWithNonce) =>
             });
 
     public void ExpectCallWithScheme(string expectedScheme) => this.Expect(Uri.ToString())
-            .Respond((request) =>
+            .Respond(request =>
             {
                 request.EnsureRequestUsesScheme(expectedScheme);
                 return new HttpResponseMessage(HttpStatusCode.OK);
             });
 
-
     public void DefaultRespondOkWithToken() =>
-        this.When(Uri.ToString()).Respond((request) =>
+        this.When(Uri.ToString()).Respond(request =>
         {
             request.EnsureRequestUsesScheme("Bearer");
 
@@ -51,7 +50,7 @@ public void DefaultRespondOkWithToken() =>
         });
 
     public void RespondOnceWithUnauthorized() =>
-        this.Expect(Uri.ToString()).Respond((request) =>
+        this.Expect(Uri.ToString()).Respond(request =>
         {
             request.EnsureRequestUsesScheme("Bearer");
             LastUsedAccessToken = request.Headers.Authorization?.Parameter ?? "";

access-token-management/test/AccessTokenManagement.Tests/AccessTokenHandler/Helpers/FakeAuthenticationService.cs

@@ -7,11 +7,11 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
 
-namespace Duende.AccessTokenManagement.AccessTokenHandlers.Helpers;
+namespace Duende.AccessTokenManagement.AccessTokenHandler.Helpers;
 
 public class FakeAuthenticationService(IStoreTokensInAuthenticationProperties storeTokens, TestAccessTokens testTokens) : IAuthenticationService
 {
-    public ClaimsPrincipal Principal = new ClaimsPrincipal(new ClaimsIdentity([new Claim(JwtClaimTypes.Subject, "sub")], "test"));
+    public ClaimsPrincipal Principal = new(new ClaimsIdentity([new Claim(JwtClaimTypes.Subject, "sub")], "test"));
 
     public Task<AuthenticateResult> AuthenticateAsync(HttpContext context, string? scheme) =>
         Task.FromResult(AuthenticateResult.Success(new AuthenticationTicket(Principal, BuildProperties(), "oidc")));

access-token-management/test/AccessTokenManagement.Tests/AccessTokenHandler/Helpers/FakeHttpContextAccessor.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.AspNetCore.Http;
 
-namespace Duende.AccessTokenManagement.AccessTokenHandlers.Helpers;
+namespace Duende.AccessTokenManagement.AccessTokenHandler.Helpers;
 
 internal class FakeHttpContextAccessor : IHttpContextAccessor
 {

access-token-management/test/AccessTokenManagement.Tests/AccessTokenHandler/Helpers/HttpMessageExtensions.cs

@@ -5,7 +5,7 @@
 using Duende.IdentityModel;
 using Microsoft.IdentityModel.JsonWebTokens;
 
-namespace Duende.AccessTokenManagement;
+namespace Duende.AccessTokenManagement.AccessTokenHandler.Helpers;
 
 public static class HttpMessageExtensions
 {