better-ts-stack 2.1.2 → 2.2.0

package/templates/modules/auth/tanstack/src/components/auth/change-password-form.tsx

@@ -0,0 +1,123 @@
+import { useState, useTransition } from "react";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { CircleAlert, CircleCheck } from "lucide-react";
+import { useForm } from "react-hook-form";
+
+import { authClient } from "~/lib/auth-client";
+import {
+  changePasswordSchema,
+  getAuthErrorMessage,
+  type ChangePasswordValues,
+} from "~/lib/auth-schema";
+import { Alert, AlertDescription } from "~/components/ui/alert";
+import { Button } from "~/components/ui/button";
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from "~/components/ui/card";
+import {
+  Field,
+  FieldError,
+  FieldGroup,
+  FieldLabel,
+} from "~/components/ui/field";
+import { Input } from "~/components/ui/input";
+import { Spinner } from "~/components/ui/spinner";
+
+export function ChangePasswordForm() {
+  const [isPending, startTransition] = useTransition();
+  const [message, setMessage] = useState<{
+    text: string;
+    isError: boolean;
+  } | null>(null);
+  const form = useForm<ChangePasswordValues>({
+    resolver: zodResolver(changePasswordSchema),
+    defaultValues: { currentPassword: "", newPassword: "" },
+  });
+
+  const onSubmit = form.handleSubmit((values) => {
+    setMessage(null);
+
+    startTransition(async () => {
+      // Other devices are signed out; this one stays signed in
+      const result = await authClient.changePassword({
+        currentPassword: values.currentPassword,
+        newPassword: values.newPassword,
+        revokeOtherSessions: true,
+      });
+
+      if (result.error) {
+        setMessage({ text: getAuthErrorMessage(result.error), isError: true });
+        return;
+      }
+
+      form.reset();
+      setMessage({ text: "Password changed.", isError: false });
+    });
+  });
+
+  return (
+    <Card>
+      <CardHeader>
+        <CardTitle>Change password</CardTitle>
+        <CardDescription>
+          Other devices are signed out after the change.
+        </CardDescription>
+      </CardHeader>
+      <CardContent>
+        <form onSubmit={onSubmit} noValidate>
+          <FieldGroup>
+            <Field
+              data-invalid={Boolean(form.formState.errors.currentPassword)}
+            >
+              <FieldLabel htmlFor="currentPassword">Current password</FieldLabel>
+              <Input
+                id="currentPassword"
+                type="password"
+                autoComplete="current-password"
+                aria-invalid={Boolean(form.formState.errors.currentPassword)}
+                {...form.register("currentPassword")}
+              />
+              <FieldError errors={[form.formState.errors.currentPassword]} />
+            </Field>
+
+            <Field data-invalid={Boolean(form.formState.errors.newPassword)}>
+              <FieldLabel htmlFor="newPassword">New password</FieldLabel>
+              <Input
+                id="newPassword"
+                type="password"
+                autoComplete="new-password"
+                aria-invalid={Boolean(form.formState.errors.newPassword)}
+                {...form.register("newPassword")}
+              />
+              <FieldError errors={[form.formState.errors.newPassword]} />
+            </Field>
+
+            {message ? (
+              <Alert variant={message.isError ? "destructive" : "default"}>
+                {message.isError ? <CircleAlert /> : <CircleCheck />}
+                <AlertDescription>{message.text}</AlertDescription>
+              </Alert>
+            ) : null}
+
+            <Field orientation="horizontal">
+              <Button type="submit" disabled={isPending}>
+                {isPending ? (
+                  <>
+                    <Spinner data-icon="inline-start" />
+                    Saving
+                  </>
+                ) : (
+                  "Change password"
+                )}
+              </Button>
+            </Field>
+          </FieldGroup>
+        </form>
+      </CardContent>
+    </Card>
+  );
+}

package/templates/modules/auth/tanstack/src/components/auth/email-verification-card.tsx

@@ -0,0 +1,89 @@
+import { useState, useTransition } from "react";
+import { BadgeCheck, MailWarning } from "lucide-react";
+
+import { authClient } from "~/lib/auth-client";
+import { getAuthErrorMessage } from "~/lib/auth-schema";
+import { Badge } from "~/components/ui/badge";
+import { Button } from "~/components/ui/button";
+import {
+  Card,
+  CardAction,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from "~/components/ui/card";
+import { Spinner } from "~/components/ui/spinner";
+
+// Shows whether the email address is verified, with a button to send the
+// verification email again
+export function EmailVerificationCard({
+  email,
+  emailVerified,
+}: {
+  email: string;
+  emailVerified: boolean;
+}) {
+  const [isPending, startTransition] = useTransition();
+  const [message, setMessage] = useState<string | null>(null);
+
+  function resend() {
+    setMessage(null);
+    startTransition(async () => {
+      const result = await authClient.sendVerificationEmail({
+        email,
+        callbackURL: "/dashboard",
+      });
+      setMessage(
+        result.error
+          ? getAuthErrorMessage(result.error)
+          : "Verification email sent. Without an email provider set up, the link is printed in the server terminal."
+      );
+    });
+  }
+
+  return (
+    <Card>
+      <CardHeader>
+        <CardTitle>
+          {emailVerified ? "Email verified" : "Verify your email"}
+        </CardTitle>
+        <CardDescription>
+          {emailVerified
+            ? `${email} is confirmed.`
+            : `We sent a link to ${email}. Open it to confirm the address.`}
+        </CardDescription>
+        <CardAction>
+          {emailVerified ? (
+            <Badge variant="secondary">
+              <BadgeCheck data-icon="inline-start" />
+              Verified
+            </Badge>
+          ) : (
+            <Badge variant="outline">
+              <MailWarning data-icon="inline-start" />
+              Pending
+            </Badge>
+          )}
+        </CardAction>
+      </CardHeader>
+      {emailVerified ? null : (
+        <CardContent className="flex flex-col items-start gap-3">
+          <Button variant="outline" onClick={resend} disabled={isPending}>
+            {isPending ? (
+              <>
+                <Spinner data-icon="inline-start" />
+                Sending
+              </>
+            ) : (
+              "Send the email again"
+            )}
+          </Button>
+          {message ? (
+            <p className="text-sm text-muted-foreground">{message}</p>
+          ) : null}
+        </CardContent>
+      )}
+    </Card>
+  );
+}

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

@@ -0,0 +1,131 @@
+import { Link } from "@tanstack/react-router";
+import { useState, useTransition } from "react";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { CircleAlert, MailCheck } from "lucide-react";
+import { useForm } from "react-hook-form";
+
+import { authClient } from "~/lib/auth-client";
+import {
+  forgotPasswordSchema,
+  getAuthErrorMessage,
+  type ForgotPasswordValues,
+} from "~/lib/auth-schema";
+import { Alert, AlertDescription, AlertTitle } from "~/components/ui/alert";
+import { Button } from "~/components/ui/button";
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from "~/components/ui/card";
+import {
+  Field,
+  FieldDescription,
+  FieldError,
+  FieldGroup,
+  FieldLabel,
+} from "~/components/ui/field";
+import { Input } from "~/components/ui/input";
+import { Spinner } from "~/components/ui/spinner";
+
+export function ForgotPasswordForm() {
+  const [isPending, startTransition] = useTransition();
+  const [authError, setAuthError] = useState<string | null>(null);
+  const [isSent, setIsSent] = useState(false);
+  const form = useForm<ForgotPasswordValues>({
+    resolver: zodResolver(forgotPasswordSchema),
+    defaultValues: { email: "" },
+  });
+
+  const onSubmit = form.handleSubmit((values) => {
+    setAuthError(null);
+
+    startTransition(async () => {
+      // The link in the email opens /reset-password with a one-time token
+      const result = await authClient.requestPasswordReset({
+        email: values.email,
+        redirectTo: "/reset-password",
+      });
+
+      if (result.error) {
+        setAuthError(getAuthErrorMessage(result.error));
+        return;
+      }
+
+      setIsSent(true);
+    });
+  });
+
+  return (
+    <Card>
+      <CardHeader>
+        <CardTitle>Forgot your password?</CardTitle>
+        <CardDescription>
+          Enter your email and we will send you a link to choose a new one.
+        </CardDescription>
+      </CardHeader>
+      <CardContent>
+        {isSent ? (
+          <FieldGroup>
+            <Alert>
+              <MailCheck />
+              <AlertTitle>Check your email</AlertTitle>
+              <AlertDescription>
+                If an account exists for that email, a reset link is on its
+                way. Without an email provider set up, the link is printed in
+                the server terminal.
+              </AlertDescription>
+            </Alert>
+            <FieldDescription className="text-center">
+              <Link to="/sign-in">Back to login</Link>
+            </FieldDescription>
+          </FieldGroup>
+        ) : (
+          <form onSubmit={onSubmit} noValidate>
+            <FieldGroup>
+              <Field data-invalid={Boolean(form.formState.errors.email)}>
+                <FieldLabel htmlFor="email">Email</FieldLabel>
+                <Input
+                  id="email"
+                  type="email"
+                  autoComplete="email"
+                  aria-invalid={Boolean(form.formState.errors.email)}
+                  placeholder="you@example.com"
+                  {...form.register("email")}
+                />
+                <FieldDescription>
+                  Use the email you registered with.
+                </FieldDescription>
+                <FieldError errors={[form.formState.errors.email]} />
+              </Field>
+
+              {authError ? (
+                <Alert variant="destructive">
+                  <CircleAlert />
+                  <AlertDescription>{authError}</AlertDescription>
+                </Alert>
+              ) : null}
+
+              <Field>
+                <Button type="submit" disabled={isPending}>
+                  {isPending ? (
+                    <>
+                      <Spinner data-icon="inline-start" />
+                      Sending link
+                    </>
+                  ) : (
+                    "Send reset link"
+                  )}
+                </Button>
+                <FieldDescription className="text-center">
+                  Remembered it? <Link to="/sign-in">Back to login</Link>
+                </FieldDescription>
+              </Field>
+            </FieldGroup>
+          </form>
+        )}
+      </CardContent>
+    </Card>
+  );
+}

package/templates/modules/auth/tanstack/src/components/auth/reset-password-form.tsx

@@ -0,0 +1,149 @@
+import { Link } from "@tanstack/react-router";
+import { useState, useTransition } from "react";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { CircleAlert } from "lucide-react";
+import { useForm } from "react-hook-form";
+
+import { authClient } from "~/lib/auth-client";
+import {
+  getAuthErrorMessage,
+  resetPasswordSchema,
+  type ResetPasswordValues,
+} 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";
+import {
+  Field,
+  FieldError,
+  FieldGroup,
+  FieldLabel,
+} from "~/components/ui/field";
+import { Input } from "~/components/ui/input";
+import { Spinner } from "~/components/ui/spinner";
+
+// token comes from the link in the reset email; null when the link was
+// invalid or has expired
+export function ResetPasswordForm({ token }: { token: string | null }) {
+  const [isPending, startTransition] = useTransition();
+  const [authError, setAuthError] = useState<string | null>(null);
+  const [isDone, setIsDone] = useState(false);
+  const form = useForm<ResetPasswordValues>({
+    resolver: zodResolver(resetPasswordSchema),
+    defaultValues: { password: "", confirmPassword: "" },
+  });
+
+  const onSubmit = form.handleSubmit((values) => {
+    if (!token) return;
+    setAuthError(null);
+
+    startTransition(async () => {
+      const result = await authClient.resetPassword({
+        newPassword: values.password,
+        token,
+      });
+
+      if (result.error) {
+        setAuthError(getAuthErrorMessage(result.error));
+        return;
+      }
+
+      setIsDone(true);
+    });
+  });
+
+  if (!token || isDone) {
+    return (
+      <Card>
+        <CardHeader>
+          <CardTitle>{isDone ? "Password changed" : "Link expired"}</CardTitle>
+          <CardDescription>
+            {isDone
+              ? "You were signed out on every device. Log in with your new password."
+              : "This reset link is invalid or has expired. Ask for a new one."}
+          </CardDescription>
+        </CardHeader>
+        <CardFooter>
+          <Button
+            className="w-full"
+            nativeButton={false}
+            render={<Link to={isDone ? "/sign-in" : "/forgot-password"} />}
+          >
+            {isDone ? "Go to login" : "Send a new link"}
+          </Button>
+        </CardFooter>
+      </Card>
+    );
+  }
+
+  return (
+    <Card>
+      <CardHeader>
+        <CardTitle>Choose a new password</CardTitle>
+        <CardDescription>
+          You will be signed out on every device after the change.
+        </CardDescription>
+      </CardHeader>
+      <CardContent>
+        <form onSubmit={onSubmit} noValidate>
+          <FieldGroup>
+            <Field data-invalid={Boolean(form.formState.errors.password)}>
+              <FieldLabel htmlFor="password">New password</FieldLabel>
+              <Input
+                id="password"
+                type="password"
+                autoComplete="new-password"
+                aria-invalid={Boolean(form.formState.errors.password)}
+                {...form.register("password")}
+              />
+              <FieldError errors={[form.formState.errors.password]} />
+            </Field>
+
+            <Field
+              data-invalid={Boolean(form.formState.errors.confirmPassword)}
+            >
+              <FieldLabel htmlFor="confirmPassword">
+                Confirm new password
+              </FieldLabel>
+              <Input
+                id="confirmPassword"
+                type="password"
+                autoComplete="new-password"
+                aria-invalid={Boolean(form.formState.errors.confirmPassword)}
+                {...form.register("confirmPassword")}
+              />
+              <FieldError errors={[form.formState.errors.confirmPassword]} />
+            </Field>
+
+            {authError ? (
+              <Alert variant="destructive">
+                <CircleAlert />
+                <AlertDescription>{authError}</AlertDescription>
+              </Alert>
+            ) : null}
+
+            <Field>
+              <Button type="submit" disabled={isPending}>
+                {isPending ? (
+                  <>
+                    <Spinner data-icon="inline-start" />
+                    Saving
+                  </>
+                ) : (
+                  "Save new password"
+                )}
+              </Button>
+            </Field>
+          </FieldGroup>
+        </form>
+      </CardContent>
+    </Card>
+  );
+}

package/templates/modules/auth/tanstack/src/components/auth/sign-in-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,
   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";
@@ -27,8 +28,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 navigate = useNavigate();
   const [isPending, startTransition] = useTransition();
   const [authError, setAuthError] = useState<string | null>(null);
@@ -59,16 +63,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
@@ -86,7 +92,15 @@ export function SignInForm() {
             </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"
+                  to="/forgot-password"
+                >
+                  Forgot password?
+                </Link>
+              </div>
               <Input
                 id="password"
                 type="password"
@@ -97,37 +111,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 to="/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"
-            to="/sign-up"
-          >
-            Signup
-          </Link>
-        </p>
-      </CardFooter>
     </Card>
   );
-}
+}

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

@@ -1,9 +1,10 @@
 import { useNavigate } from "@tanstack/react-router";
 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 navigate = useNavigate();
@@ -11,7 +12,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={() => {
@@ -31,17 +32,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>
   );
-}
+}