* Fix BetterAuth field mapping and add owner-prefixed team names - Fix auth.server.ts: use camelCase Drizzle field names for BetterAuth adapter (was snake_case, causing user inserts to fail); add generateId: "uuid" so PostgreSQL UUID columns accept generated IDs - Add prependOwnerToTeamName / stripOwnerFromTeamName utilities - Invite join, league creation, and settings assign/remove all now manage the owner-prefix on team names atomically Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Complete BetterAuth migration: auth flows, rename, and cleanup - Add /forgot-password and /reset-password pages (full password reset flow) - Add 'Forgot password?' link on login page - Fix register.tsx: add explicit window.location fallback after signUp - Rename commissionerAuditLog.actorClerkId → actorUserId (migration 0084) and update all references in model, routes, components, and tests - Rewrite docs/agents/auth.md to document BetterAuth (removes all Clerk refs) - Update test fixtures and schema comments to remove Clerk ID references; use UUID-format IDs throughout test data - Update docs/agents/domain-models.md ownerId description Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Fix BetterAuth ID generation, clean up review issues - Set generateId: false so BetterAuth omits id from inserts; add $defaultFn(crypto.randomUUID) to accounts/sessions/verifications so Drizzle fills it in (fixes null id constraint violation on signup) - Move renameTeam to static import; rename before removeTeamOwner so a failed rename leaves owner intact rather than leaving a stale prefix - Clarify stripOwnerFromTeamName toTitleCase assumption in comment - Annotate reset-password token fallback to explain loader guarantee Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
97 lines
3.5 KiB
TypeScript
97 lines
3.5 KiB
TypeScript
import { useState } from "react";
|
|
import { Link, redirect, useSearchParams } from "react-router";
|
|
import { auth } from "~/lib/auth.server";
|
|
import { authClient } from "~/lib/auth-client";
|
|
import type { Route } from "./+types/reset-password";
|
|
import { Button } from "~/components/ui/button";
|
|
import { Input } from "~/components/ui/input";
|
|
import { Label } from "~/components/ui/label";
|
|
import { Card, CardContent, CardHeader, CardTitle, CardDescription } from "~/components/ui/card";
|
|
|
|
export function meta(): Route.MetaDescriptors {
|
|
return [{ title: "Reset Password - Brackt" }];
|
|
}
|
|
|
|
export async function loader(args: Route.LoaderArgs) {
|
|
const session = await auth.api.getSession({ headers: args.request.headers });
|
|
if (session) return redirect("/");
|
|
const token = new URL(args.request.url).searchParams.get("token");
|
|
if (!token) return redirect("/forgot-password");
|
|
return {};
|
|
}
|
|
|
|
export default function ResetPasswordPage() {
|
|
const [searchParams] = useSearchParams();
|
|
const token = searchParams.get("token") ?? ""; // loader redirects to /forgot-password when absent
|
|
const [error, setError] = useState<string | null>(null);
|
|
const [loading, setLoading] = useState(false);
|
|
|
|
async function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
|
|
e.preventDefault();
|
|
setError(null);
|
|
const form = e.currentTarget;
|
|
const newPassword = (form.elements.namedItem("password") as HTMLInputElement).value;
|
|
const confirm = (form.elements.namedItem("confirm") as HTMLInputElement).value;
|
|
|
|
if (newPassword !== confirm) {
|
|
setError("Passwords do not match.");
|
|
return;
|
|
}
|
|
|
|
setLoading(true);
|
|
const { error: resetError } = await authClient.resetPassword({ newPassword, token });
|
|
|
|
if (resetError) {
|
|
setError(resetError.message ?? "Reset failed. The link may have expired.");
|
|
setLoading(false);
|
|
} else {
|
|
window.location.href = "/login";
|
|
}
|
|
}
|
|
|
|
return (
|
|
<div className="min-h-screen flex items-center justify-center p-4">
|
|
<Card className="w-full max-w-md">
|
|
<CardHeader className="space-y-1">
|
|
<CardTitle className="text-2xl">Choose a new password</CardTitle>
|
|
<CardDescription>Enter a new password for your account</CardDescription>
|
|
</CardHeader>
|
|
<CardContent className="space-y-4">
|
|
<form onSubmit={handleSubmit} className="space-y-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="password">New password</Label>
|
|
<Input
|
|
id="password"
|
|
name="password"
|
|
type="password"
|
|
required
|
|
minLength={8}
|
|
autoComplete="new-password"
|
|
/>
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="confirm">Confirm password</Label>
|
|
<Input
|
|
id="confirm"
|
|
name="confirm"
|
|
type="password"
|
|
required
|
|
minLength={8}
|
|
autoComplete="new-password"
|
|
/>
|
|
</div>
|
|
{error && <p className="text-sm text-destructive">{error}</p>}
|
|
<Button type="submit" className="w-full" disabled={loading}>
|
|
{loading ? "Saving…" : "Set new password"}
|
|
</Button>
|
|
</form>
|
|
<p className="text-center text-sm text-muted-foreground">
|
|
<Link to="/login" className="underline">
|
|
Back to sign in
|
|
</Link>
|
|
</p>
|
|
</CardContent>
|
|
</Card>
|
|
</div>
|
|
);
|
|
}
|