From 729d95cd732ad2730592260048c6a7d68978b856 Mon Sep 17 00:00:00 2001 From: Marc Mintel Date: Sun, 4 Jan 2026 01:51:53 +0100 Subject: [PATCH] fix e2e --- apps/website/app/auth/login/page.tsx | 19 ++++++++----------- tests/e2e/website/website-pages.test.ts | 2 -- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/apps/website/app/auth/login/page.tsx b/apps/website/app/auth/login/page.tsx index 619d2300f..cf97b183b 100644 --- a/apps/website/app/auth/login/page.tsx +++ b/apps/website/app/auth/login/page.tsx @@ -40,22 +40,19 @@ export default function LoginPage() { // Check if user is already authenticated useEffect(() => { if (session) { - // If there's a returnTo parameter (user was redirected here from a protected route), - // they might not have permission. Don't auto-redirect them back. - const returnToParam = searchParams.get('returnTo'); - console.log('[LOGIN] returnToParam:', returnToParam); - console.log('[LOGIN] returnTo:', returnTo); - const hasReturnTo = returnToParam !== null; - if (hasReturnTo) { - console.log('[LOGIN] Has returnTo, setting insufficient permissions'); + // Check if this is a returnTo redirect (user lacks permissions) + const isPermissionRedirect = searchParams.get('returnTo') !== null; + + if (isPermissionRedirect) { + // User was redirected here due to insufficient permissions + // Show permission error instead of redirecting setHasInsufficientPermissions(true); } else { - // No returnTo means they navigated here directly while authenticated - console.log('[LOGIN] No returnTo, redirecting to dashboard'); + // User navigated here directly while authenticated, redirect to dashboard router.replace('/dashboard'); } } - }, [session, router, returnTo, searchParams]); + }, [session, router, searchParams]); // Use enhanced form hook const { diff --git a/tests/e2e/website/website-pages.test.ts b/tests/e2e/website/website-pages.test.ts index 27b70b8c6..b3d06c72f 100644 --- a/tests/e2e/website/website-pages.test.ts +++ b/tests/e2e/website/website-pages.test.ts @@ -88,8 +88,6 @@ test.describe('Website Pages - TypeORM Integration', () => { { const auth = await WebsiteAuthManager.createAuthContext(browser, request, 'auth'); await auth.page.goto(`${WEBSITE_BASE_URL}${path}`); - console.log(`[TEST] Final URL after goto: ${auth.page.url()}`); - console.log(`[TEST] Expected to include 'login', actual includes: ${auth.page.url().includes('login')}`); expect(auth.page.url().includes('login')).toBeTruthy(); await auth.context.close(); }