Gebruikerslijst volgt de rolhierarchie, nieuwe uitnodigingslink maken, foutkaart zonder nep-aanvraagknop

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 026a12a3f1
commit e9feb37961
9 changed files with 118 additions and 17 deletions
@@ -48,6 +48,13 @@ The cause could not be confirmed against Bryan's actual session; both are real a
No migration. Behaviour: expired invitations now appear in the users list (removable), lifetime configurable (default unchanged at 24 h; an invalid value fails startup), Administrator can withdraw User invitations, invite-error text changed. No migration. Behaviour: expired invitations now appear in the users list (removable), lifetime configurable (default unchanged at 24 h; an invalid value fails startup), Administrator can withdraw User invitations, invite-error text changed.
## Follow-up decisions (Bryan, relayed 2026-11-08)
1. **Role hierarchy closed in the API** (the gap reported above). `UserManagementRules` (Core): an Owner manages everyone; an Administrator only plain Users (delete, deactivate, change role, withdraw/regenerate an invitation) and may never hand out the Owner role (also not by invitation); an Administrator may still step down to User themselves; the last-Owner rule is unchanged. The requester's role is read from the database (not the possibly stale token); an unresolvable caller is treated as Administrator. Enforced in `UsersController` (Invite, ChangeRole, SetUserActive, DeleteUser, RegenerateInvite); the UI mirrors it (Administrators see delete/deactivate/regenerate for Users only, nothing for Administrators and Owners). Tests: `UsersControllerRoleHierarchyTests` (hierarchy rules, each action, invitations, last Owner).
2. **Invite-error card**: the button that suggested requesting a new link (it only navigated away, there is no mail) is now "Naar inloggen"; the text already says to ask the administrator.
3. **"Nieuwe uitnodigingslink maken"** (small, kept): `POST Users/{id}/regenerate-invite` gives an open or expired invitation a new token and a new lifetime; the old link stops working. The UI action copies the new link. It stays useful as a fallback once e-mail exists. Tests: service (old token invalid, new valid, expired revived, unknown/accepted -> null), controller (hierarchy, 404), UI.
4. **Lifetime shorter than 24 h?** Round trip `DateTimeOffset` -> MariaDB `datetime` -> back was proven against a real MariaDB (server and client in CET, offsets +0/+1/+2/-5 written): the provider stores the UTC clock value and reads it back as UTC, so the remaining lifetime stays 24.00 h. `DateTimeOffsetRoundTripTests` (runs when `ConnectionStrings__DefaultConnection` points at a MariaDB, as in CI; uses its own scratch database; does nothing otherwise). So a time-zone shortening cannot be demonstrated; stored seconds are truncated (sub-second only). To rule out anything on the test host, a read-only look at `AndreaSlopFotografieTest.Invitations` would show `CreatedAt`, `ExpiryDate`, the difference in hours and the server `UTC_TIMESTAMP()`.
## Result ## Result
- **PR(s)**: None - **PR(s)**: None
@@ -32,6 +32,9 @@ describe('InviteCompletePage', () => {
// card must not talk about "system setup". // card must not talk about "system setup".
expect(screen.getByText('Link invalid or expired')).toBeInTheDocument(); expect(screen.getByText('Link invalid or expired')).toBeInTheDocument();
expect(screen.queryByText(/setup required/i)).not.toBeInTheDocument(); expect(screen.queryByText(/setup required/i)).not.toBeInTheDocument();
// No button that pretends to request a new link (there is no mail): it only leads to sign-in.
expect(screen.queryByText(/request a new invitation link/i)).not.toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Go to sign in' })).toBeInTheDocument();
}); });
it('shows an error state for a used token', async () => { it('shows an error state for a used token', async () => {
@@ -119,9 +119,9 @@ export function InviteCompletePage() {
<Button <Button
variant="outline" variant="outline"
className="w-full" className="w-full"
onClick={() => navigate({ to: '/' })} onClick={() => navigate({ to: '/login' })}
> >
{t('inviteComplete.requestNewInvitationLink')} {t('inviteComplete.toLogin')}
</Button> </Button>
</CardContent> </CardContent>
</Card> </Card>
@@ -87,6 +87,10 @@ export const userHandlers = [
return HttpResponse.json({ inviteLink }); return HttpResponse.json({ inviteLink });
}), }),
http.post(`${API_BASE}/api/v1/Users/:invitationId/regenerate-invite`, () =>
HttpResponse.json({ inviteLink: `/invite/complete?token=regenerated-mock-token` }),
),
http.put(`${API_BASE}/api/v1/Users/:userId/role`, () => new HttpResponse(null, { status: 200 })), http.put(`${API_BASE}/api/v1/Users/:userId/role`, () => new HttpResponse(null, { status: 200 })),
http.put(`${API_BASE}/api/v1/Users/:userId/active`, () => new HttpResponse(null, { status: 200 })), http.put(`${API_BASE}/api/v1/Users/:userId/active`, () => new HttpResponse(null, { status: 200 })),
@@ -1,4 +1,4 @@
import { beforeEach, describe, expect, it } from 'vitest'; import { beforeEach, describe, expect, it, vi } from 'vitest';
import { screen, within } from '@testing-library/react'; import { screen, within } from '@testing-library/react';
import userEvent from '@testing-library/user-event'; import userEvent from '@testing-library/user-event';
import { http, HttpResponse } from 'msw'; import { http, HttpResponse } from 'msw';
@@ -114,6 +114,54 @@ describe('UsersPage', () => {
expect(screen.queryByTestId('user-copy-link-44444444-4444-4444-4444-444444444444')).not.toBeInTheDocument(); expect(screen.queryByTestId('user-copy-link-44444444-4444-4444-4444-444444444444')).not.toBeInTheDocument();
}); });
it('mirrors the API hierarchy for an Administrator: plain Users yes, Administrators and Owners no', async () => {
server.use(
http.post(`${API_BASE}/api/v1/auth/refresh`, () =>
HttpResponse.json(makeAuthResponse({ user: { ...mockUser, role: 'Administrator', name: 'Test Admin' } })),
),
http.get(USERS_URL, () =>
HttpResponse.json([
{ id: 'a1', email: 'plain@example.com', name: 'Plain', role: 'User', isActive: true, createdAt: '2026-01-01T00:00:00.000Z', invitationPending: false, inviteLink: null },
{ id: 'a2', email: 'other-admin@example.com', name: 'Other Admin', role: 'Administrator', isActive: true, createdAt: '2026-01-01T00:00:00.000Z', invitationPending: false, inviteLink: null },
{ id: 'a3', email: 'owner2@example.com', name: 'Owner Two', role: 'Owner', isActive: true, createdAt: '2026-01-01T00:00:00.000Z', invitationPending: false, inviteLink: null },
]),
),
);
renderApp('/users');
await screen.findByTestId('user-row-a1');
await userEvent.click(screen.getByTestId('user-actions-a1'));
expect(screen.getByTestId('user-delete-a1')).toBeInTheDocument();
expect(screen.getByTestId('user-toggle-active-a1')).toBeInTheDocument();
await userEvent.keyboard('{Escape}');
expect(screen.queryByTestId('user-actions-a2')).not.toBeInTheDocument();
expect(screen.queryByTestId('user-actions-a3')).not.toBeInTheDocument();
});
it('creates a new invitation link for a pending invitation and copies it', async () => {
mockAuthenticated();
const writeText = vi.fn().mockResolvedValue(undefined);
Object.defineProperty(navigator, 'clipboard', { value: { writeText }, configurable: true });
let called = false;
server.use(
http.post(`${USERS_URL}/:id/regenerate-invite`, () => {
called = true;
return HttpResponse.json({ inviteLink: '/invite/complete?token=fresh' });
}),
);
renderApp('/users');
await screen.findByTestId('users-table');
const pending = getMockUsers().find((u) => u.invitationPending)!;
await userEvent.click(screen.getByTestId(`user-actions-${pending.id}`));
await userEvent.click(screen.getByTestId(`user-regenerate-invite-${pending.id}`));
await vi.waitFor(() => expect(writeText).toHaveBeenCalled());
expect(called).toBe(true);
expect(writeText.mock.calls[0][0]).toContain('/invite/complete?token=fresh');
});
it('shows an error message when the API fails', async () => { it('shows an error message when the API fails', async () => {
mockAuthenticated(); mockAuthenticated();
server.use(http.get(USERS_URL, () => HttpResponse.json({}, { status: 500 }))); server.use(http.get(USERS_URL, () => HttpResponse.json({}, { status: 500 })));
+38 -12
View File
@@ -2,7 +2,7 @@ import { useState } from 'react';
import { buildAppUrl } from '@/lib/links'; import { buildAppUrl } from '@/lib/links';
import { toast } from 'sonner'; import { toast } from 'sonner';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { MoreHorizontal, Link as LinkIcon, Trash2, UserX, UserCheck } from 'lucide-react'; import { MoreHorizontal, Link as LinkIcon, Trash2, UserX, UserCheck, RefreshCw } from 'lucide-react';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { import {
Dialog, Dialog,
@@ -35,7 +35,7 @@ import {
import { InviteUserDialog } from '@/features/invitation/components/InviteUserDialog'; import { InviteUserDialog } from '@/features/invitation/components/InviteUserDialog';
import { DeleteUserDialog } from '@/features/users/components/DeleteUserDialog'; import { DeleteUserDialog } from '@/features/users/components/DeleteUserDialog';
import { RoleBadge } from '@/components/shared/RoleBadge'; import { RoleBadge } from '@/components/shared/RoleBadge';
import { useUsers, useChangeRole, useSetUserActive, useDeleteUser } from '@/features/users/services/useUsers'; import { useUsers, useChangeRole, useSetUserActive, useDeleteUser, useRegenerateInvite } from '@/features/users/services/useUsers';
import { useAuth } from '@/features/auth/context/auth-context'; import { useAuth } from '@/features/auth/context/auth-context';
import { Trans } from 'react-i18next'; import { Trans } from 'react-i18next';
import { ProblemDetailsError } from '@/lib/api-client'; import { ProblemDetailsError } from '@/lib/api-client';
@@ -76,6 +76,7 @@ export function UsersPage() {
const changeRole = useChangeRole(); const changeRole = useChangeRole();
const setUserActive = useSetUserActive(); const setUserActive = useSetUserActive();
const deleteUser = useDeleteUser(); const deleteUser = useDeleteUser();
const regenerateInvite = useRegenerateInvite();
const availableRolesFor = (user: UserListItem): UserRole[] => { const availableRolesFor = (user: UserListItem): UserRole[] => {
const isSelf = user.id === currentUser?.id; const isSelf = user.id === currentUser?.id;
@@ -88,22 +89,23 @@ export function UsersPage() {
return []; return [];
}; };
const isOwnerAction = (user: UserListItem) => // Mirrors UserManagementRules on the API: an Owner manages everyone, an Administrator only plain
currentUser?.role === 'Owner' && user.id !== currentUser.id; // Users. The API enforces it; this only keeps the menu honest.
const canManage = (user: UserListItem) =>
user.id !== currentUser?.id &&
(currentUser?.role === 'Owner' || (currentUser?.role === 'Administrator' && user.role === 'User'));
const canToggleActive = (user: UserListItem) => const canToggleActive = (user: UserListItem) => canManage(user) && !user.invitationPending;
isOwnerAction(user) && !user.invitationPending;
// An Administrator may withdraw an open invitation for a plain User (the same reach as assigning const canRegenerateInvite = (user: UserListItem) => canManage(user) && Boolean(user.invitationPending);
// that role); removing accounts stays with the Owner.
const canDelete = (user: UserListItem) => const canDelete = (user: UserListItem) => canManage(user);
isOwnerAction(user) ||
(currentUser?.role === 'Administrator' && user.invitationPending && user.role === 'User');
const hasAnyActions = (user: UserListItem) => const hasAnyActions = (user: UserListItem) =>
Boolean(user.invitationPending) || Boolean(user.invitationPending && user.inviteLink) ||
availableRolesFor(user).length > 0 || availableRolesFor(user).length > 0 ||
canToggleActive(user) || canToggleActive(user) ||
canRegenerateInvite(user) ||
canDelete(user); canDelete(user);
const handleCopyInviteLink = async (user: UserListItem) => { const handleCopyInviteLink = async (user: UserListItem) => {
@@ -112,6 +114,16 @@ export function UsersPage() {
toast.success(t('users.actions.linkCopied')); toast.success(t('users.actions.linkCopied'));
}; };
const handleRegenerateInvite = async (user: UserListItem) => {
try {
const { inviteLink } = await regenerateInvite.mutateAsync(user.id);
await navigator.clipboard.writeText(buildAppUrl(inviteLink));
toast.success(t('users.actions.inviteRegenerated'));
} catch {
toast.error(t('errors.generic'));
}
};
const handleRoleChange = (user: UserListItem, newRole: UserRole) => { const handleRoleChange = (user: UserListItem, newRole: UserRole) => {
if (user.id === currentUser?.id) { if (user.id === currentUser?.id) {
setSelfRoleChangeTarget({ userId: user.id, newRole }); setSelfRoleChangeTarget({ userId: user.id, newRole });
@@ -244,6 +256,7 @@ export function UsersPage() {
const roles = availableRolesFor(user); const roles = availableRolesFor(user);
const toggleActive = canToggleActive(user); const toggleActive = canToggleActive(user);
const deletable = canDelete(user); const deletable = canDelete(user);
const regenerable = canRegenerateInvite(user);
const showActions = hasAnyActions(user); const showActions = hasAnyActions(user);
return ( return (
<TableRow key={user.id} data-testid={`user-row-${user.id}`}> <TableRow key={user.id} data-testid={`user-row-${user.id}`}>
@@ -288,6 +301,19 @@ export function UsersPage() {
</> </>
)} )}
{regenerable && (
<>
<DropdownMenuSeparator />
<DropdownMenuItem
onClick={() => handleRegenerateInvite(user)}
data-testid={`user-regenerate-invite-${user.id}`}
>
<RefreshCw className="mr-2 h-4 w-4" />
{t('users.actions.regenerateInvite')}
</DropdownMenuItem>
</>
)}
{roles.length > 0 && ( {roles.length > 0 && (
<> <>
<DropdownMenuSeparator /> <DropdownMenuSeparator />
@@ -47,3 +47,12 @@ export function useDeleteUser() {
onSuccess: () => queryClient.invalidateQueries({ queryKey: ['users'] }), onSuccess: () => queryClient.invalidateQueries({ queryKey: ['users'] }),
}); });
} }
export function useRegenerateInvite() {
const queryClient = useQueryClient();
return useMutation<InviteUserResponse, Error, string>({
mutationFn: (invitationId) =>
api.post<InviteUserResponse>(`/api/v1/Users/${invitationId}/regenerate-invite`, {}),
onSuccess: () => queryClient.invalidateQueries({ queryKey: ['users'] }),
});
}
@@ -60,7 +60,7 @@
"loadingMessage": "Validating your invitation…", "loadingMessage": "Validating your invitation…",
"invalidTitle": "Link invalid or expired", "invalidTitle": "Link invalid or expired",
"invalidTokenMessage": "This invitation link has expired or is invalid.", "invalidTokenMessage": "This invitation link has expired or is invalid.",
"requestNewInvitationLink": "Request a new invitation link", "toLogin": "Go to sign in",
"successMessage": "Account setup complete. You can now sign in." "successMessage": "Account setup complete. You can now sign in."
}, },
"dashboard": { "dashboard": {
@@ -102,6 +102,8 @@
}, },
"actions": { "actions": {
"copyInviteLink": "Copy invite link", "copyInviteLink": "Copy invite link",
"regenerateInvite": "Create new invite link",
"inviteRegenerated": "New invite link copied to clipboard. The old link no longer works.",
"changeRole": "Change role", "changeRole": "Change role",
"deactivate": "Deactivate", "deactivate": "Deactivate",
"activate": "Activate", "activate": "Activate",
@@ -60,7 +60,7 @@
"loadingMessage": "Uitnodiging valideren…", "loadingMessage": "Uitnodiging valideren…",
"invalidTitle": "Link ongeldig of verlopen", "invalidTitle": "Link ongeldig of verlopen",
"invalidTokenMessage": "Deze uitnodigingslink is verlopen, ingetrokken of ongeldig. Vraag de beheerder om een nieuwe uitnodiging.", "invalidTokenMessage": "Deze uitnodigingslink is verlopen, ingetrokken of ongeldig. Vraag de beheerder om een nieuwe uitnodiging.",
"requestNewInvitationLink": "Vraag een nieuwe uitnodigingslink aan", "toLogin": "Naar inloggen",
"successMessage": "Account-setup voltooid. Je kunt nu inloggen." "successMessage": "Account-setup voltooid. Je kunt nu inloggen."
}, },
"dashboard": { "dashboard": {
@@ -102,6 +102,8 @@
}, },
"actions": { "actions": {
"copyInviteLink": "Uitnodigingslink kopiëren", "copyInviteLink": "Uitnodigingslink kopiëren",
"regenerateInvite": "Nieuwe uitnodigingslink maken",
"inviteRegenerated": "Nieuwe uitnodigingslink gekopieerd naar klembord. De oude link werkt niet meer.",
"changeRole": "Rol wijzigen", "changeRole": "Rol wijzigen",
"deactivate": "Deactiveren", "deactivate": "Deactiveren",
"activate": "Activeren", "activate": "Activeren",