From 9c4bf6198ec1e746d25272594227eaa0300b3bcd Mon Sep 17 00:00:00 2001 From: minimus7 Date: Wed, 4 Nov 2026 12:04:13 -0600 Subject: [PATCH] Say why a sign-in link didn't work, and clear rejected sign-ins Co-Authored-By: Claude Opus 5.5 --- src/app/auth/callback/route.ts | 1 + src/app/login/page.tsx | 4 ++++ src/middleware.ts | 3 ++- src/utils/supabase/middleware.ts | 5 ++++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app/auth/callback/route.ts b/src/app/auth/callback/route.ts index 88579ae..29d264d 100644 --- a/src/app/auth/callback/route.ts +++ b/src/app/auth/callback/route.ts @@ -8,6 +8,7 @@ export async function GET(request: Request) { const supabase = await createClient(); const { error } = await supabase.auth.exchangeCodeForSession(code); if (!error) return home(origin); + console.error("[broke] sign-in link:", error.message); } return NextResponse.redirect(`${origin}/login?error=link`); } diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index bdf9b34..b64154f 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -11,6 +11,10 @@ export default function LoginPage() { const [firstRun, setFirstRun] = useState(null); const [devLogin, setDevLogin] = useState(false); useEffect(() => { + if (new URLSearchParams(window.location.search).get("error") === "link") { + setState("error"); + setMessage("That sign-in link didn't work. Each link works once, for about an hour, in the browser you asked for it from. Send a new one."); + } fetch("/api/setup/first-run").then((r) => r.json()).then((b: { supabase?: string; devLogin?: boolean }) => { setFirstRun(b.supabase ?? null); setDevLogin(!!b.devLogin); diff --git a/src/middleware.ts b/src/middleware.ts index f1fd2d1..0ea2c22 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -3,6 +3,7 @@ import { updateSession } from "@/utils/supabase/middleware"; export const middleware = (request: NextRequest) => updateSession(request); +// auth/callback runs without the session refresh: clearing an old sign-in there would wipe the one the email link just made. export const config = { - matcher: ["/((?!_next/static|_next/image|favicon.ico|api/plaid/webhook|api/agent|api/ai/helper|broke-connect|.*\\.(?:svg|png|jpg|jpeg|gif|webp)$).*)"], + matcher: ["/((?!_next/static|_next/image|favicon.ico|api/plaid/webhook|auth/callback|api/agent|api/ai/helper|broke-connect|.*\\.(?:svg|png|jpg|jpeg|gif|webp)$).*)"], }; diff --git a/src/utils/supabase/middleware.ts b/src/utils/supabase/middleware.ts index a93741a..e1fe3b9 100644 --- a/src/utils/supabase/middleware.ts +++ b/src/utils/supabase/middleware.ts @@ -47,7 +47,10 @@ export async function updateSession(request: NextRequest) { if (!user && !path.startsWith("/login") && !path.startsWith("/auth")) { const url = request.nextUrl.clone(); url.pathname = "/login"; - return NextResponse.redirect(url); + // Keep the cookie changes getClaims made: a sign-in Supabase no longer accepts gets cleared here, not resent forever. + const to = NextResponse.redirect(url); + response.cookies.getAll().forEach((c) => to.cookies.set(c)); + return to; } // Signed in but no bank keys yet: app pages would be empty, so show the checklist instead. if (user && !path.startsWith("/api") && !(isSet(process.env.PLAID_CLIENT_ID) && isSet(process.env.PLAID_SECRET))) return toSetup(request);