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
|
|
|
import { useState } from "react";
|
|
|
|
|
import { Link, useSearchParams, redirect } from "react-router";
|
|
|
|
|
import { auth } from "~/lib/auth.server";
|
|
|
|
|
import { authClient } from "~/lib/auth-client";
|
|
|
|
|
import type { Route } from "./+types/register";
|
|
|
|
|
import { Button } from "~/components/ui/button";
|
|
|
|
|
import { Input } from "~/components/ui/input";
|
|
|
|
|
import { Label } from "~/components/ui/label";
|
|
|
|
|
import { Card, CardContent, CardHeader, CardTitle, CardDescription } from "~/components/ui/card";
|
|
|
|
|
|
|
|
|
|
export function meta(): Route.MetaDescriptors {
|
|
|
|
|
return [{ title: "Create Account - Brackt" }];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function safeRedirectTo(value: string | null): string {
|
|
|
|
|
if (!value) return "/";
|
|
|
|
|
return value.startsWith("/") && !value.startsWith("//") ? value : "/";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export async function loader(args: Route.LoaderArgs) {
|
|
|
|
|
const session = await auth.api.getSession({ headers: args.request.headers });
|
|
|
|
|
if (session) {
|
|
|
|
|
const raw = new URL(args.request.url).searchParams.get("redirectTo");
|
|
|
|
|
return redirect(safeRedirectTo(raw));
|
|
|
|
|
}
|
|
|
|
|
return {};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export default function RegisterPage() {
|
|
|
|
|
const [searchParams] = useSearchParams();
|
|
|
|
|
const redirectTo = safeRedirectTo(searchParams.get("redirectTo"));
|
|
|
|
|
const [error, setError] = useState<string | null>(null);
|
|
|
|
|
const [loading, setLoading] = useState(false);
|
|
|
|
|
|
|
|
|
|
async function handleRegister(e: React.FormEvent<HTMLFormElement>) {
|
|
|
|
|
e.preventDefault();
|
|
|
|
|
setError(null);
|
|
|
|
|
setLoading(true);
|
|
|
|
|
const form = e.currentTarget;
|
|
|
|
|
const name = (form.elements.namedItem("name") as HTMLInputElement).value;
|
|
|
|
|
const email = (form.elements.namedItem("email") as HTMLInputElement).value;
|
|
|
|
|
const password = (form.elements.namedItem("password") as HTMLInputElement).value;
|
|
|
|
|
|
|
|
|
|
const { error: signUpError } = await authClient.signUp.email({
|
|
|
|
|
name,
|
|
|
|
|
email,
|
|
|
|
|
password,
|
|
|
|
|
callbackURL: redirectTo,
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
if (signUpError) {
|
|
|
|
|
setError(signUpError.message ?? "Registration failed. Please try again.");
|
|
|
|
|
setLoading(false);
|
2026-04-29 10:03:50 -07:00
|
|
|
} else {
|
2026-05-09 23:58:45 -07:00
|
|
|
const params = new URLSearchParams({ email, redirectTo });
|
|
|
|
|
window.location.href = `/check-email?${params.toString()}`;
|
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
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
async function handleSocialSignIn(provider: "google" | "discord") {
|
|
|
|
|
await authClient.signIn.social({ provider, callbackURL: redirectTo });
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
<div className="min-h-screen flex items-center justify-center p-4">
|
|
|
|
|
<Card className="w-full max-w-md">
|
|
|
|
|
<CardHeader className="space-y-1">
|
|
|
|
|
<CardTitle className="text-2xl">Create account</CardTitle>
|
|
|
|
|
<CardDescription>Get started with Brackt</CardDescription>
|
|
|
|
|
</CardHeader>
|
|
|
|
|
<CardContent className="space-y-4">
|
|
|
|
|
<div className="space-y-2">
|
|
|
|
|
<Button
|
|
|
|
|
variant="outline"
|
|
|
|
|
className="w-full"
|
|
|
|
|
onClick={() => handleSocialSignIn("google")}
|
|
|
|
|
type="button"
|
|
|
|
|
>
|
|
|
|
|
Continue with Google
|
|
|
|
|
</Button>
|
|
|
|
|
<Button
|
|
|
|
|
variant="outline"
|
|
|
|
|
className="w-full"
|
|
|
|
|
onClick={() => handleSocialSignIn("discord")}
|
|
|
|
|
type="button"
|
|
|
|
|
>
|
|
|
|
|
Continue with Discord
|
|
|
|
|
</Button>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div className="relative">
|
|
|
|
|
<div className="absolute inset-0 flex items-center">
|
|
|
|
|
<span className="w-full border-t border-border" />
|
|
|
|
|
</div>
|
|
|
|
|
<div className="relative flex justify-center text-xs uppercase">
|
|
|
|
|
<span className="bg-background px-2 text-muted-foreground">or</span>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<form onSubmit={handleRegister} className="space-y-4">
|
|
|
|
|
<div className="space-y-2">
|
|
|
|
|
<Label htmlFor="name">Display Name</Label>
|
|
|
|
|
<Input id="name" name="name" type="text" required autoComplete="name" />
|
|
|
|
|
</div>
|
|
|
|
|
<div className="space-y-2">
|
|
|
|
|
<Label htmlFor="email">Email</Label>
|
|
|
|
|
<Input id="email" name="email" type="email" required autoComplete="email" />
|
|
|
|
|
</div>
|
|
|
|
|
<div className="space-y-2">
|
|
|
|
|
<Label htmlFor="password">Password</Label>
|
|
|
|
|
<Input id="password" name="password" type="password" required autoComplete="new-password" minLength={8} />
|
|
|
|
|
</div>
|
|
|
|
|
{error && <p className="text-sm text-destructive">{error}</p>}
|
|
|
|
|
<Button type="submit" className="w-full" disabled={loading}>
|
|
|
|
|
{loading ? "Creating account…" : "Create Account"}
|
|
|
|
|
</Button>
|
|
|
|
|
</form>
|
|
|
|
|
|
|
|
|
|
<p className="text-center text-sm text-muted-foreground">
|
|
|
|
|
Already have an account?{" "}
|
|
|
|
|
<Link to={`/login?redirectTo=${encodeURIComponent(redirectTo)}`} className="underline">
|
|
|
|
|
Sign in
|
|
|
|
|
</Link>
|
|
|
|
|
</p>
|
|
|
|
|
</CardContent>
|
|
|
|
|
</Card>
|
|
|
|
|
</div>
|
|
|
|
|
);
|
|
|
|
|
}
|