better-ts-stack 2.1.2 → 2.2.0

package/templates/modules/auth/tanstack/src/components/auth/sign-up-form.tsx

@@ -1,7 +1,7 @@
 import { Link, useNavigate } from "@tanstack/react-router";
 import { useState, useTransition } from "react";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { LoaderCircle } from "lucide-react";
+import { CircleAlert } from "lucide-react";
 import { useForm } from "react-hook-form";
 
 import { authClient } from "~/lib/auth-client";
@@ -9,13 +9,14 @@ import {
   getAuthErrorMessage,
   signUpSchema,
   type SignUpValues,
+  type SocialProvider,
 } from "~/lib/auth-schema";
+import { Alert, AlertDescription } from "~/components/ui/alert";
 import { Button } from "~/components/ui/button";
 import {
   Card,
   CardContent,
   CardDescription,
-  CardFooter,
   CardHeader,
   CardTitle,
 } from "~/components/ui/card";
@@ -27,8 +28,11 @@ import {
   FieldLabel,
 } from "~/components/ui/field";
 import { Input } from "~/components/ui/input";
+import { Spinner } from "~/components/ui/spinner";
 
-export function SignUpForm() {
+import { SocialButtons } from "./social-buttons";
+
+export function SignUpForm({ providers }: { providers: SocialProvider[] }) {
   const navigate = useNavigate();
   const [isPending, startTransition] = useTransition();
   const [authError, setAuthError] = useState<string | null>(null);
@@ -49,6 +53,8 @@ export function SignUpForm() {
         name: values.name,
         email: values.email,
         password: values.password,
+        // Where the link in the verification email leads after confirming
+        callbackURL: "/dashboard",
       });
 
       if (result.error) {
@@ -61,8 +67,8 @@ export function SignUpForm() {
   });
 
   return (
-    <Card className="border-white/80 bg-white/90 shadow-2xl shadow-slate-200/70 backdrop-blur">
-      <CardHeader className="space-y-2">
+    <Card>
+      <CardHeader>
         <CardTitle>Create your account</CardTitle>
         <CardDescription>
           Start with a simple email and password sign-up flow powered by Better
@@ -70,8 +76,10 @@ export function SignUpForm() {
         </CardDescription>
       </CardHeader>
       <CardContent>
-        <form className="space-y-6" onSubmit={onSubmit} noValidate>
+        <form onSubmit={onSubmit} noValidate>
           <FieldGroup>
+            <SocialButtons providers={providers} />
+
             <Field data-invalid={Boolean(form.formState.errors.name)}>
               <FieldLabel htmlFor="name">Full name</FieldLabel>
               <Input
@@ -115,37 +123,32 @@ export function SignUpForm() {
               </FieldDescription>
               <FieldError errors={[form.formState.errors.password]} />
             </Field>
-          </FieldGroup>
 
-          {authError ? (
-            <div className="rounded-2xl border border-rose-200 bg-rose-50 px-4 py-3 text-sm text-rose-700">
-              {authError}
-            </div>
-          ) : null}
+            {authError ? (
+              <Alert variant="destructive">
+                <CircleAlert />
+                <AlertDescription>{authError}</AlertDescription>
+              </Alert>
+            ) : null}
 
-          <Button className="w-full" type="submit" disabled={isPending}>
-            {isPending ? (
-              <>
-                <LoaderCircle className="mr-2 size-4 animate-spin" />
-                Creating account
-              </>
-            ) : (
-              "Signup"
-            )}
-          </Button>
+            <Field>
+              <Button type="submit" disabled={isPending}>
+                {isPending ? (
+                  <>
+                    <Spinner data-icon="inline-start" />
+                    Creating account
+                  </>
+                ) : (
+                  "Signup"
+                )}
+              </Button>
+              <FieldDescription className="text-center">
+                Already have an account? <Link to="/sign-in">Login</Link>
+              </FieldDescription>
+            </Field>
+          </FieldGroup>
         </form>
       </CardContent>
-      <CardFooter className="justify-center">
-        <p className="text-sm text-slate-600">
-          Already have an account?{" "}
-          <Link
-            className="font-medium text-sky-700 hover:text-sky-800"
-            to="/sign-in"
-          >
-            Login
-          </Link>
-        </p>
-      </CardFooter>
     </Card>
   );
-}
+}

package/templates/modules/auth/tanstack/src/components/auth/social-buttons.tsx

@@ -0,0 +1,71 @@
+import { useState, useTransition } from "react";
+
+import { authClient } from "~/lib/auth-client";
+import { getAuthErrorMessage, type SocialProvider } from "~/lib/auth-schema";
+import { Button } from "~/components/ui/button";
+import { Field, FieldError, FieldSeparator } from "~/components/ui/field";
+import { Spinner } from "~/components/ui/spinner";
+
+const PROVIDER_LABELS: Record<SocialProvider, string> = {
+  github: "GitHub",
+  google: "Google",
+};
+
+// One button per provider turned on in lib/auth.ts; renders nothing when
+// GitHub and Google sign-in are both off
+export function SocialButtons({ providers }: { providers: SocialProvider[] }) {
+  const [isPending, startTransition] = useTransition();
+  // The provider whose button was clicked, for its "Redirecting" label
+  const [chosen, setChosen] = useState<SocialProvider | null>(null);
+  const [error, setError] = useState<string | null>(null);
+
+  if (providers.length === 0) {
+    return null;
+  }
+
+  function signIn(provider: SocialProvider) {
+    setError(null);
+    setChosen(provider);
+    startTransition(async () => {
+      // Redirects to the provider; the user comes back to the dashboard
+      const result = await authClient.signIn.social({
+        provider,
+        callbackURL: "/dashboard",
+        errorCallbackURL: "/sign-in",
+      });
+
+      if (result.error) {
+        setError(getAuthErrorMessage(result.error));
+      }
+    });
+  }
+
+  return (
+    <>
+      <Field data-invalid={Boolean(error)}>
+        {providers.map((provider) => (
+          <Button
+            key={provider}
+            type="button"
+            variant="outline"
+            disabled={isPending}
+            onClick={() => signIn(provider)}
+          >
+            {isPending && chosen === provider ? (
+              <>
+                <Spinner data-icon="inline-start" />
+                Redirecting
+              </>
+            ) : (
+              `Continue with ${PROVIDER_LABELS[provider]}`
+            )}
+          </Button>
+        ))}
+        {error ? <FieldError>{error}</FieldError> : null}
+      </Field>
+      <FieldSeparator className="*:data-[slot=field-separator-content]:bg-card">
+        Or continue with email
+      </FieldSeparator>
+    </>
+  );
+}

package/templates/modules/auth/tanstack/src/lib/auth-functions.ts

@@ -1,7 +1,7 @@
 import { createServerFn } from "@tanstack/react-start";
 import { getRequestHeaders } from "@tanstack/react-start/server";
 
-import { auth } from "./auth";
+import { auth, socialProviders } from "./auth";
 
 export const getSession = createServerFn({ method: "GET" }).handler(async () => {
   const session = await auth.api.getSession({
@@ -10,3 +10,9 @@ export const getSession = createServerFn({ method: "GET" }).handler(async () =>
 
   return session;
 });
+
+// GitHub and Google, when their keys are set; read on the server, where the
+// environment variables are
+export const getSocialProviders = createServerFn({ method: "GET" }).handler(
+  () => socialProviders
+);

package/templates/modules/auth/tanstack/src/lib/auth-schema.ts

@@ -1,8 +1,13 @@
 import { z } from "zod";
 
+const emailSchema = z.email("Enter a valid email address.");
+const passwordSchema = z
+  .string()
+  .min(8, "Password must be at least 8 characters.");
+
 export const signInSchema = z.object({
-  email: z.email("Enter a valid email address."),
-  password: z.string().min(8, "Password must be at least 8 characters."),
+  email: emailSchema,
+  password: passwordSchema,
 });
 
 export const signUpSchema = signInSchema.extend({
@@ -13,8 +18,28 @@ export const signUpSchema = signInSchema.extend({
     .max(50, "Name must be 50 characters or fewer."),
 });
 
+export const forgotPasswordSchema = z.object({ email: emailSchema });
+
+export const resetPasswordSchema = z
+  .object({ password: passwordSchema, confirmPassword: z.string() })
+  .refine((values) => values.password === values.confirmPassword, {
+    message: "Passwords do not match.",
+    path: ["confirmPassword"],
+  });
+
+export const changePasswordSchema = z.object({
+  currentPassword: z.string().min(1, "Enter your current password."),
+  newPassword: passwordSchema,
+});
+
 export type SignInValues = z.infer<typeof signInSchema>;
 export type SignUpValues = z.infer<typeof signUpSchema>;
+export type ForgotPasswordValues = z.infer<typeof forgotPasswordSchema>;
+export type ResetPasswordValues = z.infer<typeof resetPasswordSchema>;
+export type ChangePasswordValues = z.infer<typeof changePasswordSchema>;
+
+// Sign-in providers the auth server can turn on (see auth.ts)
+export type SocialProvider = "github" | "google";
 
 export function getAuthErrorMessage(error: unknown) {
   if (!error) {

package/templates/modules/auth/tanstack/src/lib/auth.ts.hbs

@@ -1,6 +1,9 @@
 import "dotenv/config";
 import { betterAuth } from "better-auth";
 import { tanstackStartCookies } from "better-auth/tanstack-start";
+
+import type { SocialProvider } from "./auth-schema";
+import { sendEmail } from "./email";
 {{#if (eq database 'prisma')}}
 import { prismaAdapter } from "better-auth/adapters/prisma";
 import client from "./prisma";
@@ -17,6 +20,14 @@ const client = new MongoClient(process.env.MONGODB_URI!);
 const db = client.db();
 {{/if}}
 
+// Reports a failed email instead of failing the request: the sign-up or reset
+// already happened, and the user can ask for the email again
+function deliver(email: Parameters<typeof sendEmail>[0]): void {
+  sendEmail(email).catch((error: unknown) => {
+    console.error(`Could not send "${email.subject}" to ${email.to}:`, error);
+  });
+}
+
 export const auth = betterAuth({
   {{#if (eq database 'prisma')}}
   database: prismaAdapter(client, { provider: "postgresql" }),
@@ -31,8 +42,57 @@ export const auth = betterAuth({
   {{/if}}
   emailAndPassword: {
     enabled: true,
+    // Set to true to block sign-in until the email address is verified
+    requireEmailVerification: false,
+    // A reset signs the user out everywhere
+    revokeSessionsOnPasswordReset: true,
+    sendResetPassword: async ({ user, url }) => {
+      deliver({
+        to: user.email,
+        subject: "Reset your password",
+        text: `Open this link to choose a new password:
+${url}`,
+      });
+    },
+  },
+  emailVerification: {
+    sendOnSignUp: true,
+    autoSignInAfterVerification: true,
+    sendVerificationEmail: async ({ user, url }) => {
+      deliver({
+        to: user.email,
+        subject: "Verify your email address",
+        text: `Open this link to verify your email address:
+${url}`,
+      });
+    },
+  },
+  // Each provider is turned on once its client ID and secret are set
+  socialProviders: {
+    ...(process.env.GITHUB_CLIENT_ID && process.env.GITHUB_CLIENT_SECRET
+      ? {
+          github: {
+            clientId: process.env.GITHUB_CLIENT_ID,
+            clientSecret: process.env.GITHUB_CLIENT_SECRET,
+          },
+        }
+      : {}),
+    ...(process.env.GOOGLE_CLIENT_ID && process.env.GOOGLE_CLIENT_SECRET
+      ? {
+          google: {
+            clientId: process.env.GOOGLE_CLIENT_ID,
+            clientSecret: process.env.GOOGLE_CLIENT_SECRET,
+          },
+        }
+      : {}),
   },
   plugins: [tanstackStartCookies()],
   secret: process.env.BETTER_AUTH_SECRET,
   baseURL: process.env.BETTER_AUTH_URL,
-});
+});
+
+// The providers turned on above; the sign-in and sign-up pages show a button
+// for each
+export const socialProviders = Object.keys(
+  auth.options.socialProviders
+) as SocialProvider[];

package/templates/modules/auth/tanstack/src/lib/email.ts

@@ -0,0 +1,43 @@
+// Sends through Resend when RESEND_API_KEY is set. Without it the email is
+// printed to the server log, so verification and reset links can be copied
+// from the terminal during development
+export async function sendEmail({
+  to,
+  subject,
+  text,
+}: {
+  to: string;
+  subject: string;
+  text: string;
+}): Promise<void> {
+  const apiKey = process.env.RESEND_API_KEY;
+
+  if (!apiKey) {
+    console.log(`
+--- Email to ${to}: ${subject}
+${text}
+---
+`);
+    return;
+  }
+
+  const response = await fetch("https://api.resend.com/emails", {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${apiKey}`,
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      from: process.env.EMAIL_FROM || "onboarding@resend.dev",
+      to,
+      subject,
+      text,
+    }),
+  });
+
+  if (!response.ok) {
+    throw new Error(
+      `Resend rejected the email (${response.status}): ${await response.text()}`
+    );
+  }
+}

package/templates/modules/auth/tanstack/src/routeTree.gen.ts

@@ -11,6 +11,8 @@
 import { Route as rootRouteImport } from './routes/__root'
 import { Route as IndexRouteImport } from './routes/index'
 import { Route as DashboardRouteImport } from './routes/dashboard'
+import { Route as ForgotPasswordRouteImport } from './routes/forgot-password'
+import { Route as ResetPasswordRouteImport } from './routes/reset-password'
 import { Route as SignInRouteImport } from './routes/sign-in'
 import { Route as SignUpRouteImport } from './routes/sign-up'
 import { Route as ApiAuthSplatRouteImport } from './routes/api/auth/$'
@@ -25,6 +27,16 @@ const DashboardRoute = DashboardRouteImport.update({
   path: '/dashboard',
   getParentRoute: () => rootRouteImport,
 } as any)
+const ForgotPasswordRoute = ForgotPasswordRouteImport.update({
+  id: '/forgot-password',
+  path: '/forgot-password',
+  getParentRoute: () => rootRouteImport,
+} as any)
+const ResetPasswordRoute = ResetPasswordRouteImport.update({
+  id: '/reset-password',
+  path: '/reset-password',
+  getParentRoute: () => rootRouteImport,
+} as any)
 const SignInRoute = SignInRouteImport.update({
   id: '/sign-in',
   path: '/sign-in',
@@ -44,6 +56,8 @@ const ApiAuthSplatRoute = ApiAuthSplatRouteImport.update({
 export interface FileRoutesByFullPath {
   '/': typeof IndexRoute
   '/dashboard': typeof DashboardRoute
+  '/forgot-password': typeof ForgotPasswordRoute
+  '/reset-password': typeof ResetPasswordRoute
   '/sign-in': typeof SignInRoute
   '/sign-up': typeof SignUpRoute
   '/api/auth/$': typeof ApiAuthSplatRoute
@@ -51,6 +65,8 @@ export interface FileRoutesByFullPath {
 export interface FileRoutesByTo {
   '/': typeof IndexRoute
   '/dashboard': typeof DashboardRoute
+  '/forgot-password': typeof ForgotPasswordRoute
+  '/reset-password': typeof ResetPasswordRoute
   '/sign-in': typeof SignInRoute
   '/sign-up': typeof SignUpRoute
   '/api/auth/$': typeof ApiAuthSplatRoute
@@ -59,21 +75,47 @@ export interface FileRoutesById {
   __root__: typeof rootRouteImport
   '/': typeof IndexRoute
   '/dashboard': typeof DashboardRoute
+  '/forgot-password': typeof ForgotPasswordRoute
+  '/reset-password': typeof ResetPasswordRoute
   '/sign-in': typeof SignInRoute
   '/sign-up': typeof SignUpRoute
   '/api/auth/$': typeof ApiAuthSplatRoute
 }
 export interface FileRouteTypes {
   fileRoutesByFullPath: FileRoutesByFullPath
-  fullPaths: '/' | '/dashboard' | '/sign-in' | '/sign-up' | '/api/auth/$'
+  fullPaths:
+    | '/'
+    | '/dashboard'
+    | '/forgot-password'
+    | '/reset-password'
+    | '/sign-in'
+    | '/sign-up'
+    | '/api/auth/$'
   fileRoutesByTo: FileRoutesByTo
-  to: '/' | '/dashboard' | '/sign-in' | '/sign-up' | '/api/auth/$'
-  id: '__root__' | '/' | '/dashboard' | '/sign-in' | '/sign-up' | '/api/auth/$'
+  to:
+    | '/'
+    | '/dashboard'
+    | '/forgot-password'
+    | '/reset-password'
+    | '/sign-in'
+    | '/sign-up'
+    | '/api/auth/$'
+  id:
+    | '__root__'
+    | '/'
+    | '/dashboard'
+    | '/forgot-password'
+    | '/reset-password'
+    | '/sign-in'
+    | '/sign-up'
+    | '/api/auth/$'
   fileRoutesById: FileRoutesById
 }
 export interface RootRouteChildren {
   IndexRoute: typeof IndexRoute
   DashboardRoute: typeof DashboardRoute
+  ForgotPasswordRoute: typeof ForgotPasswordRoute
+  ResetPasswordRoute: typeof ResetPasswordRoute
   SignInRoute: typeof SignInRoute
   SignUpRoute: typeof SignUpRoute
   ApiAuthSplatRoute: typeof ApiAuthSplatRoute
@@ -95,6 +137,20 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof DashboardRouteImport
       parentRoute: typeof rootRouteImport
     }
+    '/forgot-password': {
+      id: '/forgot-password'
+      path: '/forgot-password'
+      fullPath: '/forgot-password'
+      preLoaderRoute: typeof ForgotPasswordRouteImport
+      parentRoute: typeof rootRouteImport
+    }
+    '/reset-password': {
+      id: '/reset-password'
+      path: '/reset-password'
+      fullPath: '/reset-password'
+      preLoaderRoute: typeof ResetPasswordRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/sign-in': {
       id: '/sign-in'
       path: '/sign-in'
@@ -122,6 +178,8 @@ declare module '@tanstack/react-router' {
 const rootRouteChildren: RootRouteChildren = {
   IndexRoute: IndexRoute,
   DashboardRoute: DashboardRoute,
+  ForgotPasswordRoute: ForgotPasswordRoute,
+  ResetPasswordRoute: ResetPasswordRoute,
   SignInRoute: SignInRoute,
   SignUpRoute: SignUpRoute,
   ApiAuthSplatRoute: ApiAuthSplatRoute,

package/templates/modules/auth/tanstack/src/routes/dashboard.tsx

@@ -1,18 +1,20 @@
-import { createFileRoute, redirect } from "@tanstack/react-router";
-import { Link } from "@tanstack/react-router";
+import { createFileRoute, Link, redirect } from "@tanstack/react-router";
 import { ArrowRight, ShieldCheck } from "lucide-react";
 
+import { ChangePasswordForm } from "~/components/auth/change-password-form";
+import { EmailVerificationCard } from "~/components/auth/email-verification-card";
 import { SignOutButton } from "~/components/auth/sign-out-button";
-import { buttonVariants } from "~/components/ui/button";
+import { Badge } from "~/components/ui/badge";
+import { Button } from "~/components/ui/button";
 import {
   Card,
   CardContent,
   CardDescription,
+  CardFooter,
   CardHeader,
   CardTitle,
 } from "~/components/ui/card";
 import { getSession } from "~/lib/auth-functions";
-import { cn } from "~/lib/utils";
 
 export const Route = createFileRoute("/dashboard")({
   beforeLoad: async () => {
@@ -31,40 +33,45 @@ function Dashboard() {
   const user = Route.useRouteContext({ select: (ctx) => ctx.user });
 
   return (
-    <main className="min-h-screen bg-[linear-gradient(180deg,_#f8fafc_0%,_#eef2ff_100%)] px-6 py-16 sm:px-10">
-      <div className="mx-auto max-w-5xl space-y-8">
-        <header className="flex flex-col gap-6 rounded-[2rem] border border-white/70 bg-white/85 p-8 shadow-xl shadow-slate-200/60 backdrop-blur md:flex-row md:items-end md:justify-between">
-          <div className="space-y-3">
-            <span className="inline-flex items-center gap-2 rounded-full bg-emerald-50 px-3 py-1 text-xs font-medium uppercase tracking-[0.24em] text-emerald-700">
-              <ShieldCheck className="size-4" />
+    <main className="min-h-svh bg-muted px-6 py-16 sm:px-10">
+      <div className="mx-auto flex max-w-5xl flex-col gap-8">
+        <header className="flex flex-col gap-6 md:flex-row md:items-end md:justify-between">
+          <div className="flex flex-col gap-3">
+            <Badge variant="secondary">
+              <ShieldCheck data-icon="inline-start" />
               Authenticated session
-            </span>
-            <div className="space-y-1">
-              <h1 className="text-3xl font-semibold tracking-tight text-slate-950">
+            </Badge>
+            <div className="flex flex-col gap-1">
+              <h1 className="text-3xl font-semibold tracking-tight">
                 Welcome {user.name}
               </h1>
-              <p className="text-sm text-slate-600">{user.email}</p>
+              <p className="text-sm text-muted-foreground">{user.email}</p>
             </div>
           </div>
           <SignOutButton />
         </header>
 
         <section className="grid gap-5 md:grid-cols-2">
+          <EmailVerificationCard
+            email={user.email}
+            emailVerified={user.emailVerified}
+          />
+          <ChangePasswordForm />
           <Card>
             <CardHeader>
               <CardTitle>Protected route example</CardTitle>
               <CardDescription>
-                This page verifies the session on the server before rendering any
-                content.
+                This page verifies the session on the server before rendering
+                any content.
               </CardDescription>
             </CardHeader>
-            <CardContent className="space-y-4 text-sm text-slate-600">
+            <CardContent className="flex flex-col gap-4 text-muted-foreground">
               <p>
                 The route guard calls{" "}
-                <code className="font-mono text-slate-900">getSession()</code> in
-                <code className="font-mono text-slate-900"> beforeLoad</code>,
+                <code className="font-mono text-foreground">getSession()</code>{" "}
+                in <code className="font-mono text-foreground">beforeLoad</code>,
                 which reads the cookie headers server-side via{" "}
-                <code className="font-mono text-slate-900">
+                <code className="font-mono text-foreground">
                   auth.api.getSession
                 </code>{" "}
                 on every render and navigation.
@@ -84,28 +91,29 @@ function Dashboard() {
                 product.
               </CardDescription>
             </CardHeader>
-            <CardContent className="space-y-3 text-sm text-slate-600">
+            <CardContent className="flex flex-col gap-3 text-muted-foreground">
               <p>
                 Replace the demo dashboard with your first authenticated page.
               </p>
               <p>Extend the schema with profile or onboarding fields.</p>
               <p>
-                Add provider-based auth or email verification later if needed.
+                Add a GitHub or Google client ID and secret to .env to turn on
+                social sign-in, and RESEND_API_KEY to send real emails.
               </p>
-              <Link
-                to="/"
-                className={cn(
-                  buttonVariants({ variant: "outline" }),
-                  "w-fit gap-2"
-                )}
+            </CardContent>
+            <CardFooter>
+              <Button
+                variant="outline"
+                nativeButton={false}
+                render={<Link to="/" />}
               >
                 Back to home
-                <ArrowRight className="size-4" />
-              </Link>
-            </CardContent>
+                <ArrowRight data-icon="inline-end" />
+              </Button>
+            </CardFooter>
           </Card>
         </section>
       </div>
     </main>
   );
-}
+}

package/templates/modules/auth/tanstack/src/routes/forgot-password.tsx

@@ -0,0 +1,17 @@
+import { createFileRoute } from "@tanstack/react-router";
+
+import { ForgotPasswordForm } from "~/components/auth/forgot-password-form";
+
+export const Route = createFileRoute("/forgot-password")({
+  component: ForgotPasswordPage,
+});
+
+function ForgotPasswordPage() {
+  return (
+    <main className="flex min-h-svh items-center justify-center bg-muted p-6 md:p-10">
+      <div className="w-full max-w-md">
+        <ForgotPasswordForm />
+      </div>
+    </main>
+  );
+}