formatting

This commit is contained in:
Aaron Po
2026-08-24 01:08:55 -04:00
parent c825d99b0a
commit b64c42ebde
27 changed files with 166 additions and 136 deletions

View File

@@ -29,9 +29,7 @@ public class ConfirmUserHandler(
request.Token
);
ApplicationUser? user = await userManager.FindByIdAsync(
validatedToken.UserId.ToString()
);
ApplicationUser? user = await userManager.FindByIdAsync(validatedToken.UserId.ToString());
if (user == null)
throw new UnauthorizedException("User account not found");

View File

@@ -27,7 +27,9 @@ public class DeleteAccountHandler(UserManager<ApplicationUser> userManager)
throw new ConflictException(
"Account cannot be deleted while it still has associated posts, comments, photos, or follows."
);
throw new ConflictException(string.Join("; ", result.Errors.Select(e => e.Description)));
throw new ConflictException(
string.Join("; ", result.Errors.Select(e => e.Description))
);
}
}
}

View File

@@ -18,7 +18,10 @@ public class LoginHandler(UserManager<ApplicationUser> userManager, ITokenServic
/// Thrown when the username does not match any account or the supplied password does not match
/// the stored hash.
/// </exception>
public async Task<LoginPayload> Handle(LoginCommand request, CancellationToken cancellationToken)
public async Task<LoginPayload> Handle(
LoginCommand request,
CancellationToken cancellationToken
)
{
ApplicationUser user =
await userManager.FindByNameAsync(request.Username)

View File

@@ -43,7 +43,9 @@ public class RegisterUserHandler(
{
if (result.Errors.Any(e => e.Code is "DuplicateUserName" or "DuplicateEmail"))
throw new ConflictException("Username or email already exists");
throw new ConflictException(string.Join("; ", result.Errors.Select(e => e.Description)));
throw new ConflictException(
string.Join("; ", result.Errors.Select(e => e.Description))
);
}
string accessToken = tokenService.GenerateAccessToken(user.Id, user.UserName);
@@ -51,7 +53,13 @@ public class RegisterUserHandler(
string confirmationToken = tokenService.GenerateConfirmationToken(user.Id, user.UserName);
if (string.IsNullOrEmpty(accessToken) || string.IsNullOrEmpty(refreshToken))
return new RegistrationPayload(user.Id, user.UserName, string.Empty, string.Empty, false);
return new RegistrationPayload(
user.Id,
user.UserName,
string.Empty,
string.Empty,
false
);
bool emailSent = false;
try
@@ -68,6 +76,12 @@ public class RegisterUserHandler(
Console.WriteLine("Could not send email.");
}
return new RegistrationPayload(user.Id, user.UserName, refreshToken, accessToken, emailSent);
return new RegistrationPayload(
user.Id,
user.UserName,
refreshToken,
accessToken,
emailSent
);
}
}

View File

@@ -11,4 +11,5 @@ namespace Features.Auth.Commands.UpdateEmail;
/// The authenticated caller's own ID, extracted from the access token -- never bind this from
/// client-supplied input.
/// </param>
public record UpdateEmailCommand(Guid UserAccountId, string NewEmail) : IRequest<UpdateEmailPayload>;
public record UpdateEmailCommand(Guid UserAccountId, string NewEmail)
: IRequest<UpdateEmailPayload>;

View File

@@ -31,7 +31,9 @@ public class UpdateEmailHandler(UserManager<ApplicationUser> userManager)
{
if (result.Errors.Any(e => e.Code == "DuplicateEmail"))
throw new ConflictException("Email address already exists");
throw new ConflictException(string.Join("; ", result.Errors.Select(e => e.Description)));
throw new ConflictException(
string.Join("; ", result.Errors.Select(e => e.Description))
);
}
return new UpdateEmailPayload(user.Id, user.Email, user.EmailConfirmed);

View File

@@ -34,7 +34,9 @@ public class UpdatePasswordHandler(UserManager<ApplicationUser> userManager)
{
if (result.Errors.Any(e => e.Code == "PasswordMismatch"))
throw new UnauthorizedException("Current password is incorrect");
throw new ConflictException(string.Join("; ", result.Errors.Select(e => e.Description)));
throw new ConflictException(
string.Join("; ", result.Errors.Select(e => e.Description))
);
}
return new UpdatePasswordPayload(user.Id, DateTime.UtcNow);

View File

@@ -31,7 +31,9 @@ public class UpdateProfileHandler(UserManager<ApplicationUser> userManager)
IdentityResult result = await userManager.UpdateAsync(user);
if (!result.Succeeded)
throw new ConflictException(string.Join("; ", result.Errors.Select(e => e.Description)));
throw new ConflictException(
string.Join("; ", result.Errors.Select(e => e.Description))
);
return new UpdateProfilePayload(user.Id, user.FirstName, user.LastName, user.DateOfBirth);
}

View File

@@ -26,7 +26,9 @@ public class UpdateUsernameHandler(UserManager<ApplicationUser> userManager)
{
if (result.Errors.Any(e => e.Code == "DuplicateUserName"))
throw new ConflictException("Username already exists");
throw new ConflictException(string.Join("; ", result.Errors.Select(e => e.Description)));
throw new ConflictException(
string.Join("; ", result.Errors.Select(e => e.Description))
);
}
return new UpdateUsernamePayload(user.Id, user.UserName);

View File

@@ -71,7 +71,9 @@ public class AuthController(IMediator mediator) : ControllerBase
/// </remarks>
[AllowAnonymous]
[HttpPost("login")]
public async Task<ActionResult<ResponseBody<LoginPayload>>> Login([FromBody] LoginCommand command)
public async Task<ActionResult<ResponseBody<LoginPayload>>> Login(
[FromBody] LoginCommand command
)
{
LoginPayload payload = await mediator.Send(command);
return Ok(

View File

@@ -22,6 +22,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Queries\" />
<Folder Include="Queries\" />
</ItemGroup>
</Project>

View File

@@ -19,8 +19,7 @@ public sealed class DapperUserStore(ISqlConnectionFactory connectionFactory)
IUserPasswordStore<ApplicationUser>,
IUserEmailStore<ApplicationUser>
{
private const string SelectUserSql =
"""
private const string SelectUserSql = """
SELECT UserAccountID AS Id, Username AS UserName, FirstName, LastName, Email, DateOfBirth
FROM dbo.UserAccount
""";
@@ -33,8 +32,10 @@ public sealed class DapperUserStore(ISqlConnectionFactory connectionFactory)
Task.FromResult(user.Id.ToString());
/// <inheritdoc />
public Task<string?> GetUserNameAsync(ApplicationUser user, CancellationToken cancellationToken) =>
Task.FromResult<string?>(user.UserName);
public Task<string?> GetUserNameAsync(
ApplicationUser user,
CancellationToken cancellationToken
) => Task.FromResult<string?>(user.UserName);
/// <inheritdoc />
public Task SetUserNameAsync(

View File

@@ -21,7 +21,12 @@ public enum TokenType
public record ValidatedToken(Guid UserId, string Username, ClaimsPrincipal Principal);
/// <summary>Represents the result of refreshing a user's session.</summary>
public record RefreshTokenResult(Guid UserId, string Username, string RefreshToken, string AccessToken);
public record RefreshTokenResult(
Guid UserId,
string Username,
string RefreshToken,
string AccessToken
);
/// <summary>
/// Defines the expiration windows, in hours, for each type of token issued by <see cref="ITokenService" />.
@@ -61,7 +66,6 @@ public interface ITokenService
/// </summary>
string GenerateConfirmationToken(Guid userId, string username);
/// <summary>Validates an access token's signature and expiration and extracts the caller's identity.</summary>
/// <exception cref="Domain.Exceptions.UnauthorizedException">
/// Thrown when the token is missing required claims, has a malformed user ID, or otherwise fails validation.