* 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>
213 lines
6.7 KiB
TypeScript
213 lines
6.7 KiB
TypeScript
import { auth } from "~/lib/auth.server";
|
|
import { database } from "~/database/context";
|
|
import * as schema from "~/database/schema";
|
|
import { eq, and } from "drizzle-orm";
|
|
import { isCommissioner } from "~/models/commissioner";
|
|
import { calculateDraftEligibility } from "~/lib/draft-eligibility";
|
|
import { getDraftPicksWithSports, getTeamDraftPicksWithSports } from "~/models/draft-pick";
|
|
import { getParticipantsForSeasonWithSports } from "~/models/participant";
|
|
import { getSeasonSportsSimple } from "~/models/season-sport";
|
|
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 participantId = formData.get("participantId") as string;
|
|
const pickNumber = parseInt(formData.get("pickNumber") as string);
|
|
|
|
if (!seasonId || !participantId || 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 replace picks" }, { status: 403 });
|
|
}
|
|
|
|
if (season.status === "pre_draft") {
|
|
return Response.json({ error: "Draft has not started" }, { status: 400 });
|
|
}
|
|
|
|
// Get the existing pick at this slot
|
|
const existingPick = await db.query.draftPicks.findFirst({
|
|
where: and(
|
|
eq(schema.draftPicks.seasonId, seasonId),
|
|
eq(schema.draftPicks.pickNumber, pickNumber)
|
|
),
|
|
});
|
|
|
|
if (!existingPick) {
|
|
return Response.json({ error: "No pick found at this slot" }, { status: 404 });
|
|
}
|
|
|
|
// Use the team from the DB record — don't trust the client-supplied teamId
|
|
const teamId = existingPick.teamId;
|
|
const oldParticipantId = existingPick.participantId;
|
|
|
|
// Check new participant isn't already drafted elsewhere (skip if same participant)
|
|
if (participantId !== oldParticipantId) {
|
|
const alreadyDrafted = await db.query.draftPicks.findFirst({
|
|
where: and(
|
|
eq(schema.draftPicks.seasonId, seasonId),
|
|
eq(schema.draftPicks.participantId, participantId)
|
|
),
|
|
});
|
|
|
|
if (alreadyDrafted) {
|
|
return Response.json({ error: "Participant already drafted" }, { status: 400 });
|
|
}
|
|
}
|
|
|
|
const participant = await db.query.participants.findFirst({
|
|
where: eq(schema.participants.id, participantId),
|
|
with: {
|
|
sportsSeason: { with: { sport: true } },
|
|
},
|
|
});
|
|
|
|
if (!participant) {
|
|
return Response.json({ error: "Participant not found" }, { status: 404 });
|
|
}
|
|
|
|
// Eligibility check — exclude the pick being replaced so its slot is treated as free
|
|
const draftSlots = await db.query.draftSlots.findMany({
|
|
where: eq(schema.draftSlots.seasonId, seasonId),
|
|
orderBy: schema.draftSlots.draftOrder,
|
|
with: { team: true },
|
|
});
|
|
|
|
const allPicksWithSports = await getDraftPicksWithSports(seasonId);
|
|
const teamPicksWithSports = await getTeamDraftPicksWithSports(teamId, seasonId);
|
|
const allParticipants = await getParticipantsForSeasonWithSports(seasonId);
|
|
const seasonSports = await getSeasonSportsSimple(seasonId);
|
|
|
|
// Exclude old participant so that slot is "open" for eligibility purposes
|
|
const allPicksExcluding = allPicksWithSports.filter(
|
|
(p) => p.participant.id !== oldParticipantId
|
|
);
|
|
const teamPicksExcluding = teamPicksWithSports.filter(
|
|
(p) => p.participant.id !== oldParticipantId
|
|
);
|
|
|
|
const allTeams = draftSlots.map((slot) => ({ id: slot.teamId }));
|
|
|
|
const eligibility = calculateDraftEligibility(
|
|
teamId,
|
|
teamPicksExcluding,
|
|
allPicksExcluding,
|
|
allParticipants,
|
|
seasonSports,
|
|
season.draftRounds,
|
|
allTeams
|
|
);
|
|
|
|
const sportId = participant.sportsSeason.sport.id;
|
|
if (!eligibility.eligibleSportIds.has(sportId)) {
|
|
const reason = eligibility.ineligibleReasons[sportId] || "Cannot draft from this sport";
|
|
return Response.json({ error: reason }, { status: 400 });
|
|
}
|
|
|
|
// Fetch old participant name for the audit log (before overwriting the pick)
|
|
const oldParticipant = await db.query.participants.findFirst({
|
|
where: eq(schema.participants.id, oldParticipantId),
|
|
});
|
|
|
|
// Update the pick in-place
|
|
const [updatedPick] = await db
|
|
.update(schema.draftPicks)
|
|
.set({
|
|
participantId,
|
|
pickedByUserId: userId,
|
|
pickedByType: "commissioner",
|
|
})
|
|
.where(
|
|
and(
|
|
eq(schema.draftPicks.seasonId, seasonId),
|
|
eq(schema.draftPicks.pickNumber, pickNumber)
|
|
)
|
|
)
|
|
.returning();
|
|
|
|
const replacedTeam = draftSlots.find((slot) => slot.team.id === teamId)?.team;
|
|
|
|
await logCommissionerAction({
|
|
seasonId,
|
|
leagueId: season.leagueId,
|
|
actorUserId: userId,
|
|
action: "draft_pick_changed",
|
|
affectedTeamIds: [teamId],
|
|
details: {
|
|
pickNumber,
|
|
teamId,
|
|
teamName: replacedTeam?.name ?? teamId,
|
|
oldParticipantId,
|
|
oldParticipantName: oldParticipant?.name ?? oldParticipantId,
|
|
newParticipantId: participantId,
|
|
newParticipantName: participant.name,
|
|
},
|
|
});
|
|
|
|
// Remove new participant from all team queues
|
|
await db
|
|
.delete(schema.draftQueue)
|
|
.where(
|
|
and(
|
|
eq(schema.draftQueue.seasonId, seasonId),
|
|
eq(schema.draftQueue.participantId, participantId)
|
|
)
|
|
);
|
|
|
|
// Emit socket events
|
|
try {
|
|
const io = getSocketIO();
|
|
const team = draftSlots.find((slot) => slot.team.id === teamId)?.team;
|
|
|
|
io.to(`draft-${seasonId}`).emit("pick-replaced", {
|
|
seasonId,
|
|
pickNumber,
|
|
oldParticipantId,
|
|
pick: {
|
|
id: updatedPick.id,
|
|
pickNumber: updatedPick.pickNumber,
|
|
round: updatedPick.round,
|
|
pickInRound: updatedPick.pickInRound,
|
|
timeUsed: updatedPick.timeUsed,
|
|
team,
|
|
participant: {
|
|
id: participant.id,
|
|
name: participant.name,
|
|
sport: participant.sportsSeason.sport,
|
|
},
|
|
sport: participant.sportsSeason.sport,
|
|
},
|
|
});
|
|
|
|
io.to(`draft-${seasonId}`).emit("participant-removed-from-queues", {
|
|
participantId,
|
|
});
|
|
} catch (error) {
|
|
logger.error("Socket.IO error:", error);
|
|
}
|
|
|
|
return Response.json({ success: true });
|
|
}
|