create-nextblock 0.12.9 → 0.12.11

package/templates/nextblock-template/app/(auth-pages)/two-factor/actions.ts

@@ -1,91 +1,91 @@
-'use server';
-
-import { headers } from 'next/headers';
-import { redirect } from 'next/navigation';
-import { createClient } from '@nextblock-cms/db/server';
-import {
-  createEmailChallenge,
-  issueTwoFactorVerifiedCookie,
-  verifyEmailChallenge,
-} from '../../../lib/auth/twoFactor';
-import { issueTrustedDevice } from '../../../lib/auth/trustedDevices';
-import {
-  REMEMBER_INTENT_COOKIE,
-  clearCookie,
-  getCookieValue,
-} from '../../../lib/auth/cookies';
-import { sendTwoFactorCodeEmail } from '../../actions/twoFactorEmail';
-
-function safeRedirect(path?: string): string {
-  return path && path.startsWith('/') && !path.startsWith('//') ? path : '/cms/dashboard';
-}
-
-/** If the user opted into "remember this device" at login, mint the trust now. */
-async function maybeIssueTrustedDevice(userId: string): Promise<void> {
-  const intent = await getCookieValue(REMEMBER_INTENT_COOKIE);
-  if (intent !== '1') return;
-  const userAgent = (await headers()).get('user-agent');
-  await issueTrustedDevice(userId, userAgent);
-  await clearCookie(REMEMBER_INTENT_COOKIE);
-}
-
-export async function verifyTotpChallenge(formData: FormData) {
-  const code = (formData.get('code')?.toString() ?? '').trim();
-  const redirectTo = safeRedirect(formData.get('redirect_to')?.toString());
-  const supabase = createClient();
-
-  const {
-    data: { user },
-  } = await supabase.auth.getUser();
-  if (!user) return { error: 'Your session expired. Please sign in again.' };
-  if (!/^\d{6}$/.test(code)) return { error: 'Enter the 6-digit code from your app.' };
-
-  const { data: factors } = await supabase.auth.mfa.listFactors();
-  const factor = factors?.totp?.find((f) => f.status === 'verified');
-  if (!factor) return { error: 'No authenticator is set up for this account.' };
-
-  const { data: challenge, error: challengeError } = await supabase.auth.mfa.challenge({
-    factorId: factor.id,
-  });
-  if (challengeError || !challenge) return { error: 'Could not start verification.' };
-
-  const { error: verifyError } = await supabase.auth.mfa.verify({
-    factorId: factor.id,
-    challengeId: challenge.id,
-    code,
-  });
-  if (verifyError) return { error: 'That code was not valid. Please try again.' };
-
-  await maybeIssueTrustedDevice(user.id);
-  redirect(redirectTo);
-}
-
-export async function verifyEmailCode(formData: FormData) {
-  const code = (formData.get('code')?.toString() ?? '').trim();
-  const redirectTo = safeRedirect(formData.get('redirect_to')?.toString());
-  const supabase = createClient();
-
-  const {
-    data: { user },
-  } = await supabase.auth.getUser();
-  if (!user) return { error: 'Your session expired. Please sign in again.' };
-
-  const ok = await verifyEmailChallenge(user.id, code);
-  if (!ok) return { error: 'That code was incorrect or expired. Request a new one.' };
-
-  await issueTwoFactorVerifiedCookie(user.id);
-  await maybeIssueTrustedDevice(user.id);
-  redirect(redirectTo);
-}
-
-export async function resendEmailCode() {
-  const supabase = createClient();
-  const {
-    data: { user },
-  } = await supabase.auth.getUser();
-  if (!user?.email) return { error: 'No email address is associated with your account.' };
-
-  const code = await createEmailChallenge(user.id);
-  await sendTwoFactorCodeEmail(user.email, code);
-  return { success: true, message: `A new code is on its way to ${user.email}.` };
-}
+'use server';
+
+import { headers } from 'next/headers';
+import { redirect } from 'next/navigation';
+import { createClient } from '@nextblock-cms/db/server';
+import {
+  createEmailChallenge,
+  issueTwoFactorVerifiedCookie,
+  verifyEmailChallenge,
+} from '../../../lib/auth/twoFactor';
+import { issueTrustedDevice } from '../../../lib/auth/trustedDevices';
+import {
+  REMEMBER_INTENT_COOKIE,
+  clearCookie,
+  getCookieValue,
+} from '../../../lib/auth/cookies';
+import { sendTwoFactorCodeEmail } from '../../actions/twoFactorEmail';
+
+function safeRedirect(path?: string): string {
+  return path && path.startsWith('/') && !path.startsWith('//') ? path : '/cms/dashboard';
+}
+
+/** If the user opted into "remember this device" at login, mint the trust now. */
+async function maybeIssueTrustedDevice(userId: string): Promise<void> {
+  const intent = await getCookieValue(REMEMBER_INTENT_COOKIE);
+  if (intent !== '1') return;
+  const userAgent = (await headers()).get('user-agent');
+  await issueTrustedDevice(userId, userAgent);
+  await clearCookie(REMEMBER_INTENT_COOKIE);
+}
+
+export async function verifyTotpChallenge(formData: FormData) {
+  const code = (formData.get('code')?.toString() ?? '').trim();
+  const redirectTo = safeRedirect(formData.get('redirect_to')?.toString());
+  const supabase = createClient();
+
+  const {
+    data: { user },
+  } = await supabase.auth.getUser();
+  if (!user) return { error: 'Your session expired. Please sign in again.' };
+  if (!/^\d{6}$/.test(code)) return { error: 'Enter the 6-digit code from your app.' };
+
+  const { data: factors } = await supabase.auth.mfa.listFactors();
+  const factor = factors?.totp?.find((f) => f.status === 'verified');
+  if (!factor) return { error: 'No authenticator is set up for this account.' };
+
+  const { data: challenge, error: challengeError } = await supabase.auth.mfa.challenge({
+    factorId: factor.id,
+  });
+  if (challengeError || !challenge) return { error: 'Could not start verification.' };
+
+  const { error: verifyError } = await supabase.auth.mfa.verify({
+    factorId: factor.id,
+    challengeId: challenge.id,
+    code,
+  });
+  if (verifyError) return { error: 'That code was not valid. Please try again.' };
+
+  await maybeIssueTrustedDevice(user.id);
+  redirect(redirectTo);
+}
+
+export async function verifyEmailCode(formData: FormData) {
+  const code = (formData.get('code')?.toString() ?? '').trim();
+  const redirectTo = safeRedirect(formData.get('redirect_to')?.toString());
+  const supabase = createClient();
+
+  const {
+    data: { user },
+  } = await supabase.auth.getUser();
+  if (!user) return { error: 'Your session expired. Please sign in again.' };
+
+  const ok = await verifyEmailChallenge(user.id, code);
+  if (!ok) return { error: 'That code was incorrect or expired. Request a new one.' };
+
+  await issueTwoFactorVerifiedCookie(user.id);
+  await maybeIssueTrustedDevice(user.id);
+  redirect(redirectTo);
+}
+
+export async function resendEmailCode() {
+  const supabase = createClient();
+  const {
+    data: { user },
+  } = await supabase.auth.getUser();
+  if (!user?.email) return { error: 'No email address is associated with your account.' };
+
+  const code = await createEmailChallenge(user.id);
+  await sendTwoFactorCodeEmail(user.email, code);
+  return { success: true, message: `A new code is on its way to ${user.email}.` };
+}

package/templates/nextblock-template/app/(auth-pages)/two-factor/components/TwoFactorForm.tsx

@@ -1,123 +1,123 @@
-'use client';
-
-import { useState, useTransition } from 'react';
-import { unstable_rethrow } from 'next/navigation';
-import { Alert, AlertDescription, Button, Input, Label, Spinner } from '@nextblock-cms/ui';
-import { resendEmailCode, verifyEmailCode, verifyTotpChallenge } from '../actions';
-
-interface TwoFactorFormProps {
-  type: 'totp' | 'email';
-  email: string;
-  redirectTo: string;
-  pendingEmailCode: boolean;
-}
-
-export default function TwoFactorForm({
-  type,
-  email,
-  redirectTo,
-  pendingEmailCode,
-}: TwoFactorFormProps) {
-  const [isPending, startTransition] = useTransition();
-  const [code, setCode] = useState('');
-  const [error, setError] = useState<string | null>(null);
-  const [info, setInfo] = useState<string | null>(
-    type === 'email' && pendingEmailCode ? `Enter the code we sent to ${email}.` : null,
-  );
-
-  const submit = () => {
-    setError(null);
-    const formData = new FormData();
-    formData.append('code', code);
-    formData.append('redirect_to', redirectTo);
-    startTransition(async () => {
-      try {
-        const action = type === 'totp' ? verifyTotpChallenge : verifyEmailCode;
-        const result = await action(formData);
-        // A successful action redirects server-side; only failures return here.
-        if (result?.error) setError(result.error);
-      } catch (err) {
-        // A successful verify ends in redirect(), which Next signals by throwing a
-        // NEXT_REDIRECT control-flow error. Let Next handle it (perform the navigation)
-        // instead of surfacing it as a red error flash; only real errors fall through.
-        unstable_rethrow(err);
-        setError(err instanceof Error ? err.message : 'Verification failed.');
-      }
-    });
-  };
-
-  const resend = () => {
-    setError(null);
-    setInfo(null);
-    startTransition(async () => {
-      try {
-        const result = await resendEmailCode();
-        if (result?.error) setError(result.error);
-        else if (result?.message) setInfo(result.message);
-      } catch (err) {
-        setError(err instanceof Error ? err.message : 'Could not send a code.');
-      }
-    });
-  };
-
-  return (
-    <div className="rounded-xl border bg-card p-6 shadow-sm">
-      <h1 className="text-xl font-semibold">Two-step verification</h1>
-      <p className="mt-1 text-sm text-muted-foreground">
-        {type === 'totp'
-          ? 'Enter the 6-digit code from your authenticator app to finish signing in.'
-          : `For your security, enter the 6-digit code sent to ${email || 'your email'}.`}
-      </p>
-
-      <form
-        className="mt-6 space-y-4"
-        onSubmit={(e) => {
-          e.preventDefault();
-          submit();
-        }}
-      >
-        <div className="space-y-2">
-          <Label htmlFor="code">Verification code</Label>
-          <Input
-            id="code"
-            inputMode="numeric"
-            autoComplete="one-time-code"
-            autoFocus
-            maxLength={6}
-            value={code}
-            onChange={(e) => setCode(e.target.value.replace(/\D/g, ''))}
-            placeholder="000000"
-            className="tracking-[0.5em] text-center text-lg"
-          />
-        </div>
-
-        {error && (
-          <Alert variant="destructive" className="py-2 px-4">
-            <AlertDescription>{error}</AlertDescription>
-          </Alert>
-        )}
-        {info && !error && (
-          <Alert variant="success" className="py-2 px-4">
-            <AlertDescription>{info}</AlertDescription>
-          </Alert>
-        )}
-
-        <Button type="submit" disabled={isPending || code.length !== 6} className="w-full">
-          {isPending ? <Spinner className="mr-2 h-4 w-4 animate-spin" /> : null}
-          Verify &amp; continue
-        </Button>
-      </form>
-
-      {type === 'email' && (
-        <button
-          type="button"
-          onClick={resend}
-          disabled={isPending}
-          className="mt-4 w-full text-center text-xs text-muted-foreground underline underline-offset-2 hover:text-foreground disabled:opacity-50"
-        >
-          {pendingEmailCode ? 'Resend code' : 'Send me a code'}
-        </button>
-      )}
-    </div>
-  );
-}
+'use client';
+
+import { useState, useTransition } from 'react';
+import { unstable_rethrow } from 'next/navigation';
+import { Alert, AlertDescription, Button, Input, Label, Spinner } from '@nextblock-cms/ui';
+import { resendEmailCode, verifyEmailCode, verifyTotpChallenge } from '../actions';
+
+interface TwoFactorFormProps {
+  type: 'totp' | 'email';
+  email: string;
+  redirectTo: string;
+  pendingEmailCode: boolean;
+}
+
+export default function TwoFactorForm({
+  type,
+  email,
+  redirectTo,
+  pendingEmailCode,
+}: TwoFactorFormProps) {
+  const [isPending, startTransition] = useTransition();
+  const [code, setCode] = useState('');
+  const [error, setError] = useState<string | null>(null);
+  const [info, setInfo] = useState<string | null>(
+    type === 'email' && pendingEmailCode ? `Enter the code we sent to ${email}.` : null,
+  );
+
+  const submit = () => {
+    setError(null);
+    const formData = new FormData();
+    formData.append('code', code);
+    formData.append('redirect_to', redirectTo);
+    startTransition(async () => {
+      try {
+        const action = type === 'totp' ? verifyTotpChallenge : verifyEmailCode;
+        const result = await action(formData);
+        // A successful action redirects server-side; only failures return here.
+        if (result?.error) setError(result.error);
+      } catch (err) {
+        // A successful verify ends in redirect(), which Next signals by throwing a
+        // NEXT_REDIRECT control-flow error. Let Next handle it (perform the navigation)
+        // instead of surfacing it as a red error flash; only real errors fall through.
+        unstable_rethrow(err);
+        setError(err instanceof Error ? err.message : 'Verification failed.');
+      }
+    });
+  };
+
+  const resend = () => {
+    setError(null);
+    setInfo(null);
+    startTransition(async () => {
+      try {
+        const result = await resendEmailCode();
+        if (result?.error) setError(result.error);
+        else if (result?.message) setInfo(result.message);
+      } catch (err) {
+        setError(err instanceof Error ? err.message : 'Could not send a code.');
+      }
+    });
+  };
+
+  return (
+    <div className="rounded-xl border bg-card p-6 shadow-sm">
+      <h1 className="text-xl font-semibold">Two-step verification</h1>
+      <p className="mt-1 text-sm text-muted-foreground">
+        {type === 'totp'
+          ? 'Enter the 6-digit code from your authenticator app to finish signing in.'
+          : `For your security, enter the 6-digit code sent to ${email || 'your email'}.`}
+      </p>
+
+      <form
+        className="mt-6 space-y-4"
+        onSubmit={(e) => {
+          e.preventDefault();
+          submit();
+        }}
+      >
+        <div className="space-y-2">
+          <Label htmlFor="code">Verification code</Label>
+          <Input
+            id="code"
+            inputMode="numeric"
+            autoComplete="one-time-code"
+            autoFocus
+            maxLength={6}
+            value={code}
+            onChange={(e) => setCode(e.target.value.replace(/\D/g, ''))}
+            placeholder="000000"
+            className="tracking-[0.5em] text-center text-lg"
+          />
+        </div>
+
+        {error && (
+          <Alert variant="destructive" className="py-2 px-4">
+            <AlertDescription>{error}</AlertDescription>
+          </Alert>
+        )}
+        {info && !error && (
+          <Alert variant="success" className="py-2 px-4">
+            <AlertDescription>{info}</AlertDescription>
+          </Alert>
+        )}
+
+        <Button type="submit" disabled={isPending || code.length !== 6} className="w-full">
+          {isPending ? <Spinner className="mr-2 h-4 w-4 animate-spin" /> : null}
+          Verify &amp; continue
+        </Button>
+      </form>
+
+      {type === 'email' && (
+        <button
+          type="button"
+          onClick={resend}
+          disabled={isPending}
+          className="mt-4 w-full text-center text-xs text-muted-foreground underline underline-offset-2 hover:text-foreground disabled:opacity-50"
+        >
+          {pendingEmailCode ? 'Resend code' : 'Send me a code'}
+        </button>
+      )}
+    </div>
+  );
+}

package/templates/nextblock-template/app/(auth-pages)/two-factor/page.tsx

@@ -1,51 +1,51 @@
-import { redirect } from 'next/navigation';
-import { createClient } from '@nextblock-cms/db/server';
-import {
-  evaluateTwoFactor,
-  hasPendingEmailChallenge,
-} from '../../../lib/auth/twoFactor';
-import TwoFactorForm from './components/TwoFactorForm';
-
-function safeRedirect(path?: string): string {
-  return path && path.startsWith('/') && !path.startsWith('//') ? path : '/cms/dashboard';
-}
-
-export default async function TwoFactorPage({
-  searchParams,
-}: {
-  searchParams: Promise<{ redirect_to?: string }>;
-}) {
-  const params = await searchParams;
-  const redirectTo = safeRedirect(params.redirect_to);
-
-  const evaluation = await evaluateTwoFactor();
-  const userId = evaluation.userId;
-  if (!userId) {
-    redirect('/sign-in');
-  }
-  // Already satisfied (or no MFA) -> straight through.
-  if (evaluation.status === 'satisfied' || evaluation.status === 'not_required') {
-    redirect(redirectTo);
-  }
-
-  const type = evaluation.status === 'totp_required' ? 'totp' : 'email';
-
-  const supabase = createClient();
-  const {
-    data: { user },
-  } = await supabase.auth.getUser();
-
-  const pendingEmailCode =
-    type === 'email' ? await hasPendingEmailChallenge(userId) : false;
-
-  return (
-    <div className="flex-1 flex flex-col w-full max-w-md mx-auto py-10">
-      <TwoFactorForm
-        type={type}
-        email={user?.email ?? ''}
-        redirectTo={redirectTo}
-        pendingEmailCode={pendingEmailCode}
-      />
-    </div>
-  );
-}
+import { redirect } from 'next/navigation';
+import { createClient } from '@nextblock-cms/db/server';
+import {
+  evaluateTwoFactor,
+  hasPendingEmailChallenge,
+} from '../../../lib/auth/twoFactor';
+import TwoFactorForm from './components/TwoFactorForm';
+
+function safeRedirect(path?: string): string {
+  return path && path.startsWith('/') && !path.startsWith('//') ? path : '/cms/dashboard';
+}
+
+export default async function TwoFactorPage({
+  searchParams,
+}: {
+  searchParams: Promise<{ redirect_to?: string }>;
+}) {
+  const params = await searchParams;
+  const redirectTo = safeRedirect(params.redirect_to);
+
+  const evaluation = await evaluateTwoFactor();
+  const userId = evaluation.userId;
+  if (!userId) {
+    redirect('/sign-in');
+  }
+  // Already satisfied (or no MFA) -> straight through.
+  if (evaluation.status === 'satisfied' || evaluation.status === 'not_required') {
+    redirect(redirectTo);
+  }
+
+  const type = evaluation.status === 'totp_required' ? 'totp' : 'email';
+
+  const supabase = createClient();
+  const {
+    data: { user },
+  } = await supabase.auth.getUser();
+
+  const pendingEmailCode =
+    type === 'email' ? await hasPendingEmailChallenge(userId) : false;
+
+  return (
+    <div className="flex-1 flex flex-col w-full max-w-md mx-auto py-10">
+      <TwoFactorForm
+        type={type}
+        email={user?.email ?? ''}
+        redirectTo={redirectTo}
+        pendingEmailCode={pendingEmailCode}
+      />
+    </div>
+  );
+}

package/templates/nextblock-template/app/ToasterProvider.tsx

@@ -1,17 +1,17 @@
-"use client";
-
-import { Toaster } from "react-hot-toast";
-
-export function ToasterProvider() {
-  return (
-    <Toaster
-      position="top-right"
-      toastOptions={{
-        style: { fontSize: 14 },
-        success: { iconTheme: { primary: '#16a34a', secondary: 'white' } },
-        error: { iconTheme: { primary: '#dc2626', secondary: 'white' } },
-      }}
-    />
-  );
-}
-
+"use client";
+
+import { Toaster } from "react-hot-toast";
+
+export function ToasterProvider() {
+  return (
+    <Toaster
+      position="top-right"
+      toastOptions={{
+        style: { fontSize: 14 },
+        success: { iconTheme: { primary: '#16a34a', secondary: 'white' } },
+        error: { iconTheme: { primary: '#dc2626', secondary: 'white' } },
+      }}
+    />
+  );
+}
+

package/templates/nextblock-template/app/[slug]/pageClientActions.ts

@@ -1,7 +1,7 @@
-'use server';
-
-import { getPageDataBySlug } from './page.utils';
-
-export async function getPublishedPageForLocale(slug: string, localeCode: string) {
-  return getPageDataBySlug(slug, localeCode);
-}
+'use server';
+
+import { getPageDataBySlug } from './page.utils';
+
+export async function getPublishedPageForLocale(slug: string, localeCode: string) {
+  return getPageDataBySlug(slug, localeCode);
+}