From ed7a172f44a6c9765b553d0159f7270167b0be16 Mon Sep 17 00:00:00 2001 From: Sluijsens Date: Sun, 8 Nov 2026 15:49:32 +0100 Subject: [PATCH] Uitnodigingen: geldigheid instelbaar (standaard 24 uur) en verlopen uitnodigingen zichtbaar en verwijderbaar Co-Authored-By: Claude Sonnet 5.5 --- .../Identity/InvitationServiceTests.cs | 68 ++++++++++++++++++- .../Identity/InvitationSettingsTests.cs | 50 ++++++++++++++ .../Hosting/ServiceCollectionExtensions.cs | 6 ++ .../Identity/Models/IdentityRequests.cs | 5 +- .../Identity/Models/InvitationSettings.cs | 17 +++++ .../Identity/Services/IInvitationService.cs | 2 +- .../Identity/Services/InvitationService.cs | 16 +++-- .../Controllers/UsersControllerTests.cs | 22 ++++++ .../Controllers/UsersController.cs | 3 +- 9 files changed, 180 insertions(+), 9 deletions(-) create mode 100644 src/SlpModularCms.Core.Tests/Identity/InvitationSettingsTests.cs create mode 100644 src/SlpModularCms.Core/Identity/Models/InvitationSettings.cs diff --git a/src/SlpModularCms.Core.Tests/Identity/InvitationServiceTests.cs b/src/SlpModularCms.Core.Tests/Identity/InvitationServiceTests.cs index 72dca9b..762cc5d 100644 --- a/src/SlpModularCms.Core.Tests/Identity/InvitationServiceTests.cs +++ b/src/SlpModularCms.Core.Tests/Identity/InvitationServiceTests.cs @@ -1,5 +1,7 @@ using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Options; +using SlpModularCms.Core.Identity.Models; using NSubstitute; using SlpModularCms.Core.Data; using SlpModularCms.Core.Identity.Entities; @@ -26,7 +28,7 @@ public class InvitationServiceTests var store = Substitute.For>(); _userManager = Substitute.For>(store, null, null, null, null, null, null, null, null); - _service = new InvitationService(_context, _userManager); + _service = new InvitationService(_context, _userManager, Options.Create(new InvitationSettings())); } [Fact] @@ -297,4 +299,68 @@ public class InvitationServiceTests (await _context.Invitations.AnyAsync(i => i.Email == "gone@example.com")).Should().BeFalse(); } + + [Fact] + public async Task CreateInvitationAsync_DefaultsToTwentyFourHours() + { + var token = await _service.CreateInvitationAsync("default@example.com", "User"); + + var inv = await _context.Invitations.SingleAsync(i => i.Token == token); + (inv.ExpiryDate - DateTimeOffset.UtcNow).Should().BeCloseTo(TimeSpan.FromHours(24), TimeSpan.FromMinutes(1)); + } + + [Fact] + public async Task CreateInvitationAsync_UsesTheConfiguredLifetime() + { + var service = new InvitationService(_context, _userManager, + Options.Create(new InvitationSettings { ExpiryHours = 72 })); + + var token = await service.CreateInvitationAsync("long@example.com", "User"); + + var inv = await _context.Invitations.SingleAsync(i => i.Token == token); + (inv.ExpiryDate - DateTimeOffset.UtcNow).Should().BeCloseTo(TimeSpan.FromHours(72), TimeSpan.FromMinutes(1)); + } + + [Fact] + public async Task GetAllPendingInvitationsAsync_IncludesExpiredOnes_FlaggedAsExpired() + { + await _service.CreateInvitationAsync("fresh@example.com", "User"); + var staleToken = await _service.CreateInvitationAsync("stale@example.com", "User"); + var stale = await _context.Invitations.SingleAsync(i => i.Token == staleToken); + stale.ExpiryDate = DateTimeOffset.UtcNow.AddMinutes(-5); + await _context.SaveChangesAsync(); + + var all = await _service.GetAllPendingInvitationsAsync(); + + all.Should().HaveCount(2); + all.Single(i => i.Email == "stale@example.com").IsExpired.Should().BeTrue(); + all.Single(i => i.Email == "fresh@example.com").IsExpired.Should().BeFalse(); + } + + [Fact] + public async Task DeletedInvitation_CanNoLongerBeValidatedOrCompleted() + { + var token = await _service.CreateInvitationAsync("revoked@example.com", "User"); + var id = (await _service.GetAllPendingInvitationsAsync()).Single().Id; + (await _service.ValidateInvitationAsync(token)).Should().BeTrue(); + + (await _service.DeleteInvitationByIdAsync(id)).Should().BeTrue(); + + (await _service.ValidateInvitationAsync(token)).Should().BeFalse(); + var act = () => _service.CompleteInvitationAsync(token, "SafePassword123!", "Nobody"); + await act.Should().ThrowAsync(); + await _userManager.DidNotReceive().CreateAsync(Arg.Any(), Arg.Any()); + } + + [Fact] + public async Task ExpiredInvitation_CanBeDeleted() + { + var token = await _service.CreateInvitationAsync("late2@example.com", "User"); + var inv = await _context.Invitations.SingleAsync(i => i.Token == token); + inv.ExpiryDate = DateTimeOffset.UtcNow.AddHours(-1); + await _context.SaveChangesAsync(); + + (await _service.DeleteInvitationByIdAsync(inv.Id)).Should().BeTrue(); + (await _context.Invitations.AnyAsync()).Should().BeFalse(); + } } diff --git a/src/SlpModularCms.Core.Tests/Identity/InvitationSettingsTests.cs b/src/SlpModularCms.Core.Tests/Identity/InvitationSettingsTests.cs new file mode 100644 index 0000000..7cafc35 --- /dev/null +++ b/src/SlpModularCms.Core.Tests/Identity/InvitationSettingsTests.cs @@ -0,0 +1,50 @@ +using FluentAssertions; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Options; +using SlpModularCms.Core.Hosting; +using SlpModularCms.Core.Identity.Models; + +namespace SlpModularCms.Core.Tests.Identity; + +public class InvitationSettingsTests +{ + private static IOptions Resolve(string? hours) + { + var values = new Dictionary + { + ["JwtSettings:Secret"] = "a-test-secret-that-is-long-enough-for-hmac-sha256-0123456789", + ["JwtSettings:Issuer"] = "i", + ["JwtSettings:Audience"] = "a", + ["ConnectionStrings:DefaultConnection"] = "Server=localhost;Database=x;User=x;Password=x" + }; + if (hours is not null) values["Identity:Invitation:ExpiryHours"] = hours; + var config = new ConfigurationBuilder().AddInMemoryCollection(values).Build(); + + var services = new ServiceCollection(); + services.AddLogging(); + services.AddCoreInfrastructure(config); + return services.BuildServiceProvider().GetRequiredService>(); + } + + [Fact] + public void WithoutConfiguration_ExpiresAfterTwentyFourHours() => + Resolve(null).Value.ExpiryHours.Should().Be(24); + + [Fact] + public void ReadsTheConfiguredValue() => + Resolve("48").Value.ExpiryHours.Should().Be(48); + + [Theory] + [InlineData("0")] + [InlineData("-5")] + [InlineData("721")] + public void RejectsOutOfRangeValues(string hours) + { + var options = Resolve(hours); + + var act = () => options.Value; + + act.Should().Throw().WithMessage("*ExpiryHours*"); + } +} diff --git a/src/SlpModularCms.Core/Hosting/ServiceCollectionExtensions.cs b/src/SlpModularCms.Core/Hosting/ServiceCollectionExtensions.cs index 8d47456..f4eea6c 100644 --- a/src/SlpModularCms.Core/Hosting/ServiceCollectionExtensions.cs +++ b/src/SlpModularCms.Core/Hosting/ServiceCollectionExtensions.cs @@ -59,6 +59,12 @@ public static class ServiceCollectionExtensions services.Configure(configuration.GetSection("JwtSettings")); services.Configure(configuration.GetSection("Availability")); + services.AddOptions() + .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(); services.AddScoped(); diff --git a/src/SlpModularCms.Core/Identity/Models/IdentityRequests.cs b/src/SlpModularCms.Core/Identity/Models/IdentityRequests.cs index 7779b60..79971b7 100644 --- a/src/SlpModularCms.Core/Identity/Models/IdentityRequests.cs +++ b/src/SlpModularCms.Core/Identity/Models/IdentityRequests.cs @@ -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); diff --git a/src/SlpModularCms.Core/Identity/Models/InvitationSettings.cs b/src/SlpModularCms.Core/Identity/Models/InvitationSettings.cs new file mode 100644 index 0000000..d7f2612 --- /dev/null +++ b/src/SlpModularCms.Core/Identity/Models/InvitationSettings.cs @@ -0,0 +1,17 @@ +using System.Diagnostics.CodeAnalysis; + +namespace SlpModularCms.Core.Identity.Models; + +/// +/// Configuration for user invitations (section Identity:Invitation). +/// +[ExcludeFromCodeCoverage] +public class InvitationSettings +{ + public const string SectionName = "Identity:Invitation"; + public const int DefaultExpiryHours = 24; + public const int MaxExpiryHours = 24 * 30; + + /// How long an invitation link stays valid, in hours. Default 24, at most 30 days. + public int ExpiryHours { get; set; } = DefaultExpiryHours; +} diff --git a/src/SlpModularCms.Core/Identity/Services/IInvitationService.cs b/src/SlpModularCms.Core/Identity/Services/IInvitationService.cs index eac04a5..1a57a10 100644 --- a/src/SlpModularCms.Core/Identity/Services/IInvitationService.cs +++ b/src/SlpModularCms.Core/Identity/Services/IInvitationService.cs @@ -33,7 +33,7 @@ public interface IInvitationService Task DeleteInvitationsByEmailAsync(string email); /// - /// Geeft alle actieve (niet-geaccepteerde, niet-verlopen) uitnodigingen terug. + /// Geeft alle openstaande (niet-geaccepteerde) uitnodigingen terug, ook verlopen (met IsExpired). /// Task> GetAllPendingInvitationsAsync(); diff --git a/src/SlpModularCms.Core/Identity/Services/InvitationService.cs b/src/SlpModularCms.Core/Identity/Services/InvitationService.cs index 4afa960..0c14abd 100644 --- a/src/SlpModularCms.Core/Identity/Services/InvitationService.cs +++ b/src/SlpModularCms.Core/Identity/Services/InvitationService.cs @@ -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 _userManager; + private readonly InvitationSettings _settings; - public InvitationService(ApplicationDbContext context, UserManager userManager) + public InvitationService( + ApplicationDbContext context, + UserManager userManager, + IOptions settings) { _context = context; _userManager = userManager; + _settings = settings.Value; } public async Task 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> 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(); } diff --git a/src/SlpModularCms.Modules.Identity.Tests/Controllers/UsersControllerTests.cs b/src/SlpModularCms.Modules.Identity.Tests/Controllers/UsersControllerTests.cs index ede6208..50e46f3 100644 --- a/src/SlpModularCms.Modules.Identity.Tests/Controllers/UsersControllerTests.cs +++ b/src/SlpModularCms.Modules.Identity.Tests/Controllers/UsersControllerTests.cs @@ -125,6 +125,28 @@ public class UsersControllerTests : IDisposable list.Should().Contain(u => u.Email == "pending@test.com" && u.InvitationPending); } + [Fact] + public async Task GetUsers_ShowsExpiredInvitations_WithoutALink_SoTheyCanBeRemoved() + { + _invitationService.GetPendingInvitationByEmailAsync(Arg.Any()).Returns((false, null)); + _invitationService.GetAllPendingInvitationsAsync().Returns([ + new PendingInvitationInfo(Guid.NewGuid(), "late@test.com", "User", "tok", DateTimeOffset.UtcNow.AddDays(-2), IsExpired: true), + new PendingInvitationInfo(Guid.NewGuid(), "fresh@test.com", "User", "tok2", DateTimeOffset.UtcNow) + ]); + + var result = await CreateController().GetUsers(); + + var list = result.Should().BeOfType().Subject.Value + .Should().BeAssignableTo>().Subject.ToList(); + var late = list.Single(u => u.Email == "late@test.com"); + late.InvitationPending.Should().BeTrue(); + late.InvitationExpired.Should().BeTrue(); + late.InviteLink.Should().BeNull(); + var fresh = list.Single(u => u.Email == "fresh@test.com"); + fresh.InvitationExpired.Should().BeFalse(); + fresh.InviteLink.Should().Contain("token=tok2"); + } + // --- UpdateProfile --- [Fact] diff --git a/src/SlpModularCms.Modules.Identity/Controllers/UsersController.cs b/src/SlpModularCms.Modules.Identity/Controllers/UsersController.cs index ec04438..876e689 100644 --- a/src/SlpModularCms.Modules.Identity/Controllers/UsersController.cs +++ b/src/SlpModularCms.Modules.Identity/Controllers/UsersController.cs @@ -69,7 +69,8 @@ public class UsersController : ControllerBase true, inv.CreatedAt, true, - $"/invite/complete?token={Uri.EscapeDataString(inv.Token)}")); + inv.IsExpired ? null : $"/invite/complete?token={Uri.EscapeDataString(inv.Token)}", + inv.IsExpired)); } }