* 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>
155 lines
5.4 KiB
TypeScript
155 lines
5.4 KiB
TypeScript
import { describe, it, expect, vi, beforeEach } from "vitest";
|
|
import type { RouterContextProvider } from "react-router";
|
|
import { action } from "~/routes/api/draft.start";
|
|
|
|
const ctx = {} as unknown as RouterContextProvider;
|
|
|
|
vi.mock("~/database/context");
|
|
vi.mock("~/server/socket", () => ({
|
|
getSocketIO: vi.fn(),
|
|
}));
|
|
vi.mock("~/lib/auth.server", () => ({
|
|
auth: { api: { getSession: vi.fn() } },
|
|
}));
|
|
vi.mock("~/models/commissioner", () => ({
|
|
isCommissioner: vi.fn(),
|
|
}));
|
|
vi.mock("~/models/draft-timer", () => ({
|
|
deleteSeasonTimers: vi.fn(),
|
|
initializeDraftTimers: vi.fn(),
|
|
}));
|
|
vi.mock("~/models/audit-log", () => ({
|
|
logCommissionerAction: vi.fn().mockResolvedValue(undefined),
|
|
}));
|
|
|
|
// ── Fixtures ─────────────────────────────────────────────────────────────────
|
|
|
|
const SEASON_ID = "season-1";
|
|
const COMMISSIONER_ID = "commissioner-user-1";
|
|
|
|
const mockDraftSlots = [
|
|
{ id: "slot-1", seasonId: SEASON_ID, teamId: "team-1", draftOrder: 1 },
|
|
{ id: "slot-2", seasonId: SEASON_ID, teamId: "team-2", draftOrder: 2 },
|
|
];
|
|
|
|
function makeSeason(overrides: Record<string, unknown> = {}) {
|
|
return {
|
|
id: SEASON_ID,
|
|
leagueId: "league-1",
|
|
status: "pre_draft",
|
|
draftInitialTime: 120,
|
|
draftIncrementTime: 30,
|
|
draftTimerMode: "chess_clock",
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function makeRequest() {
|
|
const formData = new FormData();
|
|
formData.append("seasonId", SEASON_ID);
|
|
return new Request("http://localhost/api/draft/start", {
|
|
method: "POST",
|
|
body: formData,
|
|
});
|
|
}
|
|
|
|
// ── Tests ─────────────────────────────────────────────────────────────────────
|
|
|
|
describe("draft.start action — timer initialization", () => {
|
|
let mockDb: any;
|
|
let mockSocketIO: any;
|
|
|
|
beforeEach(async () => {
|
|
vi.clearAllMocks();
|
|
|
|
const { auth } = await import("~/lib/auth.server");
|
|
vi.mocked(auth.api.getSession).mockResolvedValue({ user: { id: COMMISSIONER_ID } } as any);
|
|
|
|
const { isCommissioner } = await import("~/models/commissioner");
|
|
vi.mocked(isCommissioner).mockResolvedValue(true);
|
|
|
|
mockSocketIO = { to: vi.fn().mockReturnThis(), emit: vi.fn() };
|
|
const socketModule = await import("~/server/socket");
|
|
vi.mocked(socketModule.getSocketIO).mockReturnValue(mockSocketIO);
|
|
|
|
mockDb = {
|
|
query: {
|
|
seasons: { findFirst: vi.fn() },
|
|
draftSlots: { findMany: vi.fn() },
|
|
},
|
|
update: vi.fn().mockReturnThis(),
|
|
set: vi.fn().mockReturnThis(),
|
|
where: vi.fn().mockReturnThis(),
|
|
};
|
|
|
|
mockDb.query.draftSlots.findMany.mockResolvedValue(mockDraftSlots);
|
|
|
|
const { database } = await import("~/database/context");
|
|
vi.mocked(database).mockReturnValue(mockDb);
|
|
});
|
|
|
|
describe("chess_clock mode", () => {
|
|
it("initializes each team's timer to draftInitialTime", async () => {
|
|
mockDb.query.seasons.findFirst.mockResolvedValue(
|
|
makeSeason({ draftTimerMode: "chess_clock", draftInitialTime: 120, draftIncrementTime: 30 })
|
|
);
|
|
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
const { initializeDraftTimers } = await import("~/models/draft-timer");
|
|
expect(vi.mocked(initializeDraftTimers)).toHaveBeenCalledWith(
|
|
SEASON_ID,
|
|
expect.any(Array),
|
|
120 // draftInitialTime, not draftIncrementTime
|
|
);
|
|
});
|
|
|
|
it("uses the configured draftInitialTime (not the increment)", async () => {
|
|
mockDb.query.seasons.findFirst.mockResolvedValue(
|
|
makeSeason({ draftTimerMode: "chess_clock", draftInitialTime: 28800, draftIncrementTime: 3600 })
|
|
);
|
|
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
const { initializeDraftTimers } = await import("~/models/draft-timer");
|
|
expect(vi.mocked(initializeDraftTimers)).toHaveBeenCalledWith(
|
|
SEASON_ID,
|
|
expect.any(Array),
|
|
28800 // 8 hours initial bank
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("standard mode", () => {
|
|
it("initializes each team's timer to draftIncrementTime (the per-pick time)", async () => {
|
|
mockDb.query.seasons.findFirst.mockResolvedValue(
|
|
makeSeason({ draftTimerMode: "standard", draftInitialTime: 120, draftIncrementTime: 30 })
|
|
);
|
|
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
const { initializeDraftTimers } = await import("~/models/draft-timer");
|
|
expect(vi.mocked(initializeDraftTimers)).toHaveBeenCalledWith(
|
|
SEASON_ID,
|
|
expect.any(Array),
|
|
30 // draftIncrementTime, not draftInitialTime
|
|
);
|
|
});
|
|
|
|
it("ignores draftInitialTime — uses only increment for the starting clock", async () => {
|
|
// Even though initialTime=600, standard mode should use increment=45
|
|
mockDb.query.seasons.findFirst.mockResolvedValue(
|
|
makeSeason({ draftTimerMode: "standard", draftInitialTime: 600, draftIncrementTime: 45 })
|
|
);
|
|
|
|
await action({ request: makeRequest(), params: {}, context: ctx });
|
|
|
|
const { initializeDraftTimers } = await import("~/models/draft-timer");
|
|
expect(vi.mocked(initializeDraftTimers)).toHaveBeenCalledWith(
|
|
SEASON_ID,
|
|
expect.any(Array),
|
|
45 // increment only — initial time is irrelevant in standard mode
|
|
);
|
|
});
|
|
});
|
|
});
|