* 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>
126 lines
4.5 KiB
TypeScript
126 lines
4.5 KiB
TypeScript
import { useState } from "react";
|
|
import { Link, useSearchParams, redirect } from "react-router";
|
|
import { auth } from "~/lib/auth.server";
|
|
import { authClient } from "~/lib/auth-client";
|
|
import type { Route } from "./+types/login";
|
|
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: "Sign In - Brackt" }];
|
|
}
|
|
|
|
function safeRedirectTo(value: string | null): string {
|
|
if (!value) return "/";
|
|
return value.startsWith("/") && !value.startsWith("//") ? value : "/";
|
|
}
|
|
|
|
export async function loader(args: Route.LoaderArgs) {
|
|
const session = await auth.api.getSession({ headers: args.request.headers });
|
|
if (session) {
|
|
const raw = new URL(args.request.url).searchParams.get("redirectTo");
|
|
return redirect(safeRedirectTo(raw));
|
|
}
|
|
return {};
|
|
}
|
|
|
|
export default function LoginPage() {
|
|
const [searchParams] = useSearchParams();
|
|
const redirectTo = safeRedirectTo(searchParams.get("redirectTo"));
|
|
const [error, setError] = useState<string | null>(null);
|
|
const [loading, setLoading] = useState(false);
|
|
|
|
async function handleEmailSignIn(e: React.FormEvent<HTMLFormElement>) {
|
|
e.preventDefault();
|
|
setError(null);
|
|
setLoading(true);
|
|
const form = e.currentTarget;
|
|
const email = (form.elements.namedItem("email") as HTMLInputElement).value;
|
|
const password = (form.elements.namedItem("password") as HTMLInputElement).value;
|
|
|
|
const { error: signInError } = await authClient.signIn.email({
|
|
email,
|
|
password,
|
|
callbackURL: redirectTo,
|
|
});
|
|
|
|
if (signInError) {
|
|
setError(signInError.message ?? "Sign in failed. Please check your credentials.");
|
|
setLoading(false);
|
|
}
|
|
}
|
|
|
|
async function handleSocialSignIn(provider: "google" | "discord") {
|
|
await authClient.signIn.social({ provider, callbackURL: redirectTo });
|
|
}
|
|
|
|
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">Sign in</CardTitle>
|
|
<CardDescription>Sign in to your Brackt account</CardDescription>
|
|
</CardHeader>
|
|
<CardContent className="space-y-4">
|
|
<div className="space-y-2">
|
|
<Button
|
|
variant="outline"
|
|
className="w-full"
|
|
onClick={() => handleSocialSignIn("google")}
|
|
type="button"
|
|
>
|
|
Continue with Google
|
|
</Button>
|
|
<Button
|
|
variant="outline"
|
|
className="w-full"
|
|
onClick={() => handleSocialSignIn("discord")}
|
|
type="button"
|
|
>
|
|
Continue with Discord
|
|
</Button>
|
|
</div>
|
|
|
|
<div className="relative">
|
|
<div className="absolute inset-0 flex items-center">
|
|
<span className="w-full border-t border-border" />
|
|
</div>
|
|
<div className="relative flex justify-center text-xs uppercase">
|
|
<span className="bg-background px-2 text-muted-foreground">or</span>
|
|
</div>
|
|
</div>
|
|
|
|
<form onSubmit={handleEmailSignIn} className="space-y-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="email">Email</Label>
|
|
<Input id="email" name="email" type="email" required autoComplete="email" />
|
|
</div>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="password">Password</Label>
|
|
<Input id="password" name="password" type="password" required autoComplete="current-password" />
|
|
</div>
|
|
{error && <p className="text-sm text-destructive">{error}</p>}
|
|
<Button type="submit" className="w-full" disabled={loading}>
|
|
{loading ? "Signing in…" : "Sign In"}
|
|
</Button>
|
|
</form>
|
|
|
|
<p className="text-center text-sm text-muted-foreground">
|
|
<Link to="/forgot-password" className="underline">
|
|
Forgot password?
|
|
</Link>
|
|
</p>
|
|
|
|
<p className="text-center text-sm text-muted-foreground">
|
|
Don't have an account?{" "}
|
|
<Link to={`/register?redirectTo=${encodeURIComponent(redirectTo)}`} className="underline">
|
|
Create one
|
|
</Link>
|
|
</p>
|
|
</CardContent>
|
|
</Card>
|
|
</div>
|
|
);
|
|
}
|