brackt/app/routes/api/seasons.$seasonId.draft.ts
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

112 lines
4 KiB
TypeScript

import { database } from "~/database/context";
import * as schema from "~/database/schema";
import { eq, inArray } from "drizzle-orm";
import { calculatePickInfo } from "~/models/draft-utils";
import { getUserDisplayName } from "~/models/user";
import type { LoaderFunctionArgs } from "react-router";
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
export async function loader({ params }: LoaderFunctionArgs) {
const { seasonId } = params;
// Fix #1: validate UUID format up front so malformed IDs return 400, not a DB error
if (!seasonId || !UUID_RE.test(seasonId)) {
return Response.json({ error: "Invalid season ID" }, { status: 400 });
}
const db = database();
const season = await db.query.seasons.findFirst({
where: eq(schema.seasons.id, seasonId),
});
if (!season) {
return Response.json({ error: "Season not found" }, { status: 404 });
}
const draftSlots = await db.query.draftSlots.findMany({
where: eq(schema.draftSlots.seasonId, seasonId),
orderBy: schema.draftSlots.draftOrder,
with: { team: true },
});
const totalTeams = draftSlots.length;
const totalPicks = totalTeams * season.draftRounds;
const currentPickNumber = season.currentPickNumber ?? 1;
const isDraftComplete = season.status === "active" || season.status === "completed";
// Fix #4: guard against totalTeams === 0 before calling calculatePickInfo
let onTheClockSlot: (typeof draftSlots)[number] | null = null;
if (season.status === "draft" && totalTeams > 0) {
const { pickInRound } = calculatePickInfo(currentPickNumber, totalTeams);
onTheClockSlot = draftSlots.find((slot) => slot.draftOrder === pickInRound) ?? null;
}
// All picks with participant + sport + team owner info
const picksRaw = await db
.select({
pickNumber: schema.draftPicks.pickNumber,
round: schema.draftPicks.round,
teamName: schema.teams.name,
teamOwnerId: schema.teams.ownerId,
participantName: schema.participants.name,
sport: schema.sports.name,
})
.from(schema.draftPicks)
.innerJoin(schema.teams, eq(schema.draftPicks.teamId, schema.teams.id))
.innerJoin(schema.participants, eq(schema.draftPicks.participantId, schema.participants.id))
.innerJoin(schema.sportsSeasons, eq(schema.participants.sportsSeasonId, schema.sportsSeasons.id))
.innerJoin(schema.sports, eq(schema.sportsSeasons.sportId, schema.sports.id))
.where(eq(schema.draftPicks.seasonId, seasonId))
.orderBy(schema.draftPicks.pickNumber);
// Fix #2: include the on-the-clock owner in the batch so we never make a separate user query
const picksOwnerIds = picksRaw.map((p) => p.teamOwnerId).filter(Boolean) as string[];
const clockOwnerId = onTheClockSlot?.team.ownerId ?? null;
const allOwnerIds = [...new Set([...picksOwnerIds, ...(clockOwnerId ? [clockOwnerId] : [])])];
const usernameByUserId = new Map<string, string | null>();
if (allOwnerIds.length > 0) {
const owners = await db
.select({
id: schema.users.id,
username: schema.users.username,
displayName: schema.users.displayName,
})
.from(schema.users)
.where(inArray(schema.users.id, allOwnerIds));
for (const owner of owners) {
usernameByUserId.set(owner.id, getUserDisplayName(owner));
}
}
// Fix #3: single helper so onTheClock and picks use identical null-fallback logic
const getUsername = (ownerId: string | null) =>
ownerId ? (usernameByUserId.get(ownerId) ?? null) : null;
const onTheClock = onTheClockSlot
? { teamName: onTheClockSlot.team.name, username: getUsername(onTheClockSlot.team.ownerId) }
: null;
const picks = picksRaw.map((p) => ({
pickNumber: p.pickNumber,
round: p.round,
teamName: p.teamName,
username: getUsername(p.teamOwnerId),
participantName: p.participantName,
sport: p.sport,
}));
return Response.json({
seasonId,
status: season.status,
currentPickNumber,
totalPicks,
isDraftComplete,
isPaused: season.draftPaused,
onTheClock,
picks,
});
}