Changes backend in preparation for frontend work
This commit is contained in:
@@ -17,6 +17,11 @@ public class ApplicationUser : IdentityUser<Guid>
|
||||
/// </summary>
|
||||
public DateTimeOffset CreatedAt { get; set; } = DateTimeOffset.UtcNow;
|
||||
|
||||
/// <summary>
|
||||
/// De naam van de gebruiker die wordt weergegeven in de UI.
|
||||
/// </summary>
|
||||
public string? DisplayName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Navigatie-eigenschap naar module-specifieke rechten.
|
||||
/// </summary>
|
||||
|
||||
@@ -2,6 +2,5 @@ namespace SlpModularCms.Core.Identity.Models;
|
||||
|
||||
public record CreateOwnerRequest(string Email, string Password);
|
||||
public record LoginRequest(string Email, string Password);
|
||||
public record RefreshTokenRequest(string AccessToken, string RefreshToken);
|
||||
public record InviteUserRequest(string Email, string Role);
|
||||
public record CompleteSetupRequest(string Token, string Password);
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace SlpModularCms.Core.Identity.Models;
|
||||
|
||||
/// <summary>
|
||||
@@ -5,6 +7,18 @@ namespace SlpModularCms.Core.Identity.Models;
|
||||
/// </summary>
|
||||
public record TokenResponse(
|
||||
string AccessToken,
|
||||
string RefreshToken,
|
||||
DateTimeOffset Expiry
|
||||
[property: JsonIgnore] string RefreshToken,
|
||||
DateTimeOffset ExpiresAt,
|
||||
UserResponse User
|
||||
);
|
||||
|
||||
/// <summary>
|
||||
/// Model voor gebruikersinformatie in de auth response.
|
||||
/// </summary>
|
||||
public record UserResponse(
|
||||
Guid Id,
|
||||
string Email,
|
||||
string Name,
|
||||
string Role,
|
||||
bool IsActive
|
||||
);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ public interface IAuthService
|
||||
/// <summary>
|
||||
/// Vernieuwt een verlopen access token met een geldig refresh token.
|
||||
/// </summary>
|
||||
Task<TokenResponse> RefreshTokenAsync(string accessToken, string refreshToken);
|
||||
Task<TokenResponse> RefreshTokenAsync(string refreshToken);
|
||||
|
||||
/// <summary>
|
||||
/// Trekt een refresh token in (uitloggen).
|
||||
|
||||
Reference in New Issue
Block a user