Move auth root redirects to middleware and harden hydration

felmonon · felmonon · commit 8316d612f9a7 · 2026-02-20T10:45:41.000-07:00
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -36,8 +36,8 @@ export default function RootLayout({
   children: React.ReactNode;
 }>) {
   return (
-    <html lang="en" className="dark">
-      <body className="font-sans antialiased">
+    <html lang="en" className="dark" suppressHydrationWarning>
+      <body className="font-sans antialiased" suppressHydrationWarning>
         {children}
       </body>
     </html>
diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect, useRef, useState } from 'react';
+import { useRef, useState } from 'react';
 import { useInView, motion, AnimatePresence } from 'framer-motion';
 import {
   Check,
@@ -21,7 +21,6 @@ import {
   TrendingUp,
 } from 'lucide-react';
 import Link from 'next/link';
-import { createClient } from '@/lib/supabase/client';
 
 /* ─────────────────────────────────────────────────────────
    ANIMATION PRIMITIVES
@@ -601,28 +600,6 @@ const proPlanFeatures = [
    ═════════════════════════════════════════════════════════ */
 
 export default function LandingPage() {
-  useEffect(() => {
-    const url = new URL(window.location.href);
-    const code = url.searchParams.get('code');
-    const tokenHash = url.searchParams.get('token_hash');
-
-    // If auth params accidentally land on "/", forward to callback to complete session exchange.
-    if (code || tokenHash) {
-      window.location.replace(`/auth/callback${url.search}`);
-      return;
-    }
-
-    // Keep logged-in users inside the app instead of showing marketing landing.
-    const supabase = createClient();
-    void supabase.auth.getUser().then(({ data: { user } }) => {
-      if (user) {
-        window.location.replace('/app/today');
-      }
-    }).catch(() => {
-      // Ignore errors here; unauthenticated users should still see the landing page.
-    });
-  }, []);
-
   return (
     <div className="min-h-screen bg-bg-primary font-sans relative">
       {/* Noise texture */}
diff --git a/src/lib/supabase/middleware.ts b/src/lib/supabase/middleware.ts
@@ -2,6 +2,15 @@ import { createServerClient } from '@supabase/ssr';
 import { NextResponse, type NextRequest } from 'next/server';
 
 export async function updateSession(request: NextRequest) {
+  const { pathname, searchParams } = request.nextUrl;
+
+  // If OAuth params land on "/", forward to callback route before rendering landing page.
+  if (pathname === '/' && (searchParams.get('code') || searchParams.get('token_hash'))) {
+    const url = request.nextUrl.clone();
+    url.pathname = '/auth/callback';
+    return NextResponse.redirect(url);
+  }
+
   let supabaseResponse = NextResponse.next({ request });
 
   const supabase = createServerClient(
@@ -29,8 +38,6 @@ export async function updateSession(request: NextRequest) {
     data: { user },
   } = await supabase.auth.getUser();
 
-  const { pathname } = request.nextUrl;
-
   // /reset-password requires a valid recovery session — allow if user is present
   // (user gets set from the recovery token exchanged at /auth/callback).
   // If no session, redirect to login instead of showing a broken form.
@@ -54,5 +61,12 @@ export async function updateSession(request: NextRequest) {
     return NextResponse.redirect(url);
   }
 
+  // Redirect authenticated users away from landing into app.
+  if (pathname === '/' && user) {
+    const url = request.nextUrl.clone();
+    url.pathname = '/app/today';
+    return NextResponse.redirect(url);
+  }
+
   return supabaseResponse;
 }
diff --git a/src/proxy.ts b/src/proxy.ts
@@ -6,5 +6,5 @@ export async function proxy(request: NextRequest) {
 }
 
 export const config = {
-  matcher: ['/app/:path*', '/login', '/signup', '/onboarding', '/reset-password'],
+  matcher: ['/', '/app/:path*', '/login', '/signup', '/onboarding', '/reset-password'],
 };

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ export async function proxy(request: NextRequest) {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`export const config = {`
`9`		`- matcher: ['/app/:path*', '/login', '/signup', '/onboarding', '/reset-password'],`
	`9`	`+ matcher: ['/', '/app/:path*', '/login', '/signup', '/onboarding', '/reset-password'],`
`10`	`10`	`};`