Changes backend in preparation for frontend work

This commit is contained in:
2026-06-19 12:15:08 +02:00
parent b5357f213a
commit 23e2150140
22 changed files with 631 additions and 92 deletions
@@ -40,14 +40,11 @@ public class AuthService : IAuthService
return await GenerateTokenResponseAsync(user);
}
public async Task<TokenResponse> RefreshTokenAsync(string accessToken, string refreshToken)
public async Task<TokenResponse> RefreshTokenAsync(string refreshToken)
{
var principal = GetPrincipalFromExpiredToken(accessToken);
var userId = Guid.Parse(principal.FindFirstValue(ClaimTypes.NameIdentifier)!);
var savedRefreshToken = await _context.RefreshTokens
.Include(t => t.User)
.FirstOrDefaultAsync(t => t.Token == refreshToken && t.UserId == userId);
.FirstOrDefaultAsync(t => t.Token == refreshToken);
if (savedRefreshToken == null || !savedRefreshToken.IsActive)
{
@@ -57,6 +54,7 @@ public class AuthService : IAuthService
if (savedRefreshToken.IsUsed)
{
// Re-use detection: trek alle tokens van de gebruiker in
var userId = savedRefreshToken.UserId;
var allTokens = await _context.RefreshTokens.Where(t => t.UserId == userId).ToListAsync();
foreach (var token in allTokens) token.IsRevoked = true;
await _context.SaveChangesAsync();
@@ -82,6 +80,8 @@ public class AuthService : IAuthService
private async Task<TokenResponse> GenerateTokenResponseAsync(ApplicationUser user)
{
var roles = await _userManager.GetRolesAsync(user);
var primaryRole = roles.FirstOrDefault() ?? "User";
var claims = new List<Claim>
{
new(JwtRegisteredClaimNames.Sub, user.Id.ToString()),
@@ -119,7 +119,15 @@ public class AuthService : IAuthService
await _context.SaveChangesAsync();
return new TokenResponse(accessToken, refreshToken, expiry);
var userResponse = new UserResponse(
Id: user.Id,
Email: user.Email!,
Name: user.DisplayName ?? user.Email!,
Role: primaryRole,
IsActive: user.IsActive
);
return new TokenResponse(accessToken, refreshToken, expiry, userResponse);
}
private static string GenerateRefreshToken()
@@ -129,27 +137,4 @@ public class AuthService : IAuthService
rng.GetBytes(randomNumber);
return Convert.ToBase64String(randomNumber);
}
private ClaimsPrincipal GetPrincipalFromExpiredToken(string token)
{
var tokenValidationParameters = new TokenValidationParameters
{
ValidateAudience = false,
ValidateIssuer = false,
ValidateIssuerSigningKey = true,
IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_jwtSettings.Secret)),
ValidateLifetime = false // We willen juist het verlopen token lezen
};
var tokenHandler = new JwtSecurityTokenHandler();
var principal = tokenHandler.ValidateToken(token, tokenValidationParameters, out var securityToken);
if (securityToken is not JwtSecurityToken jwtSecurityToken ||
!jwtSecurityToken.Header.Alg.Equals(SecurityAlgorithms.HmacSha256, StringComparison.InvariantCultureIgnoreCase))
{
throw new SecurityTokenException("Ongeldig token.");
}
return principal;
}
}