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>
114 lines
3.3 KiB
TypeScript
114 lines
3.3 KiB
TypeScript
import { auth } from "~/lib/auth.server";
|
|
import { database } from "~/database/context";
|
|
import * as schema from "~/database/schema";
|
|
import { eq, and, gte } from "drizzle-orm";
|
|
import { isCommissioner } from "~/models/commissioner";
|
|
import { logCommissionerAction } from "~/models/audit-log";
|
|
import { getSocketIO } from "../../../server/socket";
|
|
import { logger } from "~/lib/logger";
|
|
|
|
import type { ActionFunctionArgs } from "react-router";
|
|
export async function action(args: ActionFunctionArgs) {
|
|
const { request } = args;
|
|
const session = await auth.api.getSession({ headers: args.request.headers });
|
|
const userId = session?.user.id ?? null;
|
|
|
|
if (!userId) {
|
|
return Response.json({ error: "Unauthorized" }, { status: 401 });
|
|
}
|
|
|
|
const formData = await request.formData();
|
|
const seasonId = formData.get("seasonId") as string;
|
|
const pickNumber = parseInt(formData.get("pickNumber") as string);
|
|
|
|
if (!seasonId || isNaN(pickNumber) || pickNumber < 1) {
|
|
return Response.json({ error: "Missing required fields" }, { 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 });
|
|
}
|
|
|
|
if (!(await isCommissioner(season.leagueId, userId))) {
|
|
return Response.json({ error: "Only commissioners can roll back the draft" }, { status: 403 });
|
|
}
|
|
|
|
if (season.status !== "draft") {
|
|
return Response.json(
|
|
{ error: "Cannot roll back a draft that is not in progress" },
|
|
{ status: 400 }
|
|
);
|
|
}
|
|
|
|
const draftSlots = await db.query.draftSlots.findMany({
|
|
where: eq(schema.draftSlots.seasonId, seasonId),
|
|
orderBy: schema.draftSlots.draftOrder,
|
|
});
|
|
|
|
const totalTeams = draftSlots.length;
|
|
|
|
if (totalTeams === 0) {
|
|
return Response.json({ error: "No draft slots found for this season" }, { status: 400 });
|
|
}
|
|
|
|
// Calculate which team is on the clock at the rollback pick (snake draft)
|
|
const round = Math.ceil(pickNumber / totalTeams);
|
|
const isEvenRound = round % 2 === 0;
|
|
let pickInRound = ((pickNumber - 1) % totalTeams) + 1;
|
|
if (isEvenRound) {
|
|
pickInRound = totalTeams - pickInRound + 1;
|
|
}
|
|
const rollbackSlot = draftSlots.find((slot) => slot.draftOrder === pickInRound);
|
|
|
|
// Delete picks from pickNumber onwards
|
|
await db
|
|
.delete(schema.draftPicks)
|
|
.where(
|
|
and(
|
|
eq(schema.draftPicks.seasonId, seasonId),
|
|
gte(schema.draftPicks.pickNumber, pickNumber)
|
|
)
|
|
);
|
|
|
|
// Update season: reset pick number and unpause
|
|
await db
|
|
.update(schema.seasons)
|
|
.set({
|
|
currentPickNumber: pickNumber,
|
|
draftPaused: false,
|
|
})
|
|
.where(eq(schema.seasons.id, seasonId));
|
|
|
|
await logCommissionerAction({
|
|
seasonId,
|
|
leagueId: season.leagueId,
|
|
actorUserId: userId,
|
|
action: "draft_rollback",
|
|
affectedTeamIds: rollbackSlot?.teamId ? [rollbackSlot.teamId] : [],
|
|
details: {
|
|
rolledBackToPickNumber: pickNumber,
|
|
previousPickNumber: season.currentPickNumber,
|
|
},
|
|
});
|
|
|
|
// Emit socket events
|
|
try {
|
|
const io = getSocketIO();
|
|
|
|
io.to(`draft-${seasonId}`).emit("draft-rolled-back", {
|
|
seasonId,
|
|
pickNumber,
|
|
teamId: rollbackSlot?.teamId,
|
|
});
|
|
} catch (error) {
|
|
logger.error("Socket.IO error:", error);
|
|
}
|
|
|
|
return Response.json({ success: true, pickNumber });
|
|
}
|