better-ts-stack 2.1.2 → 2.2.0

package/templates/modules/auth/nextjs/components/auth/sign-in-form.tsx

@@ -4,7 +4,7 @@ import Link from "next/link";
 import { useRouter } from "next/navigation";
 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";
@@ -12,13 +12,14 @@ import {
   getAuthErrorMessage,
   signInSchema,
   type SignInValues,
+  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";
@@ -30,8 +31,11 @@ import {
   FieldLabel,
 } from "@/components/ui/field";
 import { Input } from "@/components/ui/input";
+import { Spinner } from "@/components/ui/spinner";
 
-export function SignInForm() {
+import { SocialButtons } from "./social-buttons";
+
+export function SignInForm({ providers }: { providers: SocialProvider[] }) {
   const router = useRouter();
   const [isPending, startTransition] = useTransition();
   const [authError, setAuthError] = useState<string | null>(null);
@@ -63,16 +67,18 @@ export function SignInForm() {
   });
 
   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>Login to your account</CardTitle>
         <CardDescription>
           Sign in with your email and password to continue to your dashboard.
         </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.email)}>
               <FieldLabel htmlFor="email">Email</FieldLabel>
               <Input
@@ -83,12 +89,22 @@ export function SignInForm() {
                 placeholder="you@example.com"
                 {...form.register("email")}
               />
-              <FieldDescription>Use the email you registered with.</FieldDescription>
+              <FieldDescription>
+                Use the email you registered with.
+              </FieldDescription>
               <FieldError errors={[form.formState.errors.email]} />
             </Field>
 
             <Field data-invalid={Boolean(form.formState.errors.password)}>
-              <FieldLabel htmlFor="password">Password</FieldLabel>
+              <div className="flex items-center">
+                <FieldLabel htmlFor="password">Password</FieldLabel>
+                <Link
+                  className="ml-auto text-sm underline-offset-4 hover:underline"
+                  href="/forgot-password"
+                >
+                  Forgot password?
+                </Link>
+              </div>
               <Input
                 id="password"
                 type="password"
@@ -99,34 +115,32 @@ export function SignInForm() {
               />
               <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" />
-                Signing in
-              </>
-            ) : (
-              "Login"
-            )}
-          </Button>
+            <Field>
+              <Button type="submit" disabled={isPending}>
+                {isPending ? (
+                  <>
+                    <Spinner data-icon="inline-start" />
+                    Signing in
+                  </>
+                ) : (
+                  "Login"
+                )}
+              </Button>
+              <FieldDescription className="text-center">
+                Need an account? <Link href="/sign-up">Signup</Link>
+              </FieldDescription>
+            </Field>
+          </FieldGroup>
         </form>
       </CardContent>
-      <CardFooter className="justify-center">
-        <p className="text-sm text-slate-600">
-          Need an account?{" "}
-          <Link className="font-medium text-sky-700 hover:text-sky-800" href="/sign-up">
-            Signup
-          </Link>
-        </p>
-      </CardFooter>
     </Card>
   );
 }

package/templates/modules/auth/nextjs/components/auth/sign-out-button.tsx

@@ -2,10 +2,11 @@
 
 import { useRouter } from "next/navigation";
 import { useState, useTransition } from "react";
-import { LoaderCircle, LogOut } from "lucide-react";
+import { LogOut } from "lucide-react";
 
 import { authClient } from "@/lib/auth-client";
 import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/spinner";
 
 export function SignOutButton() {
   const router = useRouter();
@@ -13,7 +14,7 @@ export function SignOutButton() {
   const [error, setError] = useState<string | null>(null);
 
   return (
-    <div className="space-y-2">
+    <div className="flex flex-col items-start gap-2">
       <Button
         variant="outline"
         onClick={() => {
@@ -34,17 +35,17 @@ export function SignOutButton() {
       >
         {isPending ? (
           <>
-            <LoaderCircle className="mr-2 size-4 animate-spin" />
+            <Spinner data-icon="inline-start" />
             Signing out
           </>
         ) : (
           <>
-            <LogOut className="mr-2 size-4" />
+            <LogOut data-icon="inline-start" />
             Sign out
           </>
         )}
       </Button>
-      {error ? <p className="text-sm text-rose-600">{error}</p> : null}
+      {error ? <p className="text-sm text-destructive">{error}</p> : null}
     </div>
   );
 }

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

@@ -4,7 +4,7 @@ import Link from "next/link";
 import { useRouter } from "next/navigation";
 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";
@@ -12,13 +12,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";
@@ -30,8 +31,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 router = useRouter();
   const [isPending, startTransition] = useTransition();
   const [authError, setAuthError] = useState<string | null>(null);
@@ -52,6 +56,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) {
@@ -65,8 +71,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
@@ -74,8 +80,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
@@ -119,34 +127,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 href="/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" href="/sign-in">
-            Login
-          </Link>
-        </p>
-      </CardFooter>
     </Card>
   );
 }

package/templates/modules/auth/nextjs/components/auth/social-buttons.tsx

@@ -0,0 +1,73 @@
+"use client";
+
+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/nextjs/config.json

@@ -1,7 +1,7 @@
 {
   "id": "auth",
   "name": "Better Auth",
-  "description": "Better Auth for Next.js with optional Prisma or Drizzle adapter",
+  "description": "Better Auth with email verification, password reset, and GitHub and Google sign-in for Next.js with optional Prisma or Drizzle adapter",
   "type": "feature",
   "dependencies": {
     "@hookform/resolvers": "^5.9.2",
@@ -13,6 +13,12 @@
   "scripts": {},
   "envVars": {
     "BETTER_AUTH_SECRET": "please-change-me-to-a-random-string",
-    "BETTER_AUTH_URL": "http://localhost:3000"
+    "BETTER_AUTH_URL": "http://localhost:3000",
+    "GITHUB_CLIENT_ID": "",
+    "GITHUB_CLIENT_SECRET": "",
+    "GOOGLE_CLIENT_ID": "",
+    "GOOGLE_CLIENT_SECRET": "",
+    "RESEND_API_KEY": "",
+    "EMAIL_FROM": "onboarding@resend.dev"
   }
 }

package/templates/modules/auth/nextjs/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/nextjs/lib/auth.ts.hbs

@@ -1,5 +1,9 @@
+import { after } from "next/server";
 import { betterAuth } from "better-auth";
 import { nextCookies } from "better-auth/next-js";
+
+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";
@@ -16,6 +20,18 @@ const client = new MongoClient(process.env.MONGODB_URI!);
 const db = client.db();
 {{/if}}
 
+// Sends the email after the response, so the request does not wait for it.
+// after() keeps a serverless function (such as on Vercel) running until the
+// email is sent. A failed email is logged 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 {
+  after(() =>
+    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" }),
@@ -30,8 +46,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: [nextCookies()],
   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/nextjs/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/nextjs/lib/session.ts

@@ -0,0 +1,12 @@
+import { cache } from "react";
+
+import { headers } from "next/headers";
+
+import { auth } from "./auth";
+
+// The session of the current request, checked on the server. cache() runs the
+// lookup once per request, however many components ask for it, so each part of
+// a page can read the session inside its own <Suspense> boundary
+export const getSession = cache(async () =>
+  auth.api.getSession({ headers: await headers() })
+);

package/templates/modules/auth/tanstack/config.json

@@ -1,7 +1,7 @@
 {
   "id": "auth",
   "name": "Better Auth",
-  "description": "Better Auth for TanStack Start with optional Prisma, Drizzle, or MongoDB adapter",
+  "description": "Better Auth with email verification, password reset, and GitHub and Google sign-in for TanStack Start with optional Prisma, Drizzle, or MongoDB adapter",
   "type": "feature",
   "dependencies": {
     "@hookform/resolvers": "^5.9.2",
@@ -14,6 +14,12 @@
   "scripts": {},
   "envVars": {
     "BETTER_AUTH_SECRET": "please-change-me-to-a-random-string",
-    "BETTER_AUTH_URL": "http://localhost:3000"
+    "BETTER_AUTH_URL": "http://localhost:3000",
+    "GITHUB_CLIENT_ID": "",
+    "GITHUB_CLIENT_SECRET": "",
+    "GOOGLE_CLIENT_ID": "",
+    "GOOGLE_CLIENT_SECRET": "",
+    "RESEND_API_KEY": "",
+    "EMAIL_FROM": "onboarding@resend.dev"
   }
-}
+}