Frontend: geen losse redirect-timers meer na het verlaten van een pagina
Oorzaak van de onbehandelde fout 'window is not defined' in de CI: ResetPasswordPage (en dezelfde constructie in InviteCompletePage en SetupPage) startte een setTimeout voor de doorverwijzing naar de loginpagina en liet die doorlopen na het verlaten van de pagina; in de testrunner vuurde hij nadat de testomgeving was opgeruimd en navigeerde een router die er niet meer was. Nieuwe hook useDelayedAction ruimt de timer op bij het verlaten. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { beforeEach, describe, expect, it } from 'vitest';
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
import { screen } from '@testing-library/react';
|
||||
import userEvent from '@testing-library/user-event';
|
||||
import { http, HttpResponse } from 'msw';
|
||||
@@ -125,6 +125,31 @@ describe('ResetPasswordPage', () => {
|
||||
});
|
||||
});
|
||||
|
||||
it('leaves no redirect timer behind when the page goes away (it would navigate a torn-down router)', async () => {
|
||||
mockGuest();
|
||||
server.use(http.post(`${AUTH}/reset-password`, () => HttpResponse.json({ message: 'ok' })));
|
||||
const set = vi.spyOn(globalThis, 'setTimeout');
|
||||
const clear = vi.spyOn(globalThis, 'clearTimeout');
|
||||
const { unmount } = renderApp('/reset-password?uid=11111111-1111-1111-1111-111111111111&token=abc');
|
||||
|
||||
await userEvent.type(await screen.findByTestId('reset-password-input', {}, { timeout: 10000 }), 'Brand-New-Pass9!');
|
||||
await userEvent.type(screen.getByTestId('reset-confirm-input'), 'Brand-New-Pass9!');
|
||||
await userEvent.click(screen.getByTestId('reset-submit'));
|
||||
await screen.findByTestId('reset-done');
|
||||
|
||||
// The page schedules its redirect to the login page after 2.5 seconds.
|
||||
const redirectTimers = set.mock.calls
|
||||
.map((call, i) => ({ delay: call[1], id: set.mock.results[i].value as unknown }))
|
||||
.filter((t) => t.delay === 2500);
|
||||
expect(redirectTimers).toHaveLength(1);
|
||||
|
||||
unmount();
|
||||
|
||||
expect(clear).toHaveBeenCalledWith(redirectTimers[0].id);
|
||||
set.mockRestore();
|
||||
clear.mockRestore();
|
||||
});
|
||||
|
||||
it('shows one generic "invalid or expired" page for a bad, used or expired link', async () => {
|
||||
mockGuest();
|
||||
server.use(
|
||||
|
||||
@@ -10,6 +10,7 @@ import { Label } from '@/components/ui/label';
|
||||
import { NetworkError, ProblemDetailsError } from '@/lib/api-client';
|
||||
import { resetPasswordFormSchema, type ResetPasswordFormData } from '@/features/auth/schemas/auth';
|
||||
import { useResetPassword } from '@/features/auth/services/usePasswordReset';
|
||||
import { useDelayedAction } from '@/lib/useDelayedAction';
|
||||
|
||||
type View = 'form' | 'done' | 'invalid';
|
||||
|
||||
@@ -19,6 +20,7 @@ export function ResetPasswordPage() {
|
||||
const navigate = useNavigate();
|
||||
const search = useSearch({ strict: false }) as { uid?: string; token?: string };
|
||||
const reset = useResetPassword();
|
||||
const later = useDelayedAction();
|
||||
const [serverError, setServerError] = useState<string | null>(null);
|
||||
const [view, setView] = useState<View>(search.uid && search.token ? 'form' : 'invalid');
|
||||
|
||||
@@ -37,7 +39,7 @@ export function ResetPasswordPage() {
|
||||
try {
|
||||
await reset.mutateAsync({ userId: search.uid!, token: search.token!, newPassword: values.password });
|
||||
setView('done');
|
||||
setTimeout(() => void navigate({ to: '/login' }), 2500);
|
||||
later(() => void navigate({ to: '/login' }), 2500);
|
||||
} catch (err) {
|
||||
if (err instanceof NetworkError) {
|
||||
setServerError(t('errors.network'));
|
||||
|
||||
Reference in New Issue
Block a user