brackt/app/components/navbar.tsx
Chris Parsons ba9bf64e37
Migrate authentication from Clerk to BetterAuth (#324)
* Migrate authentication from Clerk to BetterAuth (#322)

Replaces @clerk/react-router with self-hosted better-auth to eliminate
the external Clerk dependency and keep all user/session data in our own
PostgreSQL database.

**What changed**
- New: auth.server.ts (BetterAuth config w/ Drizzle adapter, bcrypt, Resend), auth-client.ts, api.auth.$.ts handler
- New: /login and /register pages with email+password and Google/Discord OAuth; open-redirect guard on redirectTo param
- New: UserMenu component replacing Clerk's UserButton
- Schema: sessions, accounts, verifications tables; emailVerified column; clerkId made nullable
- Migrations 0081 (BetterAuth tables) and 0082 (accounts extra columns for v1.6.9)
- All ~30 route files: getAuth → auth.api.getSession, isUserAdminByClerkId → isUserAdmin
- root.tsx: isAdmin read directly from session.user.isAdmin (no extra DB query)
- useDraftAuthRecovery: removed Clerk JWT refresh logic; replaced with cookie-session check
- models/user.ts: removed findUserByClerkId, findOrCreateUser, updateUserByClerkId (webhook pattern)
- Deleted: app/routes/api/webhooks/clerk.ts; uninstalled @clerk/react-router, @clerk/themes, svix
- scripts/migrate.mjs: extended with idempotent Clerk → BetterAuth data migration (FK conversion, email_verified, OAuth accounts)
- scripts/migrate-clerk-passwords.mjs: one-time script to import bcrypt hashes from Clerk CSV export
- BETTERAUTH_MIGRATION.md: dev and production runbooks
- All test mocks updated: vi.mock('~/lib/auth.server') instead of @clerk/react-router/server
- Test fixtures: added emailVerified field

**Follow-up (post-stable)**
- Rename actor_clerk_id column → actor_user_id in commissioner_audit_log
- Drop clerk_id column from users once migration confirmed

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Add .npmrc with legacy-peer-deps for better-auth/drizzle peer dep conflict

better-auth@1.6.9 declares peerOptional deps on drizzle-orm ^0.45.2 and
drizzle-kit >=0.31.4, but we run drizzle-orm ~0.36.3 / drizzle-kit ~0.28.1.
The adapter works correctly at runtime with our versions — the peer dep is
only for stricter type checking. This unblocks npm ci in CI without a risky
drizzle major-version upgrade.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-24 22:00:49 -07:00

153 lines
5.8 KiB
TypeScript

import { useState } from "react";
import { Link, NavLink, useLocation } from "react-router";
import {
Sheet,
SheetContent,
SheetHeader,
SheetTitle,
SheetTrigger,
} from "~/components/ui/sheet";
import { Button } from "~/components/ui/button";
import { authClient } from "~/lib/auth-client";
import { UserMenu } from "~/components/UserMenu";
import { HelpCircle, MenuIcon, Settings } from "lucide-react";
const NAV_LINK_CLASS =
"relative text-sm font-semibold uppercase tracking-wide text-muted-foreground px-3 py-2 transition-colors " +
"after:content-[''] after:absolute after:bottom-0 after:left-3 after:right-3 after:h-[3px] " +
"after:scale-x-0 hover:after:scale-x-100 after:transition-transform after:[background:var(--brackt-gradient)]";
function navLinkClass({ isActive }: { isActive: boolean }) {
return `${NAV_LINK_CLASS}${isActive ? " !text-emerald-400" : ""}`;
}
function mobileNavLinkClass({ isActive }: { isActive: boolean }) {
return `block px-4 py-2 text-lg font-medium rounded-md transition-colors${isActive ? " text-emerald-400" : " text-muted-foreground"}`;
}
interface NavbarProps {
isAdmin: boolean;
}
export function Navbar({ isAdmin }: NavbarProps) {
const [open, setOpen] = useState(false);
const location = useLocation();
const { data: session } = authClient.useSession();
const signInHref = `/login?redirectTo=${encodeURIComponent(location.pathname)}`;
const authSection = session ? (
<UserMenu
name={session.user.name ?? null}
email={session.user.email}
imageUrl={session.user.image ?? null}
/>
) : (
<Link to={signInHref}>
<Button>Sign In</Button>
</Link>
);
return (
<header className="sticky top-0 z-50 w-full border-b border-border/40 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60">
<div className="flex h-16 items-center justify-between px-4 md:px-6 lg:px-8">
{/* Left: Logo + Nav links */}
<div className="flex items-center gap-2">
<Link to="/" className="flex items-center mr-2">
<img src="/logo.svg" alt="Brackt" className="h-14" />
</Link>
<nav aria-label="Main navigation" className="hidden md:flex items-center gap-1">
{session
? <NavLink to="/" end className={navLinkClass}>Dashboard</NavLink>
: <NavLink to="/" end className={navLinkClass}>Home</NavLink>
}
<NavLink to="/how-to-play" className={navLinkClass}>How To Play</NavLink>
<NavLink to="/rules" className={navLinkClass}>Rules</NavLink>
</nav>
</div>
{/* Desktop Right: Support + Admin icons + Auth */}
<div className="hidden md:flex items-center gap-2">
<Link
to="/support"
className="inline-flex items-center justify-center h-9 w-9 rounded-md text-muted-foreground hover:text-foreground hover:bg-white/5 transition-colors"
aria-label="Support"
>
<HelpCircle className="h-5 w-5" />
</Link>
{isAdmin && (
<Link
to="/admin"
className="inline-flex items-center justify-center h-9 w-9 rounded-md text-muted-foreground hover:text-foreground hover:bg-white/5 transition-colors"
aria-label="Admin"
>
<Settings className="h-5 w-5" />
</Link>
)}
{authSection}
</div>
{/* Mobile: icons + Auth + Hamburger */}
<div className="flex md:hidden items-center gap-1">
<Link
to="/support"
className="inline-flex items-center justify-center h-9 w-9 rounded-md text-muted-foreground hover:text-foreground transition-colors"
aria-label="Support"
>
<HelpCircle className="h-5 w-5" />
</Link>
{isAdmin && (
<Link
to="/admin"
className="inline-flex items-center justify-center h-9 w-9 rounded-md text-muted-foreground hover:text-foreground transition-colors"
aria-label="Admin"
>
<Settings className="h-5 w-5" />
</Link>
)}
{authSection}
<Sheet open={open} onOpenChange={setOpen}>
<SheetTrigger asChild>
<button
className="inline-flex items-center justify-center rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 hover:bg-accent hover:text-accent-foreground h-10 w-10"
aria-label="Toggle menu"
>
<MenuIcon className="h-6 w-6" />
</button>
</SheetTrigger>
<SheetContent side="right" className="w-[300px] sm:w-[400px]">
<SheetHeader>
<SheetTitle>Menu</SheetTitle>
</SheetHeader>
<nav aria-label="Mobile navigation" className="flex flex-col gap-4 mt-8">
<NavLink
to="/"
end
className={mobileNavLinkClass}
onClick={() => setOpen(false)}
>
{session ? "Dashboard" : "Home"}
</NavLink>
<NavLink
to="/how-to-play"
className={mobileNavLinkClass}
onClick={() => setOpen(false)}
>
How To Play
</NavLink>
<NavLink
to="/rules"
className={mobileNavLinkClass}
onClick={() => setOpen(false)}
>
Rules
</NavLink>
</nav>
</SheetContent>
</Sheet>
</div>
</div>
</header>
);
}