@flaredev/cli 0.2.0 → 0.4.0

package/templates/app/components/auth/otp-input.tsx

@@ -0,0 +1,95 @@
+"use client";
+
+import { useId, useRef, useState } from "react";
+import { cn } from "@/lib/utils";
+
+interface Props {
+  value: string;
+  onChange: (value: string) => void;
+  /** Called once the last character is typed or pasted, so nobody taps "Continue". */
+  onComplete?: (value: string) => void;
+  length?: number;
+  label?: string;
+  autoFocus?: boolean;
+  disabled?: boolean;
+  /** Backup codes are letters and digits; emailed codes are digits. */
+  mode?: "numeric" | "alphanumeric";
+  id?: string;
+}
+
+/**
+ * A code box that is really one input with the cells drawn behind it.
+ *
+ * The obvious build — one input per digit — breaks paste, iOS and Android code
+ * autofill, backspace across cells and screen readers, all of which a single input
+ * gets for free from `autocomplete="one-time-code"`.
+ */
+export function OtpInput({ value, onChange, onComplete, length = 6, label = "Verification code", autoFocus, disabled, mode = "numeric", id }: Props) {
+  const generatedId = useId();
+  const fieldId = id ?? generatedId;
+  const input = useRef<HTMLInputElement>(null);
+  const [focused, setFocused] = useState(false);
+
+  const clean = (raw: string) => (mode === "numeric" ? raw.replace(/\D/g, "") : raw.replace(/[^a-zA-Z0-9]/g, "").toUpperCase()).slice(0, length);
+
+  const handle = (raw: string) => {
+    const next = clean(raw);
+    onChange(next);
+    if (next.length === length) onComplete?.(next);
+  };
+
+  const characters = [...value];
+  // The cursor sits on the first empty cell, or the last one when it's full.
+  const cursor = Math.min(value.length, length - 1);
+
+  return (
+    <div className="flex flex-col gap-2">
+      <label htmlFor={fieldId} className="sr-only">
+        {label}
+      </label>
+      <div className="relative" onClick={() => input.current?.focus()}>
+        <input
+          ref={input}
+          id={fieldId}
+          value={value}
+          onChange={(event) => handle(event.target.value)}
+          onFocus={() => setFocused(true)}
+          onBlur={() => setFocused(false)}
+          onPaste={(event) => {
+            event.preventDefault();
+            handle(event.clipboardData.getData("text"));
+          }}
+          inputMode={mode === "numeric" ? "numeric" : "text"}
+          autoComplete="one-time-code"
+          autoCorrect="off"
+          spellCheck={false}
+          maxLength={length}
+          disabled={disabled}
+          autoFocus={autoFocus}
+          aria-label={label}
+          // Invisible but really there, so autofill, paste and the caret all work.
+          // The right padding keeps a password manager's icon off the last cell.
+          className="absolute inset-0 h-full w-full cursor-text pr-10 text-transparent caret-transparent opacity-0 outline-none"
+        />
+        <div className="flex gap-2" aria-hidden="true">
+          {Array.from({ length }, (_, index) => {
+            const active = focused && index === cursor;
+            return (
+              <div
+                key={index}
+                className={cn(
+                  "relative grid h-13 flex-1 place-items-center rounded-[calc(var(--radius)-2px)] border border-border bg-surface text-lg font-medium tabular-nums transition-[border-color,box-shadow]",
+                  active && "border-brand ring-[3px] ring-brand/20",
+                  disabled && "opacity-60",
+                )}
+              >
+                {characters[index] ?? ""}
+                {active && !characters[index] && <span className="absolute h-5 w-px animate-pulse bg-foreground" />}
+              </div>
+            );
+          })}
+        </div>
+      </div>
+    </div>
+  );
+}

package/templates/app/components/auth/password-field.tsx

@@ -0,0 +1,116 @@
+"use client";
+
+import { useId, useMemo, useState } from "react";
+import { CheckIcon, EyeIcon, EyeOffIcon } from "lucide-react";
+import { checkPassword, PASSWORD_MAX_LENGTH, PASSWORD_MIN_LENGTH } from "@/lib/password-rules";
+import { cn } from "@/lib/utils";
+import { AuthInput, AuthLabel } from "./ui";
+
+interface Props {
+  value: string;
+  onChange: (value: string) => void;
+  label?: string;
+  id?: string;
+  name?: string;
+  autoComplete?: "new-password" | "current-password";
+  autoFocus?: boolean;
+  required?: boolean;
+  placeholder?: string;
+  /** Show the rules and strength as they type. Off for "your current password". */
+  showRules?: boolean;
+  /** Their name and email: a password shouldn't contain either. */
+  avoid?: (string | null | undefined)[];
+}
+
+const BAR_COLOURS = ["bg-danger", "bg-danger", "bg-warning", "bg-success/70", "bg-success"];
+
+/**
+ * A password input that says what it wants before you get it wrong: the rules and a
+ * strength reading update as you type, and the eye shows what you've typed.
+ *
+ * Only the length is enforced; everything else reads as advice (see lib/password-rules.ts).
+ */
+export function PasswordField({
+  value,
+  onChange,
+  label = "Password",
+  id,
+  name = "password",
+  autoComplete = "new-password",
+  autoFocus,
+  required = true,
+  placeholder,
+  showRules = autoComplete === "new-password",
+  avoid = [],
+}: Props) {
+  const generatedId = useId();
+  const fieldId = id ?? generatedId;
+  const hintId = `${fieldId}-hint`;
+  const [visible, setVisible] = useState(false);
+  const check = useMemo(() => checkPassword(value, avoid), [value, avoid.join("\u0000")]);
+  const started = value.length > 0;
+
+  return (
+    <div className="flex flex-col gap-2">
+      <AuthLabel htmlFor={fieldId}>{label}</AuthLabel>
+      <div className="relative">
+        <AuthInput
+          id={fieldId}
+          name={name}
+          type={visible ? "text" : "password"}
+          autoComplete={autoComplete}
+          autoFocus={autoFocus}
+          required={required}
+          placeholder={placeholder}
+          value={value}
+          onChange={(event) => onChange(event.target.value)}
+          minLength={autoComplete === "new-password" ? PASSWORD_MIN_LENGTH : undefined}
+          maxLength={PASSWORD_MAX_LENGTH}
+          aria-describedby={showRules ? hintId : undefined}
+          // A styling hook, so the field can go green without any state plumbing.
+          data-has-passed-validation={showRules && check.valid ? "" : undefined}
+          className={cn("pr-11", showRules && check.valid && "border-success/60")}
+        />
+        <button
+          type="button"
+          onClick={() => setVisible(!visible)}
+          aria-pressed={visible}
+          aria-controls={fieldId}
+          aria-label={visible ? "Hide password" : "Show password"}
+          title={visible ? "Hide password" : "Show password"}
+          className="absolute inset-y-0 right-0 grid w-11 place-items-center text-foreground-muted hover:text-foreground focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-brand"
+        >
+          {visible ? <EyeOffIcon className="size-4.5" /> : <EyeIcon className="size-4.5" />}
+        </button>
+      </div>
+
+      {showRules && (
+        <div id={hintId} className="flex flex-col gap-2">
+          <div className="flex items-center gap-2">
+            <div className="flex h-1 flex-1 gap-1" aria-hidden="true">
+              {[0, 1, 2, 3].map((step) => (
+                <span key={step} className={cn("h-full flex-1 rounded-full transition-colors", started && check.score > step ? BAR_COLOURS[check.score] : "bg-border")} />
+              ))}
+            </div>
+            <span className={cn("text-xs tabular-nums", started ? "text-foreground-muted" : "text-transparent")}>{check.label}</span>
+          </div>
+
+          {/* Announced politely: it changes on every keystroke, so it mustn't interrupt. */}
+          <ul className="flex flex-col gap-1" aria-live="polite">
+            {check.rules.map((rule) => (
+              <li key={rule.id} className={cn("flex items-center gap-2 text-xs", rule.met ? "text-success" : "text-foreground-muted")}>
+                <span className={cn("grid size-3.5 shrink-0 place-items-center rounded-full border", rule.met ? "border-success bg-success/15" : "border-border")}>
+                  {rule.met && <CheckIcon className="size-2.5" />}
+                </span>
+                {rule.label}
+                {rule.required && !rule.met && <span className="text-foreground-muted">(required)</span>}
+              </li>
+            ))}
+          </ul>
+
+          {started && check.advice && <p className="text-xs text-foreground-muted">{check.advice}</p>}
+        </div>
+      )}
+    </div>
+  );
+}

package/templates/app/components/auth/password-forms.tsx

@@ -1,79 +1,76 @@
-"use client";
-
-import { useState } from "react";
-import { authClient } from "@/lib/auth-client";
-import { authErrorMessage } from "./sign-in-flow";
-import { AuthInput, AuthLabel, FormMessage, PrimaryButton } from "./ui";
-
-/** Asks for a reset link. Says the same thing whether or not the address has an account. */
-export function ForgotPasswordForm({ initialEmail }: { initialEmail: string }) {
-  const [email, setEmail] = useState(initialEmail);
-  const [pending, setPending] = useState(false);
-  const [sent, setSent] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-
-  const submit = async (event: React.FormEvent) => {
-    event.preventDefault();
-    setPending(true);
-    setError(null);
-    const { error } = await authClient.requestPasswordReset({ email, redirectTo: "/reset-password" });
-    setPending(false);
-    if (error) return setError(authErrorMessage(error));
-    setSent(true);
-  };
-
-  if (sent) {
-    return <FormMessage tone="success">If {email} has an account, a reset link is on its way. It expires in 1 hour.</FormMessage>;
-  }
-  return (
-    <form className="flex flex-col gap-4" onSubmit={submit}>
-      <div className="flex flex-col gap-2">
-        <AuthLabel htmlFor="email">Email</AuthLabel>
-        <AuthInput id="email" type="email" autoComplete="email" value={email} onChange={(event) => setEmail(event.target.value)} required autoFocus />
-      </div>
-      <FormMessage>{error}</FormMessage>
-      <PrimaryButton type="submit" pending={pending}>
-        Send reset link
-      </PrimaryButton>
-    </form>
-  );
-}
-
-/** Sets the new password from the emailed link's token. */
-export function ResetPasswordForm({ token }: { token: string }) {
-  const [password, setPassword] = useState("");
-  const [confirm, setConfirm] = useState("");
-  const [pending, setPending] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-
-  const submit = async (event: React.FormEvent) => {
-    event.preventDefault();
-    if (password.length < 8) return setError("Use at least 8 characters.");
-    if (password !== confirm) return setError("The two passwords don't match.");
-    setPending(true);
-    setError(null);
-    const { error } = await authClient.resetPassword({ newPassword: password, token });
-    setPending(false);
-    if (error) {
-      return setError(error.code === "INVALID_TOKEN" ? "This link has expired or was already used. Ask for a new one." : authErrorMessage(error));
-    }
-    window.location.href = "/sign-in?reset=1";
-  };
-
-  return (
-    <form className="flex flex-col gap-4" onSubmit={submit}>
-      <div className="flex flex-col gap-2">
-        <AuthLabel htmlFor="password">New password</AuthLabel>
-        <AuthInput id="password" type="password" autoComplete="new-password" value={password} onChange={(event) => setPassword(event.target.value)} required minLength={8} autoFocus />
-      </div>
-      <div className="flex flex-col gap-2">
-        <AuthLabel htmlFor="confirm">Confirm it</AuthLabel>
-        <AuthInput id="confirm" type="password" autoComplete="new-password" value={confirm} onChange={(event) => setConfirm(event.target.value)} required />
-      </div>
-      <FormMessage>{error}</FormMessage>
-      <PrimaryButton type="submit" pending={pending}>
-        Set new password
-      </PrimaryButton>
-    </form>
-  );
-}
+"use client";
+
+import { useState } from "react";
+import { authClient } from "@/lib/auth-client";
+import { checkPassword } from "@/lib/password-rules";
+import { PasswordField } from "./password-field";
+import { authErrorMessage } from "./sign-in-flow";
+import { AuthInput, AuthLabel, FormMessage, PrimaryButton } from "./ui";
+
+/** Asks for a reset link. Says the same thing whether or not the address has an account. */
+export function ForgotPasswordForm({ initialEmail }: { initialEmail: string }) {
+  const [email, setEmail] = useState(initialEmail);
+  const [pending, setPending] = useState(false);
+  const [sent, setSent] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const submit = async (event: React.FormEvent) => {
+    event.preventDefault();
+    setPending(true);
+    setError(null);
+    const { error } = await authClient.requestPasswordReset({ email, redirectTo: "/reset-password" });
+    setPending(false);
+    if (error) return setError(authErrorMessage(error));
+    setSent(true);
+  };
+
+  if (sent) {
+    return <FormMessage tone="success">If {email} has an account, a reset link is on its way. It expires in 1 hour.</FormMessage>;
+  }
+  return (
+    <form className="flex flex-col gap-4" onSubmit={submit}>
+      <div className="flex flex-col gap-2">
+        <AuthLabel htmlFor="email">Email</AuthLabel>
+        <AuthInput id="email" type="email" autoComplete="email" value={email} onChange={(event) => setEmail(event.target.value)} required autoFocus />
+      </div>
+      <FormMessage>{error}</FormMessage>
+      <PrimaryButton type="submit" pending={pending}>
+        Send reset link
+      </PrimaryButton>
+    </form>
+  );
+}
+
+/** Sets the new password from the emailed link's token. */
+export function ResetPasswordForm({ token }: { token: string }) {
+  const [password, setPassword] = useState("");
+  const [confirm, setConfirm] = useState("");
+  const [pending, setPending] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const submit = async (event: React.FormEvent) => {
+    event.preventDefault();
+    const check = checkPassword(password);
+    if (!check.valid) return setError(check.advice ?? "That password is too short.");
+    if (password !== confirm) return setError("The two passwords don't match.");
+    setPending(true);
+    setError(null);
+    const { error } = await authClient.resetPassword({ newPassword: password, token });
+    setPending(false);
+    if (error) {
+      return setError(error.code === "INVALID_TOKEN" ? "This link has expired or was already used. Ask for a new one." : authErrorMessage(error));
+    }
+    window.location.href = "/sign-in?reset=1";
+  };
+
+  return (
+    <form className="flex flex-col gap-4" onSubmit={submit}>
+      <PasswordField id="password" label="New password" value={password} onChange={setPassword} autoFocus />
+      <PasswordField id="confirm" label="Confirm it" name="confirm" value={confirm} onChange={setConfirm} showRules={false} />
+      <FormMessage>{error}</FormMessage>
+      <PrimaryButton type="submit" pending={pending}>
+        Set new password
+      </PrimaryButton>
+    </form>
+  );
+}