Code improvements following update to .NET 8

Author: devpro

src/Common.MongoDb/DefaultMongoClientFactory.cs

@@ -6,7 +6,7 @@ namespace Devpro.Common.MongoDb
 {
     public class DefaultMongoClientFactory : IMongoClientFactory
     {
-        public DefaultMongoClientFactory()
+        static DefaultMongoClientFactory()
         {
             RegisterConventions();
         }
@@ -22,7 +22,7 @@ public virtual MongoClient CreateClient(string connectionString)
         /// <remarks>
         /// See https://github.com/mongodb/mongo-csharp-driver/tree/master/src/MongoDB.Bson/Serialization/Conventions
         /// </remarks>
-        protected virtual void RegisterConventions()
+        protected static void RegisterConventions()
         {
             var pack = new ConventionPack
             {

src/WebApi/ApplicationConfiguration.cs

@@ -2,13 +2,8 @@
 
 namespace Devpro.TerraformBackend.WebApi
 {
-    public class ApplicationConfiguration : WebApiConfiguration
+    public class ApplicationConfiguration(IConfigurationRoot configurationRoot) : WebApiConfiguration(configurationRoot)
     {
-        public ApplicationConfiguration(IConfigurationRoot configurationRoot)
-            : base(configurationRoot)
-        {
-        }
-
         public MongoDbConfiguration MongoDbConfiguration =>
             new()
             {

src/WebApi/Authentication/BasicAuthenticationHandler.cs

@@ -17,7 +17,7 @@ protected override Task<AuthenticateResult> HandleAuthenticateAsync()
                 return Task.FromResult(AuthenticateResult.Fail("Missing Authorization header"));
             }
 
-            var authorizationHeader = Request.Headers["Authorization"].ToString();
+            var authorizationHeader = Request.Headers.Authorization.ToString();
 
             // raises an error if the authorization header is not Basic
             if (!authorizationHeader.StartsWith("Basic ", StringComparison.OrdinalIgnoreCase))
@@ -27,7 +27,7 @@ protected override Task<AuthenticateResult> HandleAuthenticateAsync()
 
             // decrypts the authorization header and split out the client id/secret which is separated by the first ':'
             var authBase64Decoded = Encoding.UTF8.GetString(Convert.FromBase64String(authorizationHeader.Replace("Basic ", "", StringComparison.OrdinalIgnoreCase)));
-            var authSplit = authBase64Decoded.Split(new[] { ':' }, 2);
+            var authSplit = authBase64Decoded.Split([':'], 2);
 
             // sends an error if no username and password
             if (authSplit.Length != 2)
@@ -55,10 +55,10 @@ protected override Task<AuthenticateResult> HandleAuthenticateAsync()
             };
 
             // set the client ID as the name claim type
-            var claimsPrincipal = new ClaimsPrincipal(new ClaimsIdentity(client, new[]
-            {
+            var claimsPrincipal = new ClaimsPrincipal(new ClaimsIdentity(client,
+            [
                 new Claim(ClaimTypes.Name, clientId)
-            }));
+            ]));
 
             // returns a success result
             return Task.FromResult(AuthenticateResult.Success(new AuthenticationTicket(claimsPrincipal, Scheme.Name)));

src/WebApi/Controllers/StateController.cs

@@ -9,18 +9,8 @@ namespace Devpro.TerraformBackend.WebApi.Controllers
     [Authorize]
     [ApiController]
     [Route("state")]
-    public class StateController : ControllerBase
+    public class StateController(IStateRepository stateRepository, IStateLockRepository stateLockRepository) : ControllerBase
     {
-        private readonly IStateRepository _stateRepository;
-
-        private readonly IStateLockRepository _stateLockRepository;
-
-        public StateController(IStateRepository stateRepository, IStateLockRepository stateLockRepository)
-        {
-            _stateRepository = stateRepository;
-            _stateLockRepository = stateLockRepository;
-        }
-
         /// <summary>
         /// Get Terraform state value.
         /// </summary>
@@ -32,7 +22,7 @@ public StateController(IStateRepository stateRepository, IStateLockRepository st
         public async Task<string> FindOne(string name, [FromQuery(Name = "ID")] string? lockId = "")
         {
             //TODO: check lock
-            return await _stateRepository.FindOneAsync(name);
+            return await stateRepository.FindOneAsync(name);
         }
 
         /// <summary>
@@ -48,15 +38,15 @@ public async Task Create(string name, [FromBody] object input, [FromQuery(Name =
         {
             //TODO: check lock
             var jsonInput = JsonSerializer.Serialize(input);
-            await _stateRepository.CreateAsync(name, jsonInput);
+            await stateRepository.CreateAsync(name, jsonInput);
         }
 
         [HttpGet("/locks", Name = "GetStateLocks")]
         [ProducesResponseType(200)]
         public async Task<List<StateLockModel>> FindAllLocks([FromQuery] string? name = "")
         {
             //TODO: only for admins
-            return await _stateLockRepository.FindAllAsync();
+            return await stateLockRepository.FindAllAsync();
         }
 
         [HttpPost("{name}/lock", Name = "CreateStateLock")]
@@ -66,7 +56,7 @@ public async Task<List<StateLockModel>> FindAllLocks([FromQuery] string? name =
         public async Task Lock(string name, StateLockModel input)
         {
             input.Name = name;
-            await _stateLockRepository.CreateAsync(input);
+            await stateLockRepository.CreateAsync(input);
         }
 
         [HttpDelete("{name}/lock", Name = "DeleteStateLock")]
@@ -76,7 +66,7 @@ public async Task Lock(string name, StateLockModel input)
         public async Task Unlock(string name, [FromBody] StateLockModel input)
         {
             input.Name = name;
-            await _stateLockRepository.DeleteAsync(input);
+            await stateLockRepository.DeleteAsync(input);
         }
     }
 }

src/WebApi/DependencyInjection/AuthenticationServiceCollectionExtensions.cs

@@ -8,11 +8,6 @@ public static class AuthenticationServiceCollectionExtensions
     {
         public static AuthenticationBuilder AddBasicAuthentication(this IServiceCollection services)
         {
-            if (services == null)
-            {
-                throw new ArgumentNullException(nameof(services));
-            }
-
             return services.AddAuthentication()
                 .AddScheme<AuthenticationSchemeOptions, BasicAuthenticationHandler>(BasicAuthenticationDefaults.AuthenticationScheme, null);
         }

test/WebApi.IntegrationTests/IntegrationTestBase.cs

@@ -7,18 +7,11 @@ namespace Devpro.TerraformBackend.WebApi.IntegrationTests
     /// <summary>
     /// See https://learn.microsoft.com/en-us/aspnet/core/test/integration-tests
     /// </summary>
-    public abstract class IntegrationTestBase : IClassFixture<WebApplicationFactory<Program>>
+    public abstract class IntegrationTestBase(WebApplicationFactory<Program> factory) : IClassFixture<WebApplicationFactory<Program>>
     {
-        private readonly WebApplicationFactory<Program> _factory;
-
-        protected IntegrationTestBase(WebApplicationFactory<Program> factory)
-        {
-            _factory = factory;
-        }
-
         protected HttpClient CreateClient()
         {
-            return _factory.CreateClient();
+            return factory.CreateClient();
         }
     }
 }