diff --git a/__tests__/forms.test.ts b/__tests__/forms.test.ts index 4b41acf..0467c73 100644 --- a/__tests__/forms.test.ts +++ b/__tests__/forms.test.ts @@ -184,9 +184,12 @@ describe('linkSubmissionsSchema', () => { }) describe('getPublicFormSchema', () => { - it('validates the slug', () => { - expect(getPublicFormSchema.safeParse({ slug: 'a-form' }).success).toBe(true) - expect(getPublicFormSchema.safeParse({ slug: 'Bad' }).success).toBe(false) + it('requires both a space and a valid form slug', () => { + expect(getPublicFormSchema.safeParse({ space: 'heatsynclabs', slug: 'a-form' }).success).toBe(true) + expect(getPublicFormSchema.safeParse({ slug: 'a-form' }).success).toBe(false) + expect(getPublicFormSchema.safeParse({ space: 'heatsynclabs' }).success).toBe(false) + expect(getPublicFormSchema.safeParse({ space: 'heatsynclabs', slug: 'Bad' }).success).toBe(false) + expect(getPublicFormSchema.safeParse({ space: '', slug: 'a-form' }).success).toBe(false) }) }) diff --git a/app/(app)/forms/[id]/edit/page.tsx b/app/(app)/forms/[id]/edit/page.tsx index c604a7d..e3f2722 100644 --- a/app/(app)/forms/[id]/edit/page.tsx +++ b/app/(app)/forms/[id]/edit/page.tsx @@ -8,7 +8,7 @@ export const dynamic = 'force-dynamic' export default async function EditFormPage({ params }: { params: Promise<{ id: string }> }) { const { id } = await params - const { supabase, member } = await requireFormsManagerPage() + const { supabase, member, spaceSlug } = await requireFormsManagerPage() const { data: form } = await supabase .from('forms') @@ -28,6 +28,7 @@ export default async function EditFormPage({ params }: { params: Promise<{ id: s = { public_anon: 'Public', } -export function FormsClient({ forms }: { forms: FormRow[] }) { +export function FormsClient({ forms, spaceSlug }: { forms: FormRow[]; spaceSlug: string }) { return ( <> @@ -65,7 +65,7 @@ export function FormsClient({ forms }: { forms: FormRow[] }) { {f.kind === 'waiver' && Waiver} -

/f/{f.slug}

+

/f/{spaceSlug}/{f.slug}

{VIS_LABEL[f.visibility] ?? f.visibility} diff --git a/app/(app)/forms/new/page.tsx b/app/(app)/forms/new/page.tsx index 6c258e6..634df22 100644 --- a/app/(app)/forms/new/page.tsx +++ b/app/(app)/forms/new/page.tsx @@ -5,7 +5,7 @@ import { FormBuilder } from '@/components/forms/form-builder' export const dynamic = 'force-dynamic' export default async function NewFormPage() { - await requireFormsManagerPage() + const { spaceSlug } = await requireFormsManagerPage() return ( <> @@ -15,6 +15,7 @@ export default async function NewFormPage() {
+ return } diff --git a/app/f/[slug]/page.tsx b/app/f/[space]/[slug]/page.tsx similarity index 80% rename from app/f/[slug]/page.tsx rename to app/f/[space]/[slug]/page.tsx index 25e3b2d..6649b61 100644 --- a/app/f/[slug]/page.tsx +++ b/app/f/[space]/[slug]/page.tsx @@ -5,9 +5,13 @@ import { PublicFormClient } from './public-form-client' export const dynamic = 'force-dynamic' -export default async function PublicFormPage({ params }: { params: Promise<{ slug: string }> }) { - const { slug } = await params - const res = await getPublicForm({ slug }) +export default async function PublicFormPage({ + params, +}: { + params: Promise<{ space: string; slug: string }> +}) { + const { space, slug } = await params + const res = await getPublicForm({ space, slug }) if ('error' in res && res.error) { return ( @@ -29,7 +33,8 @@ export default async function PublicFormPage({ params }: { params: Promise<{ slu return (

You need to be signed in to submit this form.

) : ( diff --git a/components/forms/form-builder.tsx b/components/forms/form-builder.tsx index 5964919..fd8d694 100644 --- a/components/forms/form-builder.tsx +++ b/components/forms/form-builder.tsx @@ -29,6 +29,7 @@ type Status = 'draft' | 'published' | 'closed' export type BuilderForm = { id?: string + spaceSlug: string slug: string title: string description: string @@ -171,8 +172,9 @@ export function FormBuilder({ initial }: { initial: BuilderForm }) { router.refresh() } + const publicPath = `/f/${initial.spaceSlug}/${initial.slug}` const publicUrl = - typeof window !== 'undefined' ? `${window.location.origin}/f/${initial.slug}` : `/f/${initial.slug}` + typeof window !== 'undefined' ? `${window.location.origin}${publicPath}` : publicPath return (
@@ -240,7 +242,7 @@ export function FormBuilder({ initial }: { initial: BuilderForm }) { {isEdit ? (

The slug cannot change after creation.

) : ( -

Public address: /f/{slug || '…'}

+

Public address: /f/{initial.spaceSlug}/{slug || '…'}

)}
diff --git a/lib/actions/forms.ts b/lib/actions/forms.ts index 2012da2..192eef4 100644 --- a/lib/actions/forms.ts +++ b/lib/actions/forms.ts @@ -395,11 +395,19 @@ export async function getPublicForm(input: unknown) { if (!v.ok) return { error: v.error } const admin = createAdminClient() + const { data: space } = await admin + .from('spaces') + .select('id') + .eq('slug', v.data.space) + .maybeSingle() + if (!space) return { error: 'This form is not available.' } + const { data: form } = await admin .from('forms') .select('id, slug, title, description, kind, visibility, schema, legal_text, version, status') + .eq('space_id', space.id) .eq('slug', v.data.slug) - .single() + .maybeSingle() // Members-only forms are never served on the public page (that would expose // their schema to anyone). They are filled from inside the app. diff --git a/lib/forms-guard.ts b/lib/forms-guard.ts index dd3e31b..6638f49 100644 --- a/lib/forms-guard.ts +++ b/lib/forms-guard.ts @@ -15,7 +15,7 @@ export async function requireFormsManagerPage() { const { data: member } = await supabase .from('space_members') - .select('id, space_id, role, user_id, display_name') + .select('id, space_id, role, user_id, display_name, spaces(slug)') .eq('user_id', user.id) .in('status', ['current', 'unverified', 'late']) .single() @@ -28,5 +28,6 @@ export async function requireFormsManagerPage() { }) if (!allowed) redirect('/dashboard') - return { supabase, member } + const spaceSlug = (member.spaces as { slug?: string } | null)?.slug ?? '' + return { supabase, member, spaceSlug } } diff --git a/lib/validations.ts b/lib/validations.ts index fde1f29..480151c 100644 --- a/lib/validations.ts +++ b/lib/validations.ts @@ -666,7 +666,10 @@ export const linkSubmissionsSchema = z.object({ email: emailField(), }) -export const getPublicFormSchema = z.object({ slug: formSlug }) +export const getPublicFormSchema = z.object({ + space: z.string().min(1).max(100), + slug: formSlug, +}) // ─── Generic ID schemas ────────────────────────────────────────────────────── diff --git a/scripts/028_forms_slug_per_space.sql b/scripts/028_forms_slug_per_space.sql new file mode 100644 index 0000000..d020e87 --- /dev/null +++ b/scripts/028_forms_slug_per_space.sql @@ -0,0 +1,17 @@ +-- ============================================================================= +-- 028: Form slug is unique PER SPACE, not globally +-- ============================================================================= +-- The public form URL is moving from /f/[slug] to /f/[space]/[slug], so the +-- form slug only needs to be unique within a space (and global uniqueness was +-- a cross-tenant slug-squatting footgun). Drop the global UNIQUE(slug) and add +-- UNIQUE(space_id, slug). +-- +-- `forms_slug_key` is the auto-generated name for the inline column UNIQUE in +-- migration 026 / schema.sql. Idempotent: DROP IF EXISTS the old and the new +-- constraint, then ADD. +-- ============================================================================= + +ALTER TABLE public.forms DROP CONSTRAINT IF EXISTS forms_slug_key; +ALTER TABLE public.forms DROP CONSTRAINT IF EXISTS forms_space_slug_key; +ALTER TABLE public.forms + ADD CONSTRAINT forms_space_slug_key UNIQUE (space_id, slug); diff --git a/scripts/schema.sql b/scripts/schema.sql index 2d3c417..d0ba458 100644 --- a/scripts/schema.sql +++ b/scripts/schema.sql @@ -1899,7 +1899,7 @@ CREATE TRIGGER trg_prevent_member_self_role_change CREATE TABLE IF NOT EXISTS public.forms ( id uuid PRIMARY KEY DEFAULT uuid_generate_v4(), space_id uuid NOT NULL REFERENCES public.spaces(id) ON DELETE CASCADE, - slug text NOT NULL UNIQUE + slug text NOT NULL CHECK (slug ~ '^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$' AND char_length(slug) BETWEEN 1 AND 80), title text NOT NULL CHECK (char_length(title) BETWEEN 1 AND 200), @@ -1915,9 +1915,11 @@ CREATE TABLE IF NOT EXISTS public.forms ( version integer NOT NULL DEFAULT 1 CHECK (version >= 1), created_by uuid REFERENCES public.space_members(id) ON DELETE SET NULL, created_at timestamptz NOT NULL DEFAULT now(), - updated_at timestamptz NOT NULL DEFAULT now() + updated_at timestamptz NOT NULL DEFAULT now(), + CONSTRAINT forms_space_slug_key UNIQUE (space_id, slug) ); --- slug already has a UNIQUE btree index from the column constraint. +-- The UNIQUE(space_id, slug) constraint above also serves slug lookups +-- scoped to a space (the /f/[space]/[slug] public route). CREATE INDEX IF NOT EXISTS idx_forms_space ON public.forms (space_id, status); CREATE TABLE IF NOT EXISTS public.form_submissions (