Uitnodigingen: geldigheid instelbaar (standaard 24 uur) en verlopen uitnodigingen zichtbaar en verwijderbaar
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -59,6 +59,12 @@ public static class ServiceCollectionExtensions
|
||||
|
||||
services.Configure<JwtSettings>(configuration.GetSection("JwtSettings"));
|
||||
services.Configure<AvailabilityOptions>(configuration.GetSection("Availability"));
|
||||
services.AddOptions<InvitationSettings>()
|
||||
.Bind(configuration.GetSection(InvitationSettings.SectionName))
|
||||
.Validate(
|
||||
o => o.ExpiryHours is >= 1 and <= InvitationSettings.MaxExpiryHours,
|
||||
$"{InvitationSettings.SectionName}:ExpiryHours must be between 1 and {InvitationSettings.MaxExpiryHours}.")
|
||||
.ValidateOnStart();
|
||||
|
||||
services.AddScoped<IAuthService, AuthService>();
|
||||
services.AddScoped<IInvitationService, InvitationService>();
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace SlpModularCms.Core.Identity.Models;
|
||||
[ExcludeFromCodeCoverage] public record UpdateProfileRequest(string Name, string Email);
|
||||
[ExcludeFromCodeCoverage] public record ChangePasswordRequest(string CurrentPassword, string NewPassword);
|
||||
[ExcludeFromCodeCoverage] public record SetUserActiveRequest(bool IsActive);
|
||||
[ExcludeFromCodeCoverage] public record PendingInvitationInfo(Guid Id, string Email, string Role, string Token, DateTimeOffset CreatedAt);
|
||||
[ExcludeFromCodeCoverage] public record PendingInvitationInfo(Guid Id, string Email, string Role, string Token, DateTimeOffset CreatedAt, bool IsExpired = false);
|
||||
[ExcludeFromCodeCoverage]
|
||||
public record UserDto(
|
||||
Guid Id,
|
||||
@@ -20,4 +20,5 @@ public record UserDto(
|
||||
bool IsActive,
|
||||
DateTimeOffset CreatedAt,
|
||||
bool InvitationPending,
|
||||
string? InviteLink);
|
||||
string? InviteLink,
|
||||
bool InvitationExpired = false);
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
|
||||
namespace SlpModularCms.Core.Identity.Models;
|
||||
|
||||
/// <summary>
|
||||
/// Configuration for user invitations (section <c>Identity:Invitation</c>).
|
||||
/// </summary>
|
||||
[ExcludeFromCodeCoverage]
|
||||
public class InvitationSettings
|
||||
{
|
||||
public const string SectionName = "Identity:Invitation";
|
||||
public const int DefaultExpiryHours = 24;
|
||||
public const int MaxExpiryHours = 24 * 30;
|
||||
|
||||
/// <summary>How long an invitation link stays valid, in hours. Default 24, at most 30 days.</summary>
|
||||
public int ExpiryHours { get; set; } = DefaultExpiryHours;
|
||||
}
|
||||
@@ -33,7 +33,7 @@ public interface IInvitationService
|
||||
Task DeleteInvitationsByEmailAsync(string email);
|
||||
|
||||
/// <summary>
|
||||
/// Geeft alle actieve (niet-geaccepteerde, niet-verlopen) uitnodigingen terug.
|
||||
/// Geeft alle openstaande (niet-geaccepteerde) uitnodigingen terug, ook verlopen (met IsExpired).
|
||||
/// </summary>
|
||||
Task<IReadOnlyList<PendingInvitationInfo>> GetAllPendingInvitationsAsync();
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using System.Security.Cryptography;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Options;
|
||||
using SlpModularCms.Core.Data;
|
||||
using SlpModularCms.Core.Exceptions;
|
||||
using SlpModularCms.Core.Identity.Entities;
|
||||
@@ -12,11 +13,16 @@ public class InvitationService : IInvitationService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
private readonly UserManager<ApplicationUser> _userManager;
|
||||
private readonly InvitationSettings _settings;
|
||||
|
||||
public InvitationService(ApplicationDbContext context, UserManager<ApplicationUser> userManager)
|
||||
public InvitationService(
|
||||
ApplicationDbContext context,
|
||||
UserManager<ApplicationUser> userManager,
|
||||
IOptions<InvitationSettings> settings)
|
||||
{
|
||||
_context = context;
|
||||
_userManager = userManager;
|
||||
_settings = settings.Value;
|
||||
}
|
||||
|
||||
public async Task<string> CreateInvitationAsync(string email, string role)
|
||||
@@ -52,7 +58,7 @@ public class InvitationService : IInvitationService
|
||||
Email = email,
|
||||
Role = role,
|
||||
Token = token,
|
||||
ExpiryDate = DateTimeOffset.UtcNow.AddDays(1),
|
||||
ExpiryDate = DateTimeOffset.UtcNow.AddHours(_settings.ExpiryHours),
|
||||
IsAccepted = false
|
||||
};
|
||||
|
||||
@@ -118,12 +124,14 @@ public class InvitationService : IInvitationService
|
||||
public async Task<IReadOnlyList<PendingInvitationInfo>> GetAllPendingInvitationsAsync()
|
||||
{
|
||||
var invitations = await _context.Invitations
|
||||
.Where(i => !i.IsAccepted && i.ExpiryDate > DateTimeOffset.UtcNow)
|
||||
.Where(i => !i.IsAccepted)
|
||||
.OrderBy(i => i.CreatedAt)
|
||||
.ToListAsync();
|
||||
|
||||
// Expired ones are included on purpose: dropping them made an invited person who did not
|
||||
// activate in time vanish from the list, so the administrator could neither see nor remove them.
|
||||
return invitations
|
||||
.Select(i => new PendingInvitationInfo(i.Id, i.Email, i.Role, i.Token, i.CreatedAt))
|
||||
.Select(i => new PendingInvitationInfo(i.Id, i.Email, i.Role, i.Token, i.CreatedAt, i.IsExpired))
|
||||
.ToList();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user