* 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>
176 lines
5.5 KiB
TypeScript
176 lines
5.5 KiB
TypeScript
import { Form, redirect, Link } from "react-router";
|
|
import { auth } from "~/lib/auth.server";
|
|
import type { Route } from "./+types/i.$inviteCode";
|
|
|
|
import {
|
|
findSeasonByInviteCode,
|
|
findLeagueById,
|
|
findCommissionersByLeagueId,
|
|
findAvailableTeams,
|
|
claimTeam,
|
|
isUserLeagueMember,
|
|
findUserById,
|
|
getUserDisplayName,
|
|
} from "~/models";
|
|
import { Button } from "~/components/ui/button";
|
|
import {
|
|
Card,
|
|
CardContent,
|
|
CardDescription,
|
|
CardHeader,
|
|
CardTitle,
|
|
} from "~/components/ui/card";
|
|
|
|
export function meta(): Route.MetaDescriptors {
|
|
return [{ title: "Join League - Brackt" }];
|
|
}
|
|
|
|
export async function loader(args: Route.LoaderArgs) {
|
|
const { params } = args;
|
|
const { inviteCode } = params;
|
|
const session = await auth.api.getSession({ headers: args.request.headers });
|
|
const userId = session?.user.id ?? null;
|
|
|
|
// Find season by invite code
|
|
const season = await findSeasonByInviteCode(inviteCode);
|
|
|
|
if (!season) {
|
|
throw new Response("Invalid invite code", { status: 404 });
|
|
}
|
|
|
|
// Find the league
|
|
const league = await findLeagueById(season.leagueId);
|
|
|
|
if (!league) {
|
|
throw new Response("League not found", { status: 404 });
|
|
}
|
|
|
|
// Find commissioners to get the commissioner's name
|
|
const commissioners = await findCommissionersByLeagueId(league.id);
|
|
const firstCommissioner = commissioners[0];
|
|
|
|
// Check if user is already a member
|
|
let isAlreadyMember = false;
|
|
if (userId) {
|
|
isAlreadyMember = await isUserLeagueMember(league.id, userId);
|
|
}
|
|
|
|
return {
|
|
league,
|
|
season,
|
|
inviteCode,
|
|
firstCommissioner,
|
|
isAlreadyMember,
|
|
isLoggedIn: !!userId,
|
|
};
|
|
}
|
|
|
|
export async function action(args: Route.ActionArgs) {
|
|
const { params } = args;
|
|
const { inviteCode } = params;
|
|
const session = await auth.api.getSession({ headers: args.request.headers });
|
|
const userId = session?.user.id ?? null;
|
|
|
|
if (!userId) {
|
|
throw new Response("You must be logged in to join a league", { status: 401 });
|
|
}
|
|
|
|
// Find season by invite code
|
|
const season = await findSeasonByInviteCode(inviteCode);
|
|
|
|
if (!season) {
|
|
throw new Response("Invalid invite code", { status: 404 });
|
|
}
|
|
|
|
// Check if user is already a member
|
|
const isAlreadyMember = await isUserLeagueMember(season.leagueId, userId);
|
|
|
|
if (isAlreadyMember) {
|
|
// Already a member, redirect to league page
|
|
return redirect(`/leagues/${season.leagueId}`);
|
|
}
|
|
|
|
// Find an available team
|
|
const availableTeams = await findAvailableTeams(season.id);
|
|
|
|
if (availableTeams.length === 0) {
|
|
throw new Response("No available teams in this league", { status: 400 });
|
|
}
|
|
|
|
// Look up user before claiming to fail fast and get their name
|
|
const user = await findUserById(userId);
|
|
if (!user) {
|
|
throw new Response("User account not found. Please try again.", { status: 500 });
|
|
}
|
|
|
|
// Claim the first available team, setting owner and name atomically
|
|
const team = availableTeams[0];
|
|
const teamName = `Team ${getUserDisplayName(user) ?? "Member"}`;
|
|
await claimTeam(team.id, userId, teamName);
|
|
|
|
// Redirect to league page
|
|
return redirect(`/leagues/${season.leagueId}?joined=true`);
|
|
}
|
|
|
|
export default function InvitePage({ loaderData }: Route.ComponentProps) {
|
|
const { league, firstCommissioner, isAlreadyMember, isLoggedIn } = loaderData;
|
|
|
|
return (
|
|
<div className="container mx-auto py-16 px-4">
|
|
<div className="max-w-2xl mx-auto">
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle className="text-3xl">You're Invited!</CardTitle>
|
|
<CardDescription className="text-base">
|
|
{firstCommissioner ? "A commissioner" : "Someone"} has invited you to join{" "}
|
|
<span className="font-semibold">{league.name}</span>
|
|
</CardDescription>
|
|
</CardHeader>
|
|
<CardContent className="space-y-6">
|
|
<div className="space-y-2">
|
|
<h3 className="font-semibold text-lg">League Details</h3>
|
|
<div className="space-y-1 text-sm text-muted-foreground">
|
|
<p>
|
|
<span className="font-medium text-foreground">League:</span> {league.name}
|
|
</p>
|
|
<p>
|
|
<span className="font-medium text-foreground">Created:</span>{" "}
|
|
{new Date(league.createdAt).toLocaleDateString()}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
{isAlreadyMember ? (
|
|
<div className="space-y-4">
|
|
<p className="text-sm text-muted-foreground">
|
|
You're already a member of this league!
|
|
</p>
|
|
<Button asChild className="w-full">
|
|
<a href={`/leagues/${league.id}`}>Go to League</a>
|
|
</Button>
|
|
</div>
|
|
) : isLoggedIn ? (
|
|
<Form method="post" className="space-y-4">
|
|
<p className="text-sm text-muted-foreground">
|
|
Click the button below to join this league and claim your team.
|
|
</p>
|
|
<Button type="submit" className="w-full">
|
|
Join League
|
|
</Button>
|
|
</Form>
|
|
) : (
|
|
<div className="space-y-4">
|
|
<p className="text-sm text-muted-foreground">
|
|
You'll need to sign in or create an account to join this league.
|
|
</p>
|
|
<Link to={`/login?redirectTo=/i/${loaderData.inviteCode}`}>
|
|
<Button className="w-full">Sign In to Join</Button>
|
|
</Link>
|
|
</div>
|
|
)}
|
|
</CardContent>
|
|
</Card>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|