Switches from the planned Auth.js v5 to better-auth 1.7.1. The plan assumed the blocker would be schema fit; it is not. @auth/drizzle-adapter accepts our tables verbatim. What rules Auth.js out is that credentials providers hardcode JWT and never call adapter.createSession, and the config assertion that would catch it only fires when EVERY provider is credentials — so adding Google suppresses the warning and the app ships silently broken. Phone OTP with database sessions is not reachable there without hand-building the whole OTP security layer. Also corrects a premise: better-auth's drizzle-orm peer is declared OPTIONAL, so no 0.38 -> 0.45 upgrade is forced. Verified on 0.38.4. - auth schema rewritten to better-auth 1.7.1's own getSchema() output: sessions/accounts/verifications reshaped, emailVerified and phoneVerified are BOOLEAN (a timestamptz there fails 100% of signups), accounts.issuer added, phone_otps dropped. Ban state now comes from the admin plugin rather than a second bannedAt column. - Session resolution is one file. Everything downstream is written against our own Session type, so the provider stays swappable. - Ban enforcement lives in the resolver because Session carries no ban field and protectedProcedure promises a non-banned user. - Phone OTP sign-in, Google, role selection, tRPC user router. - Synthetic emails for phone-first users, with isSyntheticEmail() gating every future send. Pros must supply a real address; clients need not. - Duplicate-account detection, since both signup routes stay open and nothing correlates a phone to a Google identity. Detects only — merging accounts that carry reviews and payments needs its own tooling. - SMS sender refuses to fall back to console logging in production. - declaration:false for the app, which is the actual fix for the TS2742 wall from better-auth's transitive zod under pnpm. Verified against a live server: OTP sent, code verified, uuid PK honoured, database session written, and an authenticated tRPC call resolved. A signed-in stranger gets NOT_FOUND on another client's deck; anonymous gets UNAUTHORIZED. 124 tests passing. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
39 lines
1.2 KiB
TypeScript
39 lines
1.2 KiB
TypeScript
import { redirect } from 'next/navigation';
|
|
import { getApi } from '@/server/caller';
|
|
import { RoleChooser } from './role-chooser';
|
|
|
|
export const metadata = { title: 'Welcome' };
|
|
export const dynamic = 'force-dynamic';
|
|
|
|
/**
|
|
* Role selection.
|
|
*
|
|
* Google signup lands everyone on the `client` default, so a tradesperson would
|
|
* otherwise reach the customer deck with the wrong account type. Phone signup
|
|
* has the same problem. This is the fork.
|
|
*/
|
|
export default async function OnboardingPage() {
|
|
const api = await getApi();
|
|
|
|
let me: Awaited<ReturnType<typeof api.user.me>>;
|
|
try {
|
|
me = await api.user.me();
|
|
} catch {
|
|
redirect('/sign-in?next=/onboarding');
|
|
}
|
|
|
|
// Someone who already committed to a role does not need to see this again.
|
|
if (me.role === 'admin') redirect('/admin');
|
|
if (me.role === 'pro') redirect(me.hasProProfile ? '/pro' : '/pro/onboarding');
|
|
|
|
return (
|
|
<main className="mx-auto flex min-h-dvh max-w-md flex-col justify-center px-6 py-12">
|
|
<h1 className="text-2xl font-semibold tracking-tight">What brings you here?</h1>
|
|
<p className="mt-2 text-sm text-[var(--muted)]">
|
|
You can only pick once, so choose the one that fits.
|
|
</p>
|
|
<RoleChooser />
|
|
</main>
|
|
);
|
|
}
|