Mail: diagnose van SMTP-weigeringen en keuze bij een nieuwe uitnodigingslink

SMTP: bij een geweigerd commando logt de verzender fase, statuscode en de eerste regel van het serverantwoord
(adressen vervangen, max 120 tekens); specifiekere foutcodes (rejected_sender, rejected_recipient, tls_failed,
connection_failed) die de beheerder in het venster ziet; opstartlog met SMTP-host, poort en standaard
afzenderdomein. Uit de property-test: besturingstekens worden eerst verwijderd, anders kon een adres weer
aan elkaar plakken.
Nieuwe uitnodigingslink: regenerate-invite mailt alleen met sendEmail=true (standaard false); eerst een
keuzevenster 'Alleen link kopieren' / 'Link kopieren en mailen' (zonder mail alleen de link).

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-11-08 22:30:05 +01:00
co-authored by Claude Sonnet 5.5
parent e80d324b4f
commit daaadcbdf7
20 changed files with 614 additions and 39 deletions
@@ -0,0 +1,75 @@
import { useTranslation } from 'react-i18next';
import { Button } from '@/components/ui/button';
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import type { UserListItem } from '@/features/users/services/types';
interface RegenerateInviteDialogProps {
user: UserListItem | null;
/** Whether this site can send mail; without it there is nothing to choose, only the link. */
emailEnabled: boolean;
isPending: boolean;
onOpenChange: (open: boolean) => void;
/** Creates the new link (the old one stops working) and copies it; mails it too when asked. */
onConfirm: (sendEmail: boolean) => void;
}
/** Asks whether the new invitation link should also be e-mailed. Nothing is created or sent before a choice. */
export function RegenerateInviteDialog({ user, emailEnabled, isPending, onOpenChange, onConfirm }: RegenerateInviteDialogProps) {
const { t } = useTranslation();
if (!user) return null;
return (
<Dialog open onOpenChange={onOpenChange}>
<DialogContent className="sm:max-w-md" data-testid="regenerate-invite-dialog">
<DialogHeader>
<DialogTitle>{t('users.regenerate.title')}</DialogTitle>
<DialogDescription>
{emailEnabled
? t('users.regenerate.descriptionMail', { email: user.email })
: t('users.regenerate.description', { email: user.email })}
</DialogDescription>
</DialogHeader>
<DialogFooter className="gap-2 sm:flex-col sm:space-x-0">
{emailEnabled ? (
<>
<Button
onClick={() => onConfirm(true)}
disabled={isPending}
data-testid="regenerate-copy-and-mail"
>
{t('users.regenerate.copyAndMail')}
</Button>
<Button
variant="outline"
onClick={() => onConfirm(false)}
disabled={isPending}
data-testid="regenerate-copy-only"
>
{t('users.regenerate.copyOnly')}
</Button>
</>
) : (
<Button onClick={() => onConfirm(false)} disabled={isPending} data-testid="regenerate-copy-only">
{t('users.regenerate.create')}
</Button>
)}
<Button
variant="ghost"
onClick={() => onOpenChange(false)}
disabled={isPending}
data-testid="regenerate-cancel"
>
{t('common.cancel')}
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
);
}
@@ -0,0 +1,18 @@
import { describe, expect, it } from 'vitest';
import { mailErrorText } from '@/features/users/mailErrors';
const t = (key: string) => key;
describe('mailErrorText', () => {
it.each([
'timeout', 'auth_failed', 'rejected', 'rejected_sender', 'rejected_recipient', 'tls_failed', 'connection_failed', 'not_configured', 'unknown',
])('has its own text for %s', (code) => {
expect(mailErrorText(t, code)).toBe(`users.invite.mailErrors.${code}`);
});
it('reads an unknown or missing code as the generic one', () => {
expect(mailErrorText(t, 'something_new')).toBe('users.invite.mailErrors.unknown');
expect(mailErrorText(t, null)).toBe('users.invite.mailErrors.unknown');
expect(mailErrorText(t, undefined)).toBe('users.invite.mailErrors.unknown');
});
});
+4 -1
View File
@@ -1,5 +1,8 @@
/** A short, human reason for a failed mail (codes come from the server; unknown codes read as generic). */
export function mailErrorText(t: (key: string) => string, error: string | null | undefined): string {
const known = ['timeout', 'auth_failed', 'rejected', 'not_configured', 'unknown'];
const known = [
'timeout', 'auth_failed', 'rejected', 'rejected_sender', 'rejected_recipient',
'tls_failed', 'connection_failed', 'not_configured', 'unknown',
];
return t(`users.invite.mailErrors.${known.includes(error ?? '') ? error : 'unknown'}`);
}
@@ -196,6 +196,72 @@ describe('users list: resend', () => {
});
});
describe('new invitation link with a mail choice', () => {
async function openRegenerate() {
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(await screen.findByTestId(`user-regenerate-invite-${pending.id}`));
return pending;
}
function capture() {
const state: { body?: Record<string, unknown> } = {};
server.use(
http.post(`${USERS}/:id/regenerate-invite`, async ({ request }) => {
state.body = (await request.json()) as Record<string, unknown>;
return HttpResponse.json({
inviteLink: '/invite/complete?token=fresh',
mail: state.body.sendEmail ? { sent: true, error: null } : null,
});
}),
);
return state;
}
it('offers both choices when the site has mail, and sends nothing before one is chosen', async () => {
mockAuthenticated();
mailOn();
const state = capture();
await openRegenerate();
expect(await screen.findByTestId('regenerate-copy-and-mail')).toBeInTheDocument();
expect(screen.getByTestId('regenerate-copy-only')).toBeInTheDocument();
expect(state.body).toBeUndefined();
});
it('"copy only" asks the server NOT to mail, and still copies the link', async () => {
mockAuthenticated();
mailOn();
const writeText = vi.fn().mockResolvedValue(undefined);
Object.defineProperty(navigator, 'clipboard', { value: { writeText }, configurable: true });
const state = capture();
await openRegenerate();
await userEvent.click(await screen.findByTestId('regenerate-copy-only'));
await vi.waitFor(() => expect(writeText).toHaveBeenCalled());
expect(state.body).toEqual({ sendEmail: false });
});
it('"copy and mail" asks the server to mail, and copies the link as well', async () => {
mockAuthenticated();
mailOn();
const writeText = vi.fn().mockResolvedValue(undefined);
Object.defineProperty(navigator, 'clipboard', { value: { writeText }, configurable: true });
const state = capture();
await openRegenerate();
await userEvent.click(await screen.findByTestId('regenerate-copy-and-mail'));
await vi.waitFor(() => expect(writeText).toHaveBeenCalled());
expect(state.body).toEqual({ sendEmail: true });
expect(writeText.mock.calls[0][0]).toContain('/invite/complete?token=fresh');
});
});
describe('language preference in the profile', () => {
it('pre-fills the saved language and sends the choice, an empty value clears it', async () => {
server.use(
@@ -139,15 +139,15 @@ describe('UsersPage', () => {
expect(screen.queryByTestId('user-actions-a3')).not.toBeInTheDocument();
});
it('creates a new invitation link for a pending invitation and copies it', async () => {
it('asks before creating a new invitation link, and without mail offers only the link', async () => {
mockAuthenticated();
const writeText = vi.fn().mockResolvedValue(undefined);
Object.defineProperty(navigator, 'clipboard', { value: { writeText }, configurable: true });
let called = false;
let body: Record<string, unknown> | undefined;
server.use(
http.post(`${USERS_URL}/:id/regenerate-invite`, () => {
called = true;
return HttpResponse.json({ inviteLink: '/invite/complete?token=fresh' });
http.post(`${USERS_URL}/:id/regenerate-invite`, async ({ request }) => {
body = (await request.json()) as Record<string, unknown>;
return HttpResponse.json({ inviteLink: '/invite/complete?token=fresh', mail: null });
}),
);
renderApp('/users');
@@ -157,11 +157,39 @@ describe('UsersPage', () => {
await userEvent.click(screen.getByTestId(`user-actions-${pending.id}`));
await userEvent.click(screen.getByTestId(`user-regenerate-invite-${pending.id}`));
// Nothing has been created yet; the dialog has no mail choice on a site without mail.
expect(await screen.findByTestId('regenerate-invite-dialog')).toBeInTheDocument();
expect(body).toBeUndefined();
expect(screen.queryByTestId('regenerate-copy-and-mail')).not.toBeInTheDocument();
await userEvent.click(screen.getByTestId('regenerate-copy-only'));
await vi.waitFor(() => expect(writeText).toHaveBeenCalled());
expect(called).toBe(true);
expect(body).toEqual({ sendEmail: false });
expect(writeText.mock.calls[0][0]).toContain('/invite/complete?token=fresh');
});
it('cancelling the dialog creates nothing', async () => {
mockAuthenticated();
let called = false;
server.use(
http.post(`${USERS_URL}/:id/regenerate-invite`, () => {
called = true;
return HttpResponse.json({ inviteLink: '/x' });
}),
);
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 userEvent.click(await screen.findByTestId('regenerate-cancel'));
expect(screen.queryByTestId('regenerate-invite-dialog')).not.toBeInTheDocument();
expect(called).toBe(false);
});
it('shows an error message when the API fails', async () => {
mockAuthenticated();
server.use(http.get(USERS_URL, () => HttpResponse.json({}, { status: 500 })));
@@ -34,6 +34,7 @@ import {
} from '@/components/ui/dropdown-menu';
import { InviteUserDialog } from '@/features/invitation/components/InviteUserDialog';
import { DeleteUserDialog } from '@/features/users/components/DeleteUserDialog';
import { RegenerateInviteDialog } from '@/features/users/components/RegenerateInviteDialog';
import { RoleBadge } from '@/components/shared/RoleBadge';
import { useUsers, useChangeRole, useSetUserActive, useDeleteUser, useRegenerateInvite, useResendInvite } from '@/features/users/services/useUsers';
import { useAuth } from '@/features/auth/context/auth-context';
@@ -79,6 +80,7 @@ export function UsersPage() {
const setUserActive = useSetUserActive();
const deleteUser = useDeleteUser();
const regenerateInvite = useRegenerateInvite();
const [regenerateTarget, setRegenerateTarget] = useState<UserListItem | null>(null);
const resendInvite = useResendInvite();
const { data: capabilities } = useSystemCapabilities();
const emailEnabled = capabilities?.emailEnabled ?? false;
@@ -119,13 +121,15 @@ export function UsersPage() {
toast.success(t('users.actions.linkCopied'));
};
const handleRegenerateInvite = async (user: UserListItem) => {
// The administrator chooses first (dialog); the link is always copied, mailed only when asked.
const handleRegenerateInvite = async (user: UserListItem, sendEmail: boolean) => {
try {
const { inviteLink, mail } = await regenerateInvite.mutateAsync(user.id);
const { inviteLink, mail } = await regenerateInvite.mutateAsync({ invitationId: user.id, sendEmail });
await navigator.clipboard.writeText(buildAppUrl(inviteLink));
if (mail?.sent) toast.success(t('users.actions.inviteRegeneratedMailed', { email: user.email }));
else if (mail) toast.warning(t('users.invite.mailFailed', { reason: mailErrorText(t, mail.error) }));
if (sendEmail && mail?.sent) toast.success(t('users.actions.inviteRegeneratedMailed', { email: user.email }));
else if (sendEmail && mail) toast.warning(t('users.invite.mailFailed', { reason: mailErrorText(t, mail.error) }));
else toast.success(t('users.actions.inviteRegenerated'));
setRegenerateTarget(null);
} catch {
toast.error(t('errors.generic'));
}
@@ -340,7 +344,7 @@ export function UsersPage() {
<>
<DropdownMenuSeparator />
<DropdownMenuItem
onClick={() => handleRegenerateInvite(user)}
onClick={() => setRegenerateTarget(user)}
data-testid={`user-regenerate-invite-${user.id}`}
>
<RefreshCw className="mr-2 h-4 w-4" />
@@ -424,6 +428,14 @@ export function UsersPage() {
<InviteUserDialog open={inviteDialogOpen} onOpenChange={setInviteDialogOpen} />
<RegenerateInviteDialog
user={regenerateTarget}
emailEnabled={emailEnabled}
isPending={regenerateInvite.isPending}
onOpenChange={(open) => { if (!open) setRegenerateTarget(null); }}
onConfirm={(sendEmail) => regenerateTarget && void handleRegenerateInvite(regenerateTarget, sendEmail)}
/>
<Dialog
open={selfRoleChangeTarget !== null}
onOpenChange={(open) => { if (!open) setSelfRoleChangeTarget(null); }}
@@ -50,9 +50,10 @@ export function useDeleteUser() {
export function useRegenerateInvite() {
const queryClient = useQueryClient();
return useMutation<InviteUserResponse, Error, string>({
mutationFn: (invitationId) =>
api.post<InviteUserResponse>(`/api/v1/Users/${invitationId}/regenerate-invite`, {}),
return useMutation<InviteUserResponse, Error, { invitationId: string; sendEmail: boolean }>({
// The server mails the new link only when asked to: sendEmail defaults to false there too.
mutationFn: ({ invitationId, sendEmail }) =>
api.post<InviteUserResponse>(`/api/v1/Users/${invitationId}/regenerate-invite`, { sendEmail }),
onSuccess: () => queryClient.invalidateQueries({ queryKey: ['users'] }),
});
}
@@ -138,6 +138,14 @@
"successDeactivated": "{{name}} has been deactivated.",
"successActivated": "{{name}} has been activated."
},
"regenerate": {
"title": "Create new invite link",
"description": "A new link is created for {{email}}. The old link stops working. The new link is copied so you can share it yourself.",
"descriptionMail": "A new link is created for {{email}}. The old link stops working. Do you also want to send the new link by e-mail?",
"copyOnly": "Copy link only",
"copyAndMail": "Copy link and send e-mail",
"create": "Create and copy link"
},
"delete": {
"title": "Delete user",
"description": "Are you sure you want to delete {{name}} ({{email}})? This action cannot be undone.",
@@ -161,6 +169,10 @@
"timeout": "the mail server did not respond in time",
"auth_failed": "signing in to the mail server failed",
"rejected": "the mail server or the address refused the message",
"rejected_sender": "the mail server does not accept this sender address for this account",
"rejected_recipient": "the mail server will not deliver to this address",
"tls_failed": "the secure connection to the mail server failed",
"connection_failed": "no connection to the mail server",
"not_configured": "e-mail is not set up",
"unknown": "unknown error"
},
@@ -138,6 +138,14 @@
"successDeactivated": "{{name}} is gedeactiveerd.",
"successActivated": "{{name}} is geactiveerd."
},
"regenerate": {
"title": "Nieuwe uitnodigingslink maken",
"description": "Er wordt een nieuwe link gemaakt voor {{email}}. De oude link werkt daarna niet meer. De nieuwe link wordt gekopieerd, zodat je hem zelf kunt delen.",
"descriptionMail": "Er wordt een nieuwe link gemaakt voor {{email}}. De oude link werkt daarna niet meer. Wil je de nieuwe link ook per e-mail versturen?",
"copyOnly": "Alleen link kopiëren",
"copyAndMail": "Link kopiëren en mailen",
"create": "Link maken en kopiëren"
},
"delete": {
"title": "Gebruiker verwijderen",
"description": "Weet je zeker dat je {{name}} ({{email}}) wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt.",
@@ -162,6 +170,10 @@
"timeout": "de mailserver reageerde niet op tijd",
"auth_failed": "inloggen op de mailserver mislukt",
"rejected": "de mailserver of het adres weigerde het bericht",
"rejected_sender": "de mailserver accepteert dit afzenderadres niet voor dit account",
"rejected_recipient": "de mailserver wil niet naar dit adres versturen",
"tls_failed": "beveiligde verbinding met de mailserver mislukt",
"connection_failed": "geen verbinding met de mailserver",
"not_configured": "e-mail is niet ingesteld",
"unknown": "onbekende fout"
},