feat(onboarding): login — auto-advance if session, callbackURL on SSO, hide email/pw when disabled, empty state

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Théo LAGACHE
2026-06-18 15:52:19 +02:00
co-authored by Claude Sonnet 4.6
parent a395f15ba5
commit 18282ede01
+106 -53
View File
@@ -1,10 +1,11 @@
"use client"; "use client";
import { useEffect } from "react";
import { useOnboarding } from "@onboardjs/react"; import { useOnboarding } from "@onboardjs/react";
import { useMutation } from "@tanstack/react-query"; import { useMutation } from "@tanstack/react-query";
import { z } from "zod"; import { z } from "zod";
import { toast } from "sonner"; import { toast } from "sonner";
import { Globe, Mail } from "lucide-react"; import { Globe, Mail, KeyRound } from "lucide-react";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { PasswordInput } from "@/components/ui/password-input"; import { PasswordInput } from "@/components/ui/password-input";
@@ -17,7 +18,7 @@ import {
FormControl, FormControl,
FormMessage, FormMessage,
} from "@/components/ui/form"; } from "@/components/ui/form";
import { signIn } from "@/lib/auth/auth-client"; import { signIn, useSession } from "@/lib/auth/auth-client";
import type { OnboardingMeta } from "@/features/onboarding/onboarding.types"; import type { OnboardingMeta } from "@/features/onboarding/onboarding.types";
const LoginSchema = z.object({ const LoginSchema = z.object({
@@ -30,9 +31,31 @@ type LoginValues = z.infer<typeof LoginSchema>;
export const StepLogin = () => { export const StepLogin = () => {
const { next, state } = useOnboarding(); const { next, state } = useOnboarding();
const meta = state?.context.flowData.meta as OnboardingMeta | undefined; const meta = state?.context.flowData.meta as OnboardingMeta | undefined;
const { data: session } = useSession();
const passkeyEnabled = meta?.passkeyEnabled ?? false;
const emailPasswordEnabled = meta?.emailPasswordEnabled ?? true;
const hasAnySsoProvider = (meta?.ssoProviders?.length ?? 0) > 0;
const hasAnyAuthMethod = emailPasswordEnabled || passkeyEnabled || hasAnySsoProvider;
// Auto-advance if already authenticated
useEffect(() => {
if (session?.user) {
next();
}
}, [session?.user?.id]);
const form = useZodForm({ schema: LoginSchema }); const form = useZodForm({ schema: LoginSchema });
const passkeyMutation = useMutation({
mutationFn: async () => {
const result = await (signIn as any).passkey();
if (result?.error) throw new Error(result.error.message ?? "Passkey sign in failed");
await next();
},
onError: (err: Error) => { toast.error(err.message); },
});
const loginMutation = useMutation({ const loginMutation = useMutation({
mutationFn: async (values: LoginValues) => { mutationFn: async (values: LoginValues) => {
const result = await signIn.email({ const result = await signIn.email({
@@ -41,22 +64,37 @@ export const StepLogin = () => {
}); });
if (result.error) throw new Error(result.error.message ?? "Sign in failed"); if (result.error) throw new Error(result.error.message ?? "Sign in failed");
await next(); await next();
return result.data;
},
onError: (err: Error) => {
toast.error(err.message);
}, },
onError: (err: Error) => { toast.error(err.message); },
}); });
const handleSso = async (providerId: string) => { const handleSso = async (providerId: string) => {
try { try {
await signIn.social({ provider: providerId as any }); await signIn.social({ provider: providerId as any, callbackURL: "/welcome" });
} catch (err) { } catch (err) {
toast.error(err instanceof Error ? err.message : "SSO sign in failed"); toast.error(err instanceof Error ? err.message : "SSO sign in failed");
} }
}; };
// Case 1: No existing users — registration flow (SSO or continue to account-info) // No auth methods configured
if (!hasAnyAuthMethod) {
return (
<div className="flex flex-col gap-4">
<div>
<h1 className="text-2xl font-semibold">No authentication configured</h1>
<p className="text-sm text-muted-foreground mt-1">
Enable at least one authentication method in your environment variables to continue.
</p>
</div>
<div className="rounded-lg border border-yellow-500/30 bg-yellow-500/10 p-4 text-sm text-yellow-400">
Set <code className="font-mono">AUTH_EMAIL_PASSWORD_ENABLED=true</code>,{" "}
<code className="font-mono">AUTH_PASSKEY_ENABLED=true</code>, or configure an SSO provider.
</div>
</div>
);
}
// New user registration flow
if (!meta?.hasExistingUsers) { if (!meta?.hasExistingUsers) {
return ( return (
<div className="flex flex-col gap-4"> <div className="flex flex-col gap-4">
@@ -66,9 +104,9 @@ export const StepLogin = () => {
Set up your instance by creating the first account. Set up your instance by creating the first account.
</p> </p>
</div> </div>
{meta?.ssoProviders && meta.ssoProviders.length > 0 && ( {hasAnySsoProvider && (
<div className="flex flex-col gap-2"> <div className="flex flex-col gap-2">
{meta.ssoProviders.map((provider) => ( {meta?.ssoProviders.map((provider) => (
<button <button
key={provider.id} key={provider.id}
type="button" type="button"
@@ -83,15 +121,17 @@ export const StepLogin = () => {
))} ))}
</div> </div>
)} )}
<Button type="button" onClick={() => next()}> {emailPasswordEnabled && (
<Mail className="size-4 mr-2" /> <Button type="button" onClick={() => next()}>
Register with email <Mail className="size-4 mr-2" />
</Button> Register with email
</Button>
)}
</div> </div>
); );
} }
// Case 2 & 3: Login form (default user mode or session expired resume) // Existing user login flow
return ( return (
<div className="flex flex-col gap-4"> <div className="flex flex-col gap-4">
<div> <div>
@@ -102,9 +142,9 @@ export const StepLogin = () => {
: "Your session expired. Sign in to continue where you left off."} : "Your session expired. Sign in to continue where you left off."}
</p> </p>
</div> </div>
{meta?.ssoProviders && meta.ssoProviders.length > 0 && !meta.defaultUserMode && ( {hasAnySsoProvider && !meta?.defaultUserMode && (
<div className="flex flex-col gap-2"> <div className="flex flex-col gap-2">
{meta.ssoProviders.map((provider) => ( {meta?.ssoProviders.map((provider) => (
<button <button
key={provider.id} key={provider.id}
type="button" type="button"
@@ -119,43 +159,56 @@ export const StepLogin = () => {
))} ))}
</div> </div>
)} )}
<Form {passkeyEnabled && (
form={form} <Button
className="flex flex-col gap-4" type="button"
onSubmit={async (values) => loginMutation.mutateAsync(values)} variant="outline"
> onClick={() => passkeyMutation.mutate()}
<FormField disabled={passkeyMutation.isPending}
control={form.control} >
name="email" <KeyRound className="size-4 mr-2" />
defaultValue="" Sign in with passkey
render={({ field }) => (
<FormItem>
<FormLabel>Email</FormLabel>
<FormControl>
<Input placeholder="your@email.com" {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="password"
defaultValue=""
render={({ field }) => (
<FormItem>
<FormLabel>Password</FormLabel>
<FormControl>
<PasswordInput placeholder="Your password" {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<Button type="submit" disabled={loginMutation.isPending}>
Sign in
</Button> </Button>
</Form> )}
{emailPasswordEnabled && (
<Form
form={form}
className="flex flex-col gap-4"
onSubmit={async (values) => loginMutation.mutateAsync(values)}
>
<FormField
control={form.control}
name="email"
defaultValue=""
render={({ field }) => (
<FormItem>
<FormLabel>Email</FormLabel>
<FormControl>
<Input placeholder="your@email.com" {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="password"
defaultValue=""
render={({ field }) => (
<FormItem>
<FormLabel>Password</FormLabel>
<FormControl>
<PasswordInput placeholder="Your password" {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<Button type="submit" disabled={loginMutation.isPending}>
Sign in
</Button>
</Form>
)}
</div> </div>
); );
}; };