Gebruikersbeheer: rolhierarchie in de API afdwingen en uitnodiging opnieuw aanmaken

Een Beheerder mag alleen gebruikers met rol User verwijderen, deactiveren, van rol wisselen
of hun uitnodiging intrekken, en kent nooit de Owner-rol toe. De regels staan op een plek
(UserManagementRules) en worden in de API afgedwongen. Nieuwe actie om een openstaande of
verlopen uitnodiging een nieuwe link te geven (oude link vervalt).

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-11-08 15:59:10 +01:00
co-authored by Claude Sonnet 5.5
parent 0932ee36b3
commit 026a12a3f1
7 changed files with 548 additions and 30 deletions
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using SlpModularCms.Core.Identity.Authorization;
using SlpModularCms.Core.Identity.Entities;
using SlpModularCms.Core.Identity.Models;
using SlpModularCms.Core.Identity.Services;
@@ -125,45 +126,61 @@ public class UsersController : ControllerBase
[HttpPost("invite")]
public async Task<IActionResult> Invite([FromBody] InviteUserRequest request)
{
var requesterRole = await GetRequesterRoleAsync();
if (!UserManagementRules.CanAssign(requesterRole, request.Role))
return Forbid();
var token = await _invitationService.CreateInvitationAsync(request.Email, request.Role);
var inviteLink = $"/invite/complete?token={Uri.EscapeDataString(token)}";
return Ok(new { inviteLink });
}
/// <summary>
/// Issues a fresh link for an open (or expired) invitation: new token and a new lifetime. The
/// old link stops working. Until e-mail exists this is how an administrator re-sends one.
/// </summary>
[HttpPost("{invitationId:guid}/regenerate-invite")]
public async Task<IActionResult> RegenerateInvite(Guid invitationId)
{
var invitationRole = await GetInvitationRoleAsync(invitationId);
if (invitationRole is null) return NotFound();
if (!UserManagementRules.CanManage(await GetRequesterRoleAsync(), invitationRole))
return Forbid();
var token = await _invitationService.RegenerateInvitationAsync(invitationId);
if (token is null) return NotFound();
return Ok(new { inviteLink = $"/invite/complete?token={Uri.EscapeDataString(token)}" });
}
[HttpPut("{userId:guid}/role")]
public async Task<IActionResult> ChangeRole(Guid userId, [FromBody] ChangeRoleRequest request)
{
var requesterRole = await GetRequesterRoleAsync();
if (!UserManagementRules.CanAssign(requesterRole, request.NewRole))
return Forbid();
var target = await _userManager.FindByIdAsync(userId.ToString());
// Pending invite: no user account yet — update the invitation's role directly
// Pending invite: no user account yet - update the invitation's role directly
if (target is null)
{
var requesterEmailForInvite = User.Identity?.Name;
var requesterForInvite = requesterEmailForInvite is not null
? await _userManager.FindByNameAsync(requesterEmailForInvite)
: null;
var requesterRolesForInvite = requesterForInvite is not null
? await _userManager.GetRolesAsync(requesterForInvite)
: [];
var requesterRoleForInvite = requesterRolesForInvite.FirstOrDefault() ?? "User";
// Admins cannot assign Owner role via invitation either
if (requesterRoleForInvite == "Administrator" && request.NewRole == "Owner")
var invitationRole = await GetInvitationRoleAsync(userId);
if (invitationRole is not null && !UserManagementRules.CanManage(requesterRole, invitationRole))
return Forbid();
var updated = await _invitationService.UpdateInvitationRoleAsync(userId, request.NewRole);
return updated ? Ok() : NotFound();
}
var requesterEmail = User.Identity?.Name;
var requester = requesterEmail is not null ? await _userManager.FindByNameAsync(requesterEmail) : null;
var requesterRoles = requester is not null ? await _userManager.GetRolesAsync(requester) : [];
var requesterRole = requesterRoles.FirstOrDefault() ?? "User";
var targetRoles = await _userManager.GetRolesAsync(target);
var targetRole = targetRoles.FirstOrDefault() ?? "User";
if (requesterRole == "Administrator" && targetRole != "User")
// An Administrator may step down to User themselves; otherwise only plain Users are theirs to change.
var isSelfDemotion = IsSelf(target) && requesterRole == UserManagementRules.Administrator
&& request.NewRole == UserManagementRules.User;
if (!isSelfDemotion && !UserManagementRules.CanManage(requesterRole, targetRole))
return Forbid();
if (targetRole == "Owner" && request.NewRole != "Owner")
@@ -186,19 +203,19 @@ public class UsersController : ControllerBase
var target = await _userManager.FindByIdAsync(userId.ToString());
if (target is null) return NotFound();
var requesterEmail = User.Identity?.Name;
if (string.Equals(target.Email, requesterEmail, StringComparison.OrdinalIgnoreCase))
if (IsSelf(target))
return BadRequest(new { detail = "You cannot change your own active status." });
if (!request.IsActive)
var targetRoles = await _userManager.GetRolesAsync(target);
var targetRole = targetRoles.FirstOrDefault() ?? "User";
if (!UserManagementRules.CanManage(await GetRequesterRoleAsync(), targetRole))
return Forbid();
if (!request.IsActive && targetRoles.Contains("Owner"))
{
var targetRoles = await _userManager.GetRolesAsync(target);
if (targetRoles.Contains("Owner"))
{
var ownerCount = (await _userManager.GetUsersInRoleAsync("Owner")).Count;
if (ownerCount <= 1)
return BadRequest(new { detail = "At least one Owner must remain." });
}
var ownerCount = (await _userManager.GetUsersInRoleAsync("Owner")).Count;
if (ownerCount <= 1)
return BadRequest(new { detail = "At least one Owner must remain." });
}
target.IsActive = request.IsActive;
@@ -217,15 +234,21 @@ public class UsersController : ControllerBase
// If no user account found, try to cancel a pending invitation with this ID
if (target is null)
{
var invitationRole = await GetInvitationRoleAsync(userId);
if (invitationRole is not null && !UserManagementRules.CanManage(await GetRequesterRoleAsync(), invitationRole))
return Forbid();
var deleted = await _invitationService.DeleteInvitationByIdAsync(userId);
return deleted ? NoContent() : NotFound();
}
var requesterEmail = User.Identity?.Name;
if (string.Equals(target.Email, requesterEmail, StringComparison.OrdinalIgnoreCase))
if (IsSelf(target))
return BadRequest(new { detail = "You cannot delete your own account." });
var targetRoles = await _userManager.GetRolesAsync(target);
if (!UserManagementRules.CanManage(await GetRequesterRoleAsync(), targetRoles.FirstOrDefault() ?? "User"))
return Forbid();
if (targetRoles.Contains("Owner"))
{
var ownerCount = (await _userManager.GetUsersInRoleAsync("Owner")).Count;
@@ -242,4 +265,26 @@ public class UsersController : ControllerBase
return NoContent();
}
private bool IsSelf(ApplicationUser target) =>
string.Equals(target.Email, User.Identity?.Name, StringComparison.OrdinalIgnoreCase);
/// <summary>
/// The role of the caller from the database (not the token, which can be stale). A caller that cannot
/// be resolved is treated as an Administrator, the most restricted role that reaches this controller.
/// </summary>
private async Task<string> GetRequesterRoleAsync()
{
var name = User.Identity?.Name;
var requester = name is not null ? await _userManager.FindByNameAsync(name) : null;
if (requester is null) return UserManagementRules.Administrator;
var roles = await _userManager.GetRolesAsync(requester);
return roles.FirstOrDefault() ?? UserManagementRules.User;
}
private async Task<string?> GetInvitationRoleAsync(Guid invitationId)
{
var all = await _invitationService.GetAllPendingInvitationsAsync();
return all?.FirstOrDefault(i => i.Id == invitationId)?.Role;
}
}