create-nextblock 0.11.3 → 0.12.1

package/templates/nextblock-template/lib/email/branding.ts

@@ -0,0 +1,76 @@
+import 'server-only';
+
+import { getServiceRoleSupabaseClient } from '@nextblock-cms/db/server';
+
+import { getSiteSettings } from '../../app/lib/site-settings';
+import { DEFAULT_SITE_TITLE } from '../../app/lib/seo';
+import { resolveMediaUrl } from '../media/resolveMediaUrl';
+import { resolveMediaBaseUrl } from '../storage/provider';
+import { resolveSiteUrl } from '../site-url';
+import { resolveActiveLogo } from '../logos/active-logo';
+import { pickEmailLogoObjectKey } from './branding-format';
+import type { EmailBranding, LogoMediaLike } from './branding-format';
+
+// Server-side resolution of the tenant branding that white-labels every transactional
+// email. The mailer choke point (app/actions/email.ts) and the auth-email logo endpoint
+// (app/api/brand/email-logo) both read this, so every dispatched pipeline — 2FA codes,
+// form/interaction notifications, the SMTP test, feedback, and the Supabase auth emails —
+// shows the operator's own logo instead of a hardcoded NextBlock one.
+//
+// The pure header-rendering helpers live in ./branding-format (no server-only imports, so
+// they're unit-testable); re-export them here so callers have a single import surface.
+export {
+  EMAIL_BRAND_HEADER_TOKEN,
+  EMAIL_LOGO_MAX_WIDTH,
+  applyEmailBranding,
+  renderEmailBrandHeader,
+} from './branding-format';
+export type { EmailBranding } from './branding-format';
+
+/**
+ * Resolve the tenant's active logo to an ABSOLUTE URL usable in an email `<img>`.
+ * The newest `logos` row wins (the table has no is_active flag). Returns `null` when
+ * there is no logo, no linked media, or the URL cannot be resolved — the caller then
+ * renders a text banner instead.
+ */
+async function resolveActiveLogoUrl(): Promise<string | null> {
+  try {
+    const supabase = getServiceRoleSupabaseClient();
+    // Honor the admin-pinned active logo (site_settings.active_logo_id), else newest.
+    const logo = await resolveActiveLogo(supabase);
+    const media = (logo as { media?: LogoMediaLike | null } | null)?.media ?? null;
+    // Prefer the original uploaded file over the AVIF `object_key` (email can't render AVIF).
+    const objectKey = pickEmailLogoObjectKey(media);
+    if (!objectKey) return null;
+
+    // Pass the resolved base explicitly so the native-Supabase storage URL is honored
+    // even when NEXT_PUBLIC_R2_BASE_URL isn't set.
+    const resolved = resolveMediaUrl(objectKey, resolveMediaBaseUrl());
+    if (!resolved) return null;
+    if (resolved.startsWith('http://') || resolved.startsWith('https://')) {
+      return resolved;
+    }
+    // Relative result (a bundled `/images/*` key, or the no-storage-base case): make it
+    // absolute against the public site origin so email clients can fetch it.
+    const origin = resolveSiteUrl();
+    return `${origin}${resolved.startsWith('/') ? '' : '/'}${resolved}`;
+  } catch {
+    // Service role unavailable or table missing (pre-setup) — treat as "no logo".
+    return null;
+  }
+}
+
+/**
+ * Resolve tenant email branding. Read fresh on each call (no React `cache`, so it is safe
+ * from fire-and-forget dispatch paths where the request scope may already be torn down);
+ * the underlying site-settings read is already cross-request cached via `unstable_cache`,
+ * and a fresh read each time is what keeps the logo "change at will".
+ */
+export async function resolveEmailBranding(): Promise<EmailBranding> {
+  const [settings, logoUrl] = await Promise.all([
+    getSiteSettings().catch(() => null),
+    resolveActiveLogoUrl(),
+  ]);
+  const siteName = settings?.siteTitle?.trim() || DEFAULT_SITE_TITLE;
+  return { logoUrl, siteName };
+}

package/templates/nextblock-template/lib/logos/active-logo.ts

@@ -0,0 +1,53 @@
+import type { SupabaseClient } from '@supabase/supabase-js';
+import type { Database } from '@nextblock-cms/db';
+
+// The single, shared definition of "the active logo", used by the public header, the CMS
+// branding page, transactional-email branding, and invoices. The operator can pin a
+// specific logo (stored as `site_settings.active_logo_id`); when none is pinned we fall
+// back to the most recently created logo (the historical default). The setting key is a
+// plain, non-secret `site_settings` row, so it is publicly readable under RLS (the public
+// header can read it with the anon client) and writable by ADMIN/WRITER.
+
+/** site_settings key holding the admin-selected active logo id (a `logos.id` uuid string). */
+export const ACTIVE_LOGO_SETTING_KEY = 'active_logo_id';
+
+// Accept any of the app's Supabase clients (request-scoped, static/anon, or service-role).
+type AnyClient = SupabaseClient<Database>;
+
+/** The admin-pinned active logo id, or null when none has been chosen. */
+export async function resolveActiveLogoId(client: AnyClient): Promise<string | null> {
+  const { data } = await client
+    .from('site_settings')
+    .select('value')
+    .eq('key', ACTIVE_LOGO_SETTING_KEY)
+    .maybeSingle();
+  const value = data?.value;
+  return typeof value === 'string' && value.length > 0 ? value : null;
+}
+
+/**
+ * Resolve the active logo row (joined with its media) for the given client: the pinned
+ * logo when set and still present, otherwise the most recently created logo. Returns the
+ * raw row; callers cast to their local logo type. Returns null when there are no logos.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export async function resolveActiveLogo(client: AnyClient): Promise<any> {
+  const activeId = await resolveActiveLogoId(client);
+
+  if (activeId) {
+    const { data } = await client
+      .from('logos')
+      .select('*, media:media_id (*)')
+      .eq('id', activeId)
+      .maybeSingle();
+    if (data) return data;
+  }
+
+  const { data } = await client
+    .from('logos')
+    .select('*, media:media_id (*)')
+    .order('created_at', { ascending: false })
+    .limit(1)
+    .maybeSingle();
+  return data ?? null;
+}

package/templates/nextblock-template/lib/media/resolveMediaUrl.ts

@@ -12,6 +12,7 @@ const BUNDLED_PUBLIC_MEDIA_KEYS = new Set([
   'images/included.webp',
   'images/metadata_image.webp',
   'images/nextblock-logo-small.webp',
+  'images/nextblock-logo-button-tiny.png',
   'images/nx-graph.webp',
   'images/pants.webp',
   'images/programmer-upscaled.webp',