Use primary constructors!

Todo.Web/Client/TodoClient.cs

@@ -3,14 +3,8 @@
 
 namespace Todo.Web.Client;
 
-public class TodoClient
+public class TodoClient(HttpClient client)
 {
- private readonly HttpClient _client;
- public TodoClient(HttpClient client)
- {
- _client = client;
- }
-
  public async Task<TodoItem?> AddTodoAsync(string? title)
  {
  if (string.IsNullOrEmpty(title))
@@ -20,7 +14,7 @@ public TodoClient(HttpClient client)
 
  TodoItem? createdTodo = null;
 
- var response = await _client.PostAsJsonAsync("todos", new TodoItem { Title = title });
+ var response = await client.PostAsJsonAsync("todos", new TodoItem { Title = title });
 
  if (response.IsSuccessStatusCode)
  {
@@ -32,13 +26,13 @@ public TodoClient(HttpClient client)
 
  public async Task<bool> DeleteTodoAsync(int id)
  {
- var response = await _client.DeleteAsync($"todos/{id}");
+ var response = await client.DeleteAsync($"todos/{id}");
  return response.IsSuccessStatusCode;
  }
 
  public async Task<(HttpStatusCode, List<TodoItem>?)> GetTodosAsync()
  {
- var response = await _client.GetAsync("todos");
+ var response = await client.GetAsync("todos");
  var statusCode = response.StatusCode;
  List<TodoItem>? todos = null;
 
@@ -57,7 +51,7 @@ public async Task<bool> LoginAsync(string? username, string? password)
  return false;
  }
 
- var response = await _client.PostAsJsonAsync("auth/login", new UserInfo { Username = username, Password = password });
+ var response = await client.PostAsJsonAsync("auth/login", new UserInfo { Username = username, Password = password });
  return response.IsSuccessStatusCode;
  }
 
@@ -68,13 +62,13 @@ public async Task<bool> CreateUserAsync(string? username, string? password)
  return false;
  }
 
- var response = await _client.PostAsJsonAsync("auth/register", new UserInfo { Username = username, Password = password });
+ var response = await client.PostAsJsonAsync("auth/register", new UserInfo { Username = username, Password = password });
  return response.IsSuccessStatusCode;
  }
 
  public async Task<bool> LogoutAsync()
  {
- var response = await _client.PostAsync("auth/logout", content: null);
+ var response = await client.PostAsync("auth/logout", content: null);
  return response.IsSuccessStatusCode;
  }
 }

Todo.Web/Server/AuthClient.cs

@@ -1,17 +1,10 @@
 namespace Todo.Web.Server;
 
-public class AuthClient
+public class AuthClient(HttpClient client)
 {
- private readonly HttpClient _client;
-
- public AuthClient(HttpClient client)
- {
- _client = client;
- }
-
  public async Task<string?> GetTokenAsync(UserInfo userInfo)
  {
- var response = await _client.PostAsJsonAsync("users/login", userInfo);
+ var response = await client.PostAsJsonAsync("users/login", userInfo);
 
  if (!response.IsSuccessStatusCode)
  {
@@ -25,7 +18,7 @@ public AuthClient(HttpClient client)
 
  public async Task<string?> CreateUserAsync(UserInfo userInfo)
  {
- var response = await _client.PostAsJsonAsync("users/register", userInfo);
+ var response = await client.PostAsJsonAsync("users/register", userInfo);
 
  if (!response.IsSuccessStatusCode)
  {
@@ -37,7 +30,7 @@ public AuthClient(HttpClient client)
 
  public async Task<string?> GetOrCreateUserAsync(string provider, ExternalUserInfo userInfo)
  {
- var response = await _client.PostAsJsonAsync($"users/token/{provider}", userInfo);
+ var response = await client.PostAsJsonAsync($"users/token/{provider}", userInfo);
 
  if (!response.IsSuccessStatusCode)
  {

Todo.Web/Server/Authentication/ExternalProviders.cs

@@ -3,16 +3,10 @@
 
 namespace Todo.Web.Server;
 
-public class ExternalProviders
+public class ExternalProviders(IAuthenticationSchemeProvider schemeProvider)
 {
- private readonly IAuthenticationSchemeProvider _schemeProvider;
  private Task<string[]>? _providerNames;
 
- public ExternalProviders(IAuthenticationSchemeProvider schemeProvider)
- {
- _schemeProvider = schemeProvider;
- }
-
  public Task<string[]> GetProviderNamesAsync()
  {
  return _providerNames ??= GetProviderNamesAsyncCore();
@@ -22,7 +16,7 @@ private async Task<string[]> GetProviderNamesAsyncCore()
  {
  List<string>? providerNames = null;
 
- var schemes = await _schemeProvider.GetAllSchemesAsync();
+ var schemes = await schemeProvider.GetAllSchemesAsync();
 
  foreach (var s in schemes)
  {

Todo.Web/Server/TodoApi.cs

@@ -16,6 +16,7 @@ public static RouteGroupBuilder MapTodos(this IEndpointRouteBuilder routes, stri
 
  group.RequireAuthorization();
 
+ // TODO: Remove when new YARP is released, see https://github.com/microsoft/reverse-proxy/issues/2131
  var transformBuilder = routes.ServiceProvider.GetRequiredService<ITransformBuilder>();
  var transform = transformBuilder.Create(b =>
  {

TodoApi.Tests/TodoApplication.cs

@@ -71,7 +71,7 @@ private async Task<string> CreateTokenAsync(string id, bool isAdmin = false)
 
  // Read the user JWTs configuration for testing so unit tests can generate
  // JWT tokens.
- var tokenService = scope.ServiceProvider.GetRequiredService<ITokenService>();
+ var tokenService = scope.ServiceProvider.GetRequiredService<TokenService>();
 
  return await tokenService.GenerateTokenAsync(id, isAdmin);
  }

TodoApi.Tests/TokenService.cs

@@ -10,18 +10,11 @@ public static class AuthenticationServiceExtensions
  public static IServiceCollection AddTokenService(this IServiceCollection services)
  {
  // Wire up the token service
- return services.AddScoped<ITokenService, TokenService>();
+ return services.AddScoped<TokenService>();
  }
 }
 
-public interface ITokenService
-{
- // Generate a token for the specified user name and admin role
- Task<string> GenerateTokenAsync(string username, bool isAdmin = false);
-}
-
-public sealed class TokenService(SignInManager<TodoUser> signInManager,
- IOptionsMonitor<BearerTokenOptions> options) : ITokenService
+public sealed class TokenService(SignInManager<TodoUser> signInManager, IOptionsMonitor<BearerTokenOptions> options)
 {
  private readonly BearerTokenOptions _options = options.Get(IdentityConstants.BearerScheme);
 

TodoApi/Authorization/CheckCurrentUserAuthHandler.cs

@@ -21,15 +21,12 @@ private class CheckCurrentUserRequirement : IAuthorizationRequirement { }
 
  // This authorization handler verifies that the user exists even if there's
  // a valid token
- private class CheckCurrentUserAuthHandler : AuthorizationHandler<CheckCurrentUserRequirement>
+ private class CheckCurrentUserAuthHandler(CurrentUser currentUser) : AuthorizationHandler<CheckCurrentUserRequirement>
  {
- private readonly CurrentUser _currentUser;
- public CheckCurrentUserAuthHandler(CurrentUser currentUser) => _currentUser = currentUser;
-
  protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, CheckCurrentUserRequirement requirement)
  {
  // TODO: Check user if the user is locked out as well
- if (_currentUser.User is not null)
+ if (currentUser.User is not null)
  {
  context.Succeed(requirement);
  }

TodoApi/Authorization/CurrentUserExtensions.cs

@@ -13,28 +13,19 @@ public static IServiceCollection AddCurrentUser(this IServiceCollection services
  return services;
  }
 
- private sealed class ClaimsTransformation : IClaimsTransformation
+ private sealed class ClaimsTransformation(CurrentUser currentUser, UserManager<TodoUser> userManager) : IClaimsTransformation
  {
- private readonly CurrentUser _currentUser;
- private readonly UserManager<TodoUser> _userManager;
-
- public ClaimsTransformation(CurrentUser currentUser, UserManager<TodoUser> userManager)
- {
- _currentUser = currentUser;
- _userManager = userManager;
- }
-
  public async Task<ClaimsPrincipal> TransformAsync(ClaimsPrincipal principal)
  {
  // We're not going to transform anything. We're using this as a hook into authorization
  // to set the current user without adding custom middleware.
- _currentUser.Principal = principal;
+ currentUser.Principal = principal;
 
  if (principal.FindFirstValue(ClaimTypes.NameIdentifier) is { Length: > 0 } id)
  {
  // Resolve the user manager and see if the current user is a valid user in the database
  // we do this once and store it on the current user.
- _currentUser.User = await _userManager.FindByIdAsync(id);
+ currentUser.User = await userManager.FindByIdAsync(id);
  }
 
  return principal;

TodoApi/TodoDbContext.cs

@@ -3,10 +3,8 @@
 
 namespace TodoApi;
 
-public class TodoDbContext : IdentityDbContext<TodoUser>
+public class TodoDbContext(DbContextOptions<TodoDbContext> options) : IdentityDbContext<TodoUser>(options)
 {
- public TodoDbContext(DbContextOptions<TodoDbContext> options) : base(options) { }
-
  public DbSet<Todo> Todos => Set<Todo>();
 
  protected override void OnModelCreating(ModelBuilder builder)