U2 identity-mail-flows (backend): taal per gebruiker, uitnodigingsmail, opnieuw versturen, meldingen, stamp-controle

Kolommen Users.PreferredLanguage en Invitations.Language (additieve migratie). IdentityMailService
verstuurt uitnodiging, nieuwe link en meldingen bij deactiveren, heractiveren en rolwijziging;
een mailfout laat nooit een actie falen, het resultaat gaat mee in de respons naast de
kopieerbare link. Nieuwe actie resend-invite. De security stamp zit in het access token en wordt
vergeleken in de actief-controle: een wachtwoordwijziging beeindigt eerder uitgegeven access tokens,
de refresh geeft stil een nieuw token.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-11-08 19:10:44 +01:00
co-authored by Claude Sonnet 5.5
parent 2a0561a58e
commit 149f81a479
23 changed files with 1491 additions and 37 deletions
@@ -0,0 +1,334 @@
using System.Security.Claims;
using FluentAssertions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Extensions.Options;
using NSubstitute;
using SlpModularCms.Core.Data;
using SlpModularCms.Core.Email;
using SlpModularCms.Core.Identity.Entities;
using SlpModularCms.Core.Identity.Models;
using SlpModularCms.Core.Identity.Services;
using SlpModularCms.Modules.Identity.Controllers;
namespace SlpModularCms.Modules.Identity.Tests.Controllers;
/// <summary>
/// What the mail adds to the user-management actions: the invitation mail with the chosen language, the
/// resend, the notices, the language preference. A mail failure never fails the action.
/// </summary>
public class UsersControllerMailTests : IDisposable
{
private readonly ApplicationDbContext _context;
private readonly UserManager<ApplicationUser> _userManager;
private readonly RoleManager<ApplicationRole> _roleManager;
private readonly IInvitationService _invitations = Substitute.For<IInvitationService>();
private readonly IIdentityMailService _mail = Substitute.For<IIdentityMailService>();
public UsersControllerMailTests()
{
_context = new ApplicationDbContext(new DbContextOptionsBuilder<ApplicationDbContext>()
.UseInMemoryDatabase(Guid.NewGuid().ToString()).Options);
_userManager = new UserManager<ApplicationUser>(
new UserStore<ApplicationUser, ApplicationRole, ApplicationDbContext, Guid>(_context),
Options.Create(new IdentityOptions()), new PasswordHasher<ApplicationUser>(),
Array.Empty<IUserValidator<ApplicationUser>>(), Array.Empty<IPasswordValidator<ApplicationUser>>(),
new UpperInvariantLookupNormalizer(), new IdentityErrorDescriber(), null!,
NullLogger<UserManager<ApplicationUser>>.Instance);
_roleManager = new RoleManager<ApplicationRole>(
new RoleStore<ApplicationRole, ApplicationDbContext, Guid>(_context),
Array.Empty<IRoleValidator<ApplicationRole>>(), new UpperInvariantLookupNormalizer(),
new IdentityErrorDescriber(), NullLogger<RoleManager<ApplicationRole>>.Instance);
_invitations.GetAllPendingInvitationsAsync().Returns(new List<PendingInvitationInfo>());
_mail.SendInvitationAsync(default!, default!, default, default, default).ReturnsForAnyArgs(MailSendResult.Ok);
_mail.SendAccountDeactivatedAsync(default!, default).ReturnsForAnyArgs(MailSendResult.Ok);
_mail.SendAccountReactivatedAsync(default!, default).ReturnsForAnyArgs(MailSendResult.Ok);
_mail.SendRoleChangedAsync(default!, default!, default).ReturnsForAnyArgs(MailSendResult.Ok);
}
public void Dispose()
{
_userManager.Dispose();
_roleManager.Dispose();
_context.Dispose();
}
private async Task<ApplicationUser> Add(string email, string role, string? language = null, bool active = true)
{
if (!await _roleManager.RoleExistsAsync(role)) await _roleManager.CreateAsync(new ApplicationRole { Name = role });
var user = new ApplicationUser
{
Id = Guid.NewGuid(), Email = email, UserName = email, NormalizedEmail = email.ToUpperInvariant(),
NormalizedUserName = email.ToUpperInvariant(), DisplayName = "Naam " + email, IsActive = active,
PreferredLanguage = language, CreatedAt = DateTimeOffset.UtcNow
};
await _userManager.CreateAsync(user, "Password1!");
await _userManager.AddToRoleAsync(user, role);
return user;
}
private UsersController As(ApplicationUser caller)
{
var controller = new UsersController(_invitations, _userManager, _mail);
controller.ControllerContext = new ControllerContext
{
HttpContext = new DefaultHttpContext
{
User = new ClaimsPrincipal(new ClaimsIdentity(
[new Claim(ClaimTypes.Name, caller.UserName!), new Claim(ClaimTypes.NameIdentifier, caller.Id.ToString())], "Test"))
}
};
return controller;
}
private void Pending(Guid id, string role = "User", bool expired = false, string? language = "en") =>
_invitations.GetAllPendingInvitationsAsync().Returns(new List<PendingInvitationInfo>
{
new(id, "invited@test.com", role, "old-token", DateTimeOffset.UtcNow.AddDays(-2), expired, language)
});
private static T Prop<T>(object? body, string name) =>
(T)body!.GetType().GetProperty(name)!.GetValue(body)!;
// --- invite ---
[Fact]
public async Task Invite_CreatesTheInvitationWithTheChosenLanguage_SendsTheMail_AndReturnsLinkAndResult()
{
var owner = await Add("owner@test.com", "Owner");
_invitations.CreateInvitationAsync("new@test.com", "User", "en").Returns("tok");
var result = await As(owner).Invite(new InviteUserRequest("new@test.com", "User", "en"));
var body = result.Should().BeOfType<OkObjectResult>().Subject.Value;
Prop<string>(body, "inviteLink").Should().Be("/invite/complete?token=tok");
var mail = Prop<object>(body, "mail");
Prop<bool>(mail, "sent").Should().BeTrue();
await _mail.Received(1).SendInvitationAsync("new@test.com", "tok", "en", false, Arg.Any<CancellationToken>());
}
[Fact]
public async Task Invite_WhenTheMailFails_StillSucceeds_AndReportsTheFailureNextToTheLink()
{
var owner = await Add("owner@test.com", "Owner");
_invitations.CreateInvitationAsync("new@test.com", "User", null).Returns("tok");
_mail.SendInvitationAsync(default!, default!, default, default, default).ReturnsForAnyArgs(MailSendResult.Fail(MailSendResult.Timeout));
var result = await As(owner).Invite(new InviteUserRequest("new@test.com", "User"));
var body = result.Should().BeOfType<OkObjectResult>().Subject.Value;
Prop<string>(body, "inviteLink").Should().NotBeNullOrEmpty();
var mail = Prop<object>(body, "mail");
Prop<bool>(mail, "sent").Should().BeFalse();
Prop<string>(mail, "error").Should().Be("timeout");
}
[Fact]
public async Task Invite_OnASiteWithoutMail_HasNoMailResult()
{
var owner = await Add("owner@test.com", "Owner");
_invitations.CreateInvitationAsync("new@test.com", "User", null).Returns("tok");
_mail.SendInvitationAsync(default!, default!, default, default, default).ReturnsForAnyArgs(MailSendResult.Fail(MailSendResult.Disabled));
var result = await As(owner).Invite(new InviteUserRequest("new@test.com", "User"));
Prop<object?>(result.Should().BeOfType<OkObjectResult>().Subject.Value, "mail").Should().BeNull();
}
[Fact]
public async Task Invite_RejectsAnUnsupportedLanguage_WithoutCreatingAnything()
{
var owner = await Add("owner@test.com", "Owner");
var result = await As(owner).Invite(new InviteUserRequest("new@test.com", "User", "de"));
result.Should().BeOfType<BadRequestObjectResult>();
await _invitations.DidNotReceiveWithAnyArgs().CreateInvitationAsync(default!, default!, default);
}
// --- regenerate / resend ---
[Fact]
public async Task Regenerate_SendsTheNewLinkMail_InTheLanguageOfTheInvitation()
{
var owner = await Add("owner@test.com", "Owner");
var id = Guid.NewGuid();
Pending(id, language: "en");
_invitations.RegenerateInvitationAsync(id).Returns("new-token");
var result = await As(owner).RegenerateInvite(id);
Prop<string>(result.Should().BeOfType<OkObjectResult>().Subject.Value, "inviteLink").Should().Contain("new-token");
await _mail.Received(1).SendInvitationAsync("invited@test.com", "new-token", "en", true, Arg.Any<CancellationToken>());
}
[Fact]
public async Task Resend_OfAValidInvitation_SendsTheExistingLink_WithoutCreatingANewOne()
{
var owner = await Add("owner@test.com", "Owner");
var id = Guid.NewGuid();
Pending(id, expired: false);
var result = await As(owner).ResendInvite(id);
Prop<string>(result.Should().BeOfType<OkObjectResult>().Subject.Value, "inviteLink").Should().Contain("old-token");
await _invitations.DidNotReceive().RegenerateInvitationAsync(Arg.Any<Guid>());
await _mail.Received(1).SendInvitationAsync("invited@test.com", "old-token", "en", false, Arg.Any<CancellationToken>());
}
[Fact]
public async Task Resend_OfAnExpiredInvitation_CreatesANewLinkFirst()
{
var owner = await Add("owner@test.com", "Owner");
var id = Guid.NewGuid();
Pending(id, expired: true);
_invitations.RegenerateInvitationAsync(id).Returns("fresh");
var result = await As(owner).ResendInvite(id);
Prop<string>(result.Should().BeOfType<OkObjectResult>().Subject.Value, "inviteLink").Should().Contain("fresh");
await _mail.Received(1).SendInvitationAsync("invited@test.com", "fresh", "en", true, Arg.Any<CancellationToken>());
}
[Fact]
public async Task Resend_ReportsAFailedMail_AndKeepsTheLink()
{
var owner = await Add("owner@test.com", "Owner");
var id = Guid.NewGuid();
Pending(id);
_mail.SendInvitationAsync(default!, default!, default, default, default).ReturnsForAnyArgs(MailSendResult.Fail(MailSendResult.AuthFailed));
var body = (await As(owner).ResendInvite(id)).Should().BeOfType<OkObjectResult>().Subject.Value;
Prop<string>(Prop<object>(body, "mail"), "error").Should().Be("auth_failed");
Prop<string>(body, "inviteLink").Should().Contain("old-token");
}
[Fact]
public async Task Resend_FollowsTheHierarchy_AndIsNotFoundForUnknownInvitations()
{
var admin = await Add("admin@test.com", "Administrator");
var id = Guid.NewGuid();
Pending(id, role: "Administrator");
(await As(admin).ResendInvite(id)).Should().BeOfType<ForbidResult>();
(await As(admin).ResendInvite(Guid.NewGuid())).Should().BeOfType<NotFoundResult>();
await _mail.DidNotReceiveWithAnyArgs().SendInvitationAsync(default!, default!, default, default, default);
}
// --- notices ---
[Fact]
public async Task Deactivating_SendsANotice_Reactivating_SendsAnother_AndNoChangeSendsNothing()
{
var owner = await Add("owner@test.com", "Owner");
var user = await Add("user@test.com", "User", language: "en");
await As(owner).SetUserActive(user.Id, new SetUserActiveRequest(false));
await _mail.Received(1).SendAccountDeactivatedAsync(Arg.Is<ApplicationUser>(u => u.Id == user.Id), Arg.Any<CancellationToken>());
await As(owner).SetUserActive(user.Id, new SetUserActiveRequest(false)); // already inactive: no second notice
await _mail.Received(1).SendAccountDeactivatedAsync(Arg.Any<ApplicationUser>(), Arg.Any<CancellationToken>());
await As(owner).SetUserActive(user.Id, new SetUserActiveRequest(true));
await _mail.Received(1).SendAccountReactivatedAsync(Arg.Is<ApplicationUser>(u => u.Id == user.Id), Arg.Any<CancellationToken>());
}
[Fact]
public async Task ANoticeThatFails_NeverFailsTheAction()
{
var owner = await Add("owner@test.com", "Owner");
var user = await Add("user@test.com", "User");
_mail.SendAccountDeactivatedAsync(default!, default).ReturnsForAnyArgs(MailSendResult.Fail(MailSendResult.Timeout));
(await As(owner).SetUserActive(user.Id, new SetUserActiveRequest(false))).Should().BeOfType<OkResult>();
(await _userManager.FindByIdAsync(user.Id.ToString()))!.IsActive.Should().BeFalse();
}
[Fact]
public async Task ChangingARole_SendsANotice_ButSelectingTheSameRoleDoesNot()
{
var owner = await Add("owner@test.com", "Owner");
await _roleManager.CreateAsync(new ApplicationRole { Name = "Administrator" });
var user = await Add("user@test.com", "User");
await As(owner).ChangeRole(user.Id, new ChangeRoleRequest("Administrator"));
await _mail.Received(1).SendRoleChangedAsync(Arg.Is<ApplicationUser>(u => u.Id == user.Id), "Administrator", Arg.Any<CancellationToken>());
await As(owner).ChangeRole(user.Id, new ChangeRoleRequest("Administrator"));
await _mail.Received(1).SendRoleChangedAsync(Arg.Any<ApplicationUser>(), Arg.Any<string>(), Arg.Any<CancellationToken>());
}
[Fact]
public async Task ChangingTheRoleOfAnInvitation_SendsNoNotice()
{
var owner = await Add("owner@test.com", "Owner");
var id = Guid.NewGuid();
Pending(id);
_invitations.UpdateInvitationRoleAsync(id, "Administrator").Returns(true);
(await As(owner).ChangeRole(id, new ChangeRoleRequest("Administrator"))).Should().BeOfType<OkResult>();
await _mail.DidNotReceiveWithAnyArgs().SendRoleChangedAsync(default!, default!, default);
}
// --- language preference ---
[Theory]
[InlineData("en", "en")]
[InlineData("NL", "nl")]
[InlineData("", null)]
public async Task UpdateProfile_SetsOrClearsTheLanguage(string requested, string? expected)
{
var user = await Add("user@test.com", "User", language: "en");
var result = await As(user).UpdateProfile(new UpdateProfileRequest("Naam", "user@test.com", requested));
var dto = result.Should().BeOfType<OkObjectResult>().Subject.Value.Should().BeOfType<UserDto>().Subject;
dto.Language.Should().Be(expected);
(await _userManager.FindByIdAsync(user.Id.ToString()))!.PreferredLanguage.Should().Be(expected);
}
[Fact]
public async Task UpdateProfile_WithoutALanguage_LeavesThePreferenceAlone()
{
var user = await Add("user@test.com", "User", language: "en");
await As(user).UpdateProfile(new UpdateProfileRequest("Naam", "user@test.com"));
(await _userManager.FindByIdAsync(user.Id.ToString()))!.PreferredLanguage.Should().Be("en");
}
[Fact]
public async Task UpdateProfile_RejectsAnUnsupportedLanguage_AndChangesNothing()
{
var user = await Add("user@test.com", "User", language: "en");
var result = await As(user).UpdateProfile(new UpdateProfileRequest("Andere naam", "user@test.com", "fr"));
result.Should().BeOfType<BadRequestObjectResult>();
var reloaded = await _userManager.FindByIdAsync(user.Id.ToString());
reloaded!.PreferredLanguage.Should().Be("en");
reloaded.DisplayName.Should().Be("Naam user@test.com");
}
[Fact]
public async Task GetUsers_ShowsTheLanguageOfAccountsAndInvitations()
{
var owner = await Add("owner@test.com", "Owner", language: "nl");
Pending(Guid.NewGuid(), language: "en");
_invitations.GetPendingInvitationByEmailAsync(Arg.Any<string>()).Returns((false, null));
var result = await As(owner).GetUsers();
var list = result.Should().BeOfType<OkObjectResult>().Subject.Value.Should().BeAssignableTo<IEnumerable<UserDto>>().Subject.ToList();
list.Single(u => u.Email == "owner@test.com").Language.Should().Be("nl");
list.Single(u => u.Email == "invited@test.com").Language.Should().Be("en");
}
}
@@ -9,6 +9,7 @@ using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Extensions.Options;
using NSubstitute;
using SlpModularCms.Core.Data;
using SlpModularCms.Core.Email;
using SlpModularCms.Core.Identity.Authorization;
using SlpModularCms.Core.Identity.Entities;
using SlpModularCms.Core.Identity.Models;
@@ -81,7 +82,7 @@ public class UsersControllerRoleHierarchyTests : IDisposable
private UsersController As(ApplicationUser caller)
{
var controller = new UsersController(_invitations, _userManager);
var controller = new UsersController(_invitations, _userManager, Substitute.For<IIdentityMailService>());
controller.ControllerContext = new ControllerContext
{
HttpContext = new DefaultHttpContext
@@ -9,6 +9,7 @@ using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Extensions.Options;
using NSubstitute;
using SlpModularCms.Core.Data;
using SlpModularCms.Core.Email;
using SlpModularCms.Core.Identity.Entities;
using SlpModularCms.Core.Identity.Models;
using SlpModularCms.Core.Identity.Services;
@@ -22,6 +23,7 @@ public class UsersControllerTests : IDisposable
private readonly UserManager<ApplicationUser> _userManager;
private readonly RoleManager<ApplicationRole> _roleManager;
private readonly IInvitationService _invitationService = Substitute.For<IInvitationService>();
private readonly IIdentityMailService _mail = Substitute.For<IIdentityMailService>();
public UsersControllerTests()
{
@@ -60,7 +62,7 @@ public class UsersControllerTests : IDisposable
private UsersController CreateController(string? callerEmail = null)
{
var controller = new UsersController(_invitationService, _userManager);
var controller = new UsersController(_invitationService, _userManager, _mail);
var httpContext = new DefaultHttpContext();
if (callerEmail is not null)
{
@@ -152,7 +154,7 @@ public class UsersControllerTests : IDisposable
[Fact]
public async Task UpdateProfile_ReturnsUnauthorized_WhenNoNameIdentifierClaim()
{
var controller = new UsersController(_invitationService, _userManager);
var controller = new UsersController(_invitationService, _userManager, _mail);
controller.ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext() };
var result = await controller.UpdateProfile(new UpdateProfileRequest("Name", "email@test.com"));
@@ -164,7 +166,7 @@ public class UsersControllerTests : IDisposable
public async Task UpdateProfile_ReturnsNotFound_WhenUserDoesNotExist()
{
var options = Options.Create(new IdentityOptions());
var controller = new UsersController(_invitationService, _userManager);
var controller = new UsersController(_invitationService, _userManager, _mail);
var httpContext = new DefaultHttpContext();
httpContext.User = new ClaimsPrincipal(
new ClaimsIdentity([new Claim(ClaimTypes.NameIdentifier, Guid.NewGuid().ToString())], "Test"));
@@ -181,7 +183,7 @@ public class UsersControllerTests : IDisposable
var existingUser = await CreateUser("existing@test.com");
var targetUser = await CreateUser("target@test.com");
var controller = new UsersController(_invitationService, _userManager);
var controller = new UsersController(_invitationService, _userManager, _mail);
var httpContext = new DefaultHttpContext();
httpContext.User = new ClaimsPrincipal(
new ClaimsIdentity([new Claim(ClaimTypes.NameIdentifier, targetUser.Id.ToString())], "Test"));
@@ -197,7 +199,7 @@ public class UsersControllerTests : IDisposable
{
var user = await CreateUser("user@test.com");
var controller = new UsersController(_invitationService, _userManager);
var controller = new UsersController(_invitationService, _userManager, _mail);
var httpContext = new DefaultHttpContext();
httpContext.User = new ClaimsPrincipal(
new ClaimsIdentity([new Claim(ClaimTypes.NameIdentifier, user.Id.ToString())], "Test"));