ba9bf64e37
* 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>
62 lines
1.3 KiB
TypeScript
62 lines
1.3 KiB
TypeScript
export const mockUser = {
|
|
id: 'user-1',
|
|
clerkId: 'clerk-user-1',
|
|
email: 'user1@example.com',
|
|
emailVerified: true,
|
|
username: 'user1',
|
|
displayName: 'User One',
|
|
firstName: 'User',
|
|
lastName: 'One',
|
|
imageUrl: null,
|
|
isAdmin: false,
|
|
createdAt: new Date('2025-01-01'),
|
|
updatedAt: new Date('2025-01-01'),
|
|
};
|
|
|
|
export const mockAdminUser = {
|
|
id: 'admin-1',
|
|
clerkId: 'clerk-admin-1',
|
|
email: 'admin@example.com',
|
|
emailVerified: true,
|
|
username: 'admin',
|
|
displayName: 'Admin User',
|
|
firstName: 'Admin',
|
|
lastName: 'User',
|
|
imageUrl: null,
|
|
isAdmin: true,
|
|
createdAt: new Date('2025-01-01'),
|
|
updatedAt: new Date('2025-01-01'),
|
|
};
|
|
|
|
export const mockUsers = [
|
|
mockUser,
|
|
{
|
|
id: 'user-2',
|
|
clerkId: 'clerk-user-2',
|
|
email: 'user2@example.com',
|
|
emailVerified: true,
|
|
username: 'user2',
|
|
displayName: 'User Two',
|
|
firstName: 'User',
|
|
lastName: 'Two',
|
|
imageUrl: null,
|
|
isAdmin: false,
|
|
createdAt: new Date('2025-01-01'),
|
|
updatedAt: new Date('2025-01-01'),
|
|
},
|
|
{
|
|
id: 'user-3',
|
|
clerkId: 'clerk-user-3',
|
|
email: 'user3@example.com',
|
|
emailVerified: true,
|
|
username: 'user3',
|
|
displayName: 'User Three',
|
|
firstName: 'User',
|
|
lastName: 'Three',
|
|
imageUrl: null,
|
|
isAdmin: false,
|
|
createdAt: new Date('2025-01-01'),
|
|
updatedAt: new Date('2025-01-01'),
|
|
},
|
|
mockAdminUser,
|
|
];
|