create-nextblock 0.16.3 → 0.17.0

package/templates/nextblock-template/lib/privacy/settings.ts

@@ -1,115 +1,115 @@
-// Server-only read/write for the `privacy_settings` and `security_settings`
-// rows in the site_settings key-value table. Mirrors the copyright/bot-protection
-// pattern (createClient + RLS for writes; revalidatePath handled by callers).
-import { createClient } from '@nextblock-cms/db/server';
-import {
-  DEFAULT_PRIVACY_SETTINGS,
-  DEFAULT_SECURITY_SETTINGS,
-  MAX_TRUSTED_DEVICE_DAYS,
-  MIN_TRUSTED_DEVICE_DAYS,
-  type CorporateIdentity,
-  type PrivacySettings,
-  type SecuritySettings,
-} from './types';
-
-const PRIVACY_KEY = 'privacy_settings';
-const SECURITY_KEY = 'security_settings';
-
-function asString(value: unknown, fallback = ''): string {
-  return typeof value === 'string' ? value : fallback;
-}
-
-function asBool(value: unknown, fallback: boolean): boolean {
-  if (typeof value === 'boolean') return value;
-  if (typeof value === 'string') return value === 'true' || value === 'on';
-  return fallback;
-}
-
-function normalizePrivacy(value: unknown): PrivacySettings {
-  const raw = (value && typeof value === 'object' ? value : {}) as Record<string, unknown>;
-  const corporateRaw = (raw.corporate && typeof raw.corporate === 'object'
-    ? raw.corporate
-    : {}) as Record<string, unknown>;
-  const corporate: CorporateIdentity = {
-    legal_name: asString(corporateRaw.legal_name),
-    address: asString(corporateRaw.address),
-    support_email: asString(corporateRaw.support_email),
-  };
-  return {
-    banner_enabled: asBool(raw.banner_enabled, DEFAULT_PRIVACY_SETTINGS.banner_enabled),
-    gtm_id: asString(raw.gtm_id),
-    ga_measurement_id: asString(raw.ga_measurement_id),
-    custom_scripts: asString(raw.custom_scripts),
-    corporate,
-  };
-}
-
-function clampTrustDays(value: unknown): number {
-  const n = typeof value === 'number' ? value : Number.parseInt(asString(value), 10);
-  if (!Number.isFinite(n)) return DEFAULT_SECURITY_SETTINGS.trusted_device_days;
-  return Math.min(MAX_TRUSTED_DEVICE_DAYS, Math.max(MIN_TRUSTED_DEVICE_DAYS, Math.round(n)));
-}
-
-function normalizeSecurity(value: unknown): SecuritySettings {
-  const raw = (value && typeof value === 'object' ? value : {}) as Record<string, unknown>;
-  return {
-    trusted_device_days: clampTrustDays(raw.trusted_device_days),
-    enforce_staff_2fa: asBool(raw.enforce_staff_2fa, DEFAULT_SECURITY_SETTINGS.enforce_staff_2fa),
-  };
-}
-
-export async function getPrivacySettings(): Promise<PrivacySettings> {
-  const supabase = createClient();
-  const { data } = await supabase
-    .from('site_settings')
-    .select('value')
-    .eq('key', PRIVACY_KEY)
-    .maybeSingle();
-  return normalizePrivacy(data?.value);
-}
-
-export async function getSecuritySettings(): Promise<SecuritySettings> {
-  const supabase = createClient();
-  const { data } = await supabase
-    .from('site_settings')
-    .select('value')
-    .eq('key', SECURITY_KEY)
-    .maybeSingle();
-  return normalizeSecurity(data?.value);
-}
-
-export async function savePrivacySettings(input: PrivacySettings): Promise<void> {
-  const supabase = createClient();
-  const value = normalizePrivacy(input);
-  const { error } = await supabase
-    .from('site_settings')
-    .upsert({ key: PRIVACY_KEY, value });
-  if (error) {
-    console.error('Error saving privacy settings:', error.message);
-    throw new Error('Failed to save privacy settings.');
-  }
-}
-
-// Privacy/consent and Google Analytics share the single `privacy_settings` row but
-// are edited from two different CMS pages (Settings -> Privacy vs Settings -> Google
-// Analytics). Each page must persist only its own fields without clobbering the other
-// page's, so writes read-merge against the current row. (We may split this into a
-// dedicated `analytics_settings` key later.)
-export async function mergePrivacySettings(
-  patch: Partial<PrivacySettings>
-): Promise<void> {
-  const current = await getPrivacySettings();
-  await savePrivacySettings({ ...current, ...patch });
-}
-
-export async function saveSecuritySettings(input: SecuritySettings): Promise<void> {
-  const supabase = createClient();
-  const value = normalizeSecurity(input);
-  const { error } = await supabase
-    .from('site_settings')
-    .upsert({ key: SECURITY_KEY, value });
-  if (error) {
-    console.error('Error saving security settings:', error.message);
-    throw new Error('Failed to save security settings.');
-  }
-}
+// Server-only read/write for the `privacy_settings` and `security_settings`
+// rows in the site_settings key-value table. Mirrors the copyright/bot-protection
+// pattern (createClient + RLS for writes; revalidatePath handled by callers).
+import { createClient } from '@nextblock-cms/db/server';
+import {
+  DEFAULT_PRIVACY_SETTINGS,
+  DEFAULT_SECURITY_SETTINGS,
+  MAX_TRUSTED_DEVICE_DAYS,
+  MIN_TRUSTED_DEVICE_DAYS,
+  type CorporateIdentity,
+  type PrivacySettings,
+  type SecuritySettings,
+} from './types';
+
+const PRIVACY_KEY = 'privacy_settings';
+const SECURITY_KEY = 'security_settings';
+
+function asString(value: unknown, fallback = ''): string {
+  return typeof value === 'string' ? value : fallback;
+}
+
+function asBool(value: unknown, fallback: boolean): boolean {
+  if (typeof value === 'boolean') return value;
+  if (typeof value === 'string') return value === 'true' || value === 'on';
+  return fallback;
+}
+
+function normalizePrivacy(value: unknown): PrivacySettings {
+  const raw = (value && typeof value === 'object' ? value : {}) as Record<string, unknown>;
+  const corporateRaw = (raw.corporate && typeof raw.corporate === 'object'
+    ? raw.corporate
+    : {}) as Record<string, unknown>;
+  const corporate: CorporateIdentity = {
+    legal_name: asString(corporateRaw.legal_name),
+    address: asString(corporateRaw.address),
+    support_email: asString(corporateRaw.support_email),
+  };
+  return {
+    banner_enabled: asBool(raw.banner_enabled, DEFAULT_PRIVACY_SETTINGS.banner_enabled),
+    gtm_id: asString(raw.gtm_id),
+    ga_measurement_id: asString(raw.ga_measurement_id),
+    custom_scripts: asString(raw.custom_scripts),
+    corporate,
+  };
+}
+
+function clampTrustDays(value: unknown): number {
+  const n = typeof value === 'number' ? value : Number.parseInt(asString(value), 10);
+  if (!Number.isFinite(n)) return DEFAULT_SECURITY_SETTINGS.trusted_device_days;
+  return Math.min(MAX_TRUSTED_DEVICE_DAYS, Math.max(MIN_TRUSTED_DEVICE_DAYS, Math.round(n)));
+}
+
+function normalizeSecurity(value: unknown): SecuritySettings {
+  const raw = (value && typeof value === 'object' ? value : {}) as Record<string, unknown>;
+  return {
+    trusted_device_days: clampTrustDays(raw.trusted_device_days),
+    enforce_staff_2fa: asBool(raw.enforce_staff_2fa, DEFAULT_SECURITY_SETTINGS.enforce_staff_2fa),
+  };
+}
+
+export async function getPrivacySettings(): Promise<PrivacySettings> {
+  const supabase = createClient();
+  const { data } = await supabase
+    .from('site_settings')
+    .select('value')
+    .eq('key', PRIVACY_KEY)
+    .maybeSingle();
+  return normalizePrivacy(data?.value);
+}
+
+export async function getSecuritySettings(): Promise<SecuritySettings> {
+  const supabase = createClient();
+  const { data } = await supabase
+    .from('site_settings')
+    .select('value')
+    .eq('key', SECURITY_KEY)
+    .maybeSingle();
+  return normalizeSecurity(data?.value);
+}
+
+export async function savePrivacySettings(input: PrivacySettings): Promise<void> {
+  const supabase = createClient();
+  const value = normalizePrivacy(input);
+  const { error } = await supabase
+    .from('site_settings')
+    .upsert({ key: PRIVACY_KEY, value });
+  if (error) {
+    console.error('Error saving privacy settings:', error.message);
+    throw new Error('Failed to save privacy settings.');
+  }
+}
+
+// Privacy/consent and Google Analytics share the single `privacy_settings` row but
+// are edited from two different CMS pages (Settings -> Privacy vs Settings -> Google
+// Analytics). Each page must persist only its own fields without clobbering the other
+// page's, so writes read-merge against the current row. (We may split this into a
+// dedicated `analytics_settings` key later.)
+export async function mergePrivacySettings(
+  patch: Partial<PrivacySettings>
+): Promise<void> {
+  const current = await getPrivacySettings();
+  await savePrivacySettings({ ...current, ...patch });
+}
+
+export async function saveSecuritySettings(input: SecuritySettings): Promise<void> {
+  const supabase = createClient();
+  const value = normalizeSecurity(input);
+  const { error } = await supabase
+    .from('site_settings')
+    .upsert({ key: SECURITY_KEY, value });
+  if (error) {
+    console.error('Error saving security settings:', error.message);
+    throw new Error('Failed to save security settings.');
+  }
+}

package/templates/nextblock-template/lib/privacy/types.ts

@@ -1,69 +1,69 @@
-// Pure, client-safe privacy/security types and constants.
-// Importable from both client and server modules (no server-only dependencies).
-
-/** Cookie that stores the visitor's consent decision. Readable client-side so the
- *  analytics guard can gate third-party scripts before any network request. */
-export const CONSENT_COOKIE_NAME = 'nb_consent_preference';
-
-/** How long a stored consent decision is honoured before we re-ask (seconds). */
-export const CONSENT_COOKIE_MAX_AGE = 365 * 24 * 60 * 60;
-
-export interface ConsentCategories {
-  /** Strictly necessary cookies are always on and cannot be declined. */
-  necessary: true;
-  analytics: boolean;
-  marketing: boolean;
-}
-
-export interface ConsentPreference extends ConsentCategories {
-  /** Opaque token also written to privacy_consent_logs for auditability. */
-  token: string;
-  /** Epoch milliseconds the decision was recorded. */
-  ts: number;
-}
-
-export interface CorporateIdentity {
-  legal_name: string;
-  address: string;
-  support_email: string;
-}
-
-export interface PrivacySettings {
-  /** Master switch for the Law 25 consent banner. */
-  banner_enabled: boolean;
-  /** Google Tag Manager container id (GTM-XXXX). Loaded only after consent. */
-  gtm_id: string;
-  /** Optional GA4 measurement id, surfaced for reference / future use. */
-  ga_measurement_id: string;
-  /** Arbitrary extra <script> markup, injected only after analytics consent. */
-  custom_scripts: string;
-  corporate: CorporateIdentity;
-}
-
-export interface SecuritySettings {
-  /** Default lifetime of a "remember this device" trust, in days. */
-  trusted_device_days: number;
-  /** When true, staff (ADMIN/WRITER) are expected to configure 2FA. Advisory. */
-  enforce_staff_2fa: boolean;
-}
-
-export const DEFAULT_PRIVACY_SETTINGS: PrivacySettings = {
-  banner_enabled: true,
-  gtm_id: '',
-  ga_measurement_id: '',
-  custom_scripts: '',
-  corporate: { legal_name: '', address: '', support_email: '' },
-};
-
-export const MIN_TRUSTED_DEVICE_DAYS = 1;
-export const MAX_TRUSTED_DEVICE_DAYS = 3650; // 10 years
-export const DEFAULT_TRUSTED_DEVICE_DAYS = 30;
-
-export const DEFAULT_SECURITY_SETTINGS: SecuritySettings = {
-  trusted_device_days: DEFAULT_TRUSTED_DEVICE_DAYS,
-  // On by default: staff are encouraged to enable 2FA (a CMS reminder banner is shown to
-  // ADMIN/WRITER accounts without a second factor). Never enforced in the sandbox.
-  enforce_staff_2fa: true,
-};
-
-export type MfaType = 'totp' | 'email';
+// Pure, client-safe privacy/security types and constants.
+// Importable from both client and server modules (no server-only dependencies).
+
+/** Cookie that stores the visitor's consent decision. Readable client-side so the
+ *  analytics guard can gate third-party scripts before any network request. */
+export const CONSENT_COOKIE_NAME = 'nb_consent_preference';
+
+/** How long a stored consent decision is honoured before we re-ask (seconds). */
+export const CONSENT_COOKIE_MAX_AGE = 365 * 24 * 60 * 60;
+
+export interface ConsentCategories {
+  /** Strictly necessary cookies are always on and cannot be declined. */
+  necessary: true;
+  analytics: boolean;
+  marketing: boolean;
+}
+
+export interface ConsentPreference extends ConsentCategories {
+  /** Opaque token also written to privacy_consent_logs for auditability. */
+  token: string;
+  /** Epoch milliseconds the decision was recorded. */
+  ts: number;
+}
+
+export interface CorporateIdentity {
+  legal_name: string;
+  address: string;
+  support_email: string;
+}
+
+export interface PrivacySettings {
+  /** Master switch for the Law 25 consent banner. */
+  banner_enabled: boolean;
+  /** Google Tag Manager container id (GTM-XXXX). Loaded only after consent. */
+  gtm_id: string;
+  /** Optional GA4 measurement id, surfaced for reference / future use. */
+  ga_measurement_id: string;
+  /** Arbitrary extra <script> markup, injected only after analytics consent. */
+  custom_scripts: string;
+  corporate: CorporateIdentity;
+}
+
+export interface SecuritySettings {
+  /** Default lifetime of a "remember this device" trust, in days. */
+  trusted_device_days: number;
+  /** When true, staff (ADMIN/WRITER) are expected to configure 2FA. Advisory. */
+  enforce_staff_2fa: boolean;
+}
+
+export const DEFAULT_PRIVACY_SETTINGS: PrivacySettings = {
+  banner_enabled: true,
+  gtm_id: '',
+  ga_measurement_id: '',
+  custom_scripts: '',
+  corporate: { legal_name: '', address: '', support_email: '' },
+};
+
+export const MIN_TRUSTED_DEVICE_DAYS = 1;
+export const MAX_TRUSTED_DEVICE_DAYS = 3650; // 10 years
+export const DEFAULT_TRUSTED_DEVICE_DAYS = 30;
+
+export const DEFAULT_SECURITY_SETTINGS: SecuritySettings = {
+  trusted_device_days: DEFAULT_TRUSTED_DEVICE_DAYS,
+  // On by default: staff are encouraged to enable 2FA (a CMS reminder banner is shown to
+  // ADMIN/WRITER accounts without a second factor). Never enforced in the sandbox.
+  enforce_staff_2fa: true,
+};
+
+export type MfaType = 'totp' | 'email';

package/templates/nextblock-template/lib/promotions/server.test.ts

@@ -1,74 +1,74 @@
-import { describe, expect, it, vi } from "vitest";
-
-vi.mock("server-only", () => ({}));
-vi.mock("@nextblock-cms/db/server", () => ({
-  getServiceRoleSupabaseClient: () => ({}),
-}));
-vi.mock("@nextblock-cms/ecommerce/server", () => ({
-  syncProductSaleCouponToFreemius: vi.fn(),
-}));
-
-import { normalizeDateInput, parsePriceCell } from "./server";
-
-describe("normalizeDateInput", () => {
-  it("treats an empty value as a valid no-op", () => {
-    expect(normalizeDateInput("", "start")).toEqual({ value: null, valid: true });
-    expect(normalizeDateInput(undefined, "end")).toEqual({ value: null, valid: true });
-  });
-
-  it("makes a date-only start the start of the day and a date-only end the end of the day", () => {
-    const start = normalizeDateInput("2026-06-10", "start");
-    expect(start.valid).toBe(true);
-    const startDate = new Date(start.value as string);
-    expect([startDate.getHours(), startDate.getMinutes(), startDate.getSeconds()]).toEqual([0, 0, 0]);
-
-    const end = normalizeDateInput("2026-06-10", "end");
-    expect(end.valid).toBe(true);
-    const endDate = new Date(end.value as string);
-    expect([endDate.getHours(), endDate.getMinutes(), endDate.getSeconds()]).toEqual([23, 59, 59]);
-  });
-
-  it("forces end seconds to 59 and start seconds to 0 for timed values", () => {
-    const end = new Date(normalizeDateInput("2026-06-10T14:30", "end").value as string);
-    expect(end.getSeconds()).toBe(59);
-    expect(end.getMinutes()).toBe(30);
-
-    const start = new Date(normalizeDateInput("2026-06-10T14:30", "start").value as string);
-    expect(start.getSeconds()).toBe(0);
-    expect(start.getMinutes()).toBe(30);
-  });
-
-  it("rejects unparseable values", () => {
-    expect(normalizeDateInput("not-a-date", "start")).toEqual({ value: null, valid: false });
-  });
-});
-
-describe("parsePriceCell", () => {
-  it("returns nulls for an empty cell", () => {
-    expect(parsePriceCell("")).toEqual({ scalar: null, map: null, error: null });
-  });
-
-  it("parses a single number", () => {
-    expect(parsePriceCell("14.99")).toEqual({ scalar: 14.99, map: null, error: null });
-  });
-
-  it("parses a multi-currency JSON map and upper-cases codes", () => {
-    const result = parsePriceCell('{"usd":14.99,"EUR":13.5}');
-    expect(result.error).toBeNull();
-    expect(result.scalar).toBeNull();
-    expect(result.map).toEqual({ USD: 14.99, EUR: 13.5 });
-  });
-
-  it("keeps null entries in a JSON map (clearing a currency)", () => {
-    const result = parsePriceCell('{"USD":null}');
-    expect(result.error).toBeNull();
-    expect(result.map).toEqual({ USD: null });
-  });
-
-  it("rejects negative or non-numeric input", () => {
-    expect(parsePriceCell("-5").error).toBeTruthy();
-    expect(parsePriceCell("abc").error).toBeTruthy();
-    expect(parsePriceCell('{"USD":-1}').error).toBeTruthy();
-    expect(parsePriceCell("[1,2]").error).toBeTruthy();
-  });
-});
+import { describe, expect, it, vi } from "vitest";
+
+vi.mock("server-only", () => ({}));
+vi.mock("@nextblock-cms/db/server", () => ({
+  getServiceRoleSupabaseClient: () => ({}),
+}));
+vi.mock("@nextblock-cms/ecommerce/server", () => ({
+  syncProductSaleCouponToFreemius: vi.fn(),
+}));
+
+import { normalizeDateInput, parsePriceCell } from "./server";
+
+describe("normalizeDateInput", () => {
+  it("treats an empty value as a valid no-op", () => {
+    expect(normalizeDateInput("", "start")).toEqual({ value: null, valid: true });
+    expect(normalizeDateInput(undefined, "end")).toEqual({ value: null, valid: true });
+  });
+
+  it("makes a date-only start the start of the day and a date-only end the end of the day", () => {
+    const start = normalizeDateInput("2026-06-10", "start");
+    expect(start.valid).toBe(true);
+    const startDate = new Date(start.value as string);
+    expect([startDate.getHours(), startDate.getMinutes(), startDate.getSeconds()]).toEqual([0, 0, 0]);
+
+    const end = normalizeDateInput("2026-06-10", "end");
+    expect(end.valid).toBe(true);
+    const endDate = new Date(end.value as string);
+    expect([endDate.getHours(), endDate.getMinutes(), endDate.getSeconds()]).toEqual([23, 59, 59]);
+  });
+
+  it("forces end seconds to 59 and start seconds to 0 for timed values", () => {
+    const end = new Date(normalizeDateInput("2026-06-10T14:30", "end").value as string);
+    expect(end.getSeconds()).toBe(59);
+    expect(end.getMinutes()).toBe(30);
+
+    const start = new Date(normalizeDateInput("2026-06-10T14:30", "start").value as string);
+    expect(start.getSeconds()).toBe(0);
+    expect(start.getMinutes()).toBe(30);
+  });
+
+  it("rejects unparseable values", () => {
+    expect(normalizeDateInput("not-a-date", "start")).toEqual({ value: null, valid: false });
+  });
+});
+
+describe("parsePriceCell", () => {
+  it("returns nulls for an empty cell", () => {
+    expect(parsePriceCell("")).toEqual({ scalar: null, map: null, error: null });
+  });
+
+  it("parses a single number", () => {
+    expect(parsePriceCell("14.99")).toEqual({ scalar: 14.99, map: null, error: null });
+  });
+
+  it("parses a multi-currency JSON map and upper-cases codes", () => {
+    const result = parsePriceCell('{"usd":14.99,"EUR":13.5}');
+    expect(result.error).toBeNull();
+    expect(result.scalar).toBeNull();
+    expect(result.map).toEqual({ USD: 14.99, EUR: 13.5 });
+  });
+
+  it("keeps null entries in a JSON map (clearing a currency)", () => {
+    const result = parsePriceCell('{"USD":null}');
+    expect(result.error).toBeNull();
+    expect(result.map).toEqual({ USD: null });
+  });
+
+  it("rejects negative or non-numeric input", () => {
+    expect(parsePriceCell("-5").error).toBeTruthy();
+    expect(parsePriceCell("abc").error).toBeTruthy();
+    expect(parsePriceCell('{"USD":-1}').error).toBeTruthy();
+    expect(parsePriceCell("[1,2]").error).toBeTruthy();
+  });
+});