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>
99 lines
2.7 KiB
TypeScript
99 lines
2.7 KiB
TypeScript
import { eq, and } from "drizzle-orm";
|
|
import { database } from "~/database/context";
|
|
import * as schema from "~/database/schema";
|
|
import { isUserAdmin } from "~/models/user";
|
|
|
|
export type Commissioner = typeof schema.commissioners.$inferSelect;
|
|
export type NewCommissioner = typeof schema.commissioners.$inferInsert;
|
|
|
|
export async function createCommissioner(
|
|
data: NewCommissioner
|
|
): Promise<Commissioner> {
|
|
const db = database();
|
|
const [commissioner] = await db
|
|
.insert(schema.commissioners)
|
|
.values(data)
|
|
.returning();
|
|
return commissioner;
|
|
}
|
|
|
|
export async function findCommissionersByLeagueId(
|
|
leagueId: string
|
|
): Promise<Commissioner[]> {
|
|
const db = database();
|
|
return await db.query.commissioners.findMany({
|
|
where: eq(schema.commissioners.leagueId, leagueId),
|
|
orderBy: (commissioners, { asc }) => [asc(commissioners.createdAt)],
|
|
});
|
|
}
|
|
|
|
export async function findCommissionersByUserId(
|
|
userId: string
|
|
): Promise<Commissioner[]> {
|
|
const db = database();
|
|
return await db.query.commissioners.findMany({
|
|
where: eq(schema.commissioners.userId, userId),
|
|
orderBy: (commissioners, { desc }) => [desc(commissioners.createdAt)],
|
|
});
|
|
}
|
|
|
|
export async function hasCommissionerRecord(
|
|
leagueId: string,
|
|
userId: string
|
|
): Promise<boolean> {
|
|
const db = database();
|
|
const commissioner = await db.query.commissioners.findFirst({
|
|
where: and(
|
|
eq(schema.commissioners.leagueId, leagueId),
|
|
eq(schema.commissioners.userId, userId)
|
|
),
|
|
});
|
|
return !!commissioner;
|
|
}
|
|
|
|
export async function isCommissioner(
|
|
leagueId: string,
|
|
userId: string
|
|
): Promise<boolean> {
|
|
const db = database();
|
|
const [isAdmin, commissioner] = await Promise.all([
|
|
isUserAdmin(userId),
|
|
db.query.commissioners.findFirst({
|
|
where: and(
|
|
eq(schema.commissioners.leagueId, leagueId),
|
|
eq(schema.commissioners.userId, userId)
|
|
),
|
|
}),
|
|
]);
|
|
return isAdmin || !!commissioner;
|
|
}
|
|
|
|
export async function countCommissionersByLeagueId(
|
|
leagueId: string
|
|
): Promise<number> {
|
|
const db = database();
|
|
const commissioners = await db.query.commissioners.findMany({
|
|
where: eq(schema.commissioners.leagueId, leagueId),
|
|
});
|
|
return commissioners.length;
|
|
}
|
|
|
|
export async function deleteCommissioner(id: string): Promise<void> {
|
|
const db = database();
|
|
await db.delete(schema.commissioners).where(eq(schema.commissioners.id, id));
|
|
}
|
|
|
|
export async function removeCommissionerByLeagueAndUser(
|
|
leagueId: string,
|
|
userId: string
|
|
): Promise<void> {
|
|
const db = database();
|
|
await db
|
|
.delete(schema.commissioners)
|
|
.where(
|
|
and(
|
|
eq(schema.commissioners.leagueId, leagueId),
|
|
eq(schema.commissioners.userId, userId)
|
|
)
|
|
);
|
|
}
|