Merge branch 'main' into feat/allow-same-signer-email-multiple-times

chore: disable next step on backend for signers without signature field
chore: disable next step for signers without signature field
2026-07-12 22:15:01 +10:00 · 2025-02-13 13:58:03 +02:00 · 2025-02-13 13:57:20 +02:00 · 2025-02-13 10:21:24 +02:00 · 2025-02-12 13:30:43 +02:00 · 2025-02-11 16:52:02 +02:00
38 changed files with 1651 additions and 681 deletions
@@ -6,7 +6,6 @@ import { useRouter, useSearchParams } from 'next/navigation';

 import { msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
-import { useSession } from 'next-auth/react';

 import { isValidLanguageCode } from '@documenso/lib/constants/i18n';
 import {
@@ -56,7 +55,6 @@ export const EditDocumentForm = ({
  const router = useRouter();
  const searchParams = useSearchParams();
  const team = useOptionalCurrentTeam();
-  const { data: session } = useSession();

  const [isDocumentPdfLoaded, setIsDocumentPdfLoaded] = useState(false);

@@ -136,18 +134,6 @@ export const EditDocumentForm = ({
    },
  });

-  const { mutateAsync: selfSignDocument } = trpc.document.selfSignDocument.useMutation({
-    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    onSuccess: (newData) => {
-      utils.document.getDocumentWithDetailsById.setData(
-        {
-          documentId: initialDocument.id,
-        },
-        (oldData) => ({ ...(oldData || initialDocument), ...newData }),
-      );
-    },
-  });
-
  const { mutateAsync: setPasswordForDocument } =
    trpc.document.setPasswordForDocument.useMutation();

@@ -283,22 +269,10 @@ export const EditDocumentForm = ({
        }
      }

-      const hasSameOwnerAsRecipient =
-        recipients.length === 1 && recipients[0].email === session?.user?.email;
+      // Router refresh is here to clear the router cache for when navigating to /documents.
+      router.refresh();

-      if (hasSameOwnerAsRecipient) {
-        await selfSignDocument({
-          documentId: document.id,
-          teamId: team?.id,
-        });
-
-        router.push(`/sign/${recipients[0].token}`);
-      } else {
-        // Router refresh is here to clear the router cache for when navigating to /documents.
-        router.refresh();
-
-        setStep('subject');
-      }
+      setStep('subject');
    } catch (err) {
      console.error(err);

@@ -47,50 +47,22 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitive
 import type { Toast } from '@documenso/ui/primitives/use-toast';
 import { useToast } from '@documenso/ui/primitives/use-toast';

-const ZAddRecipientsForNewDocumentSchema = z
-  .object({
-    distributeDocument: z.boolean(),
-    useCustomDocument: z.boolean().default(false),
-    customDocumentData: z
-      .any()
-      .refine((data) => data instanceof File || data === undefined)
-      .optional(),
-    recipients: z.array(
-      z.object({
-        id: z.number(),
-        email: z.string().email(),
-        name: z.string(),
-        signingOrder: z.number().optional(),
-      }),
-    ),
-  })
-  // Display exactly which rows are duplicates.
-  .superRefine((items, ctx) => {
-    const uniqueEmails = new Map<string, number>();
-
-    for (const [index, recipients] of items.recipients.entries()) {
-      const email = recipients.email.toLowerCase();
-
-      const firstFoundIndex = uniqueEmails.get(email);
-
-      if (firstFoundIndex === undefined) {
-        uniqueEmails.set(email, index);
-        continue;
-      }
-
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: 'Emails must be unique',
-        path: ['recipients', index, 'email'],
-      });
-
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: 'Emails must be unique',
-        path: ['recipients', firstFoundIndex, 'email'],
-      });
-    }
-  });
+const ZAddRecipientsForNewDocumentSchema = z.object({
+  distributeDocument: z.boolean(),
+  useCustomDocument: z.boolean().default(false),
+  customDocumentData: z
+    .any()
+    .refine((data) => data instanceof File || data === undefined)
+    .optional(),
+  recipients: z.array(
+    z.object({
+      id: z.number(),
+      email: z.string().email(),
+      name: z.string(),
+      signingOrder: z.number().optional(),
+    }),
+  ),
+});

 type TAddRecipientsForNewDocumentSchema = z.infer<typeof ZAddRecipientsForNewDocumentSchema>;

@@ -336,16 +336,6 @@ export const DocumentHistorySheet = ({
                      ]}
                    />
                  ))
-                  .with({ type: DOCUMENT_AUDIT_LOG_TYPE.SELF_SIGN }, ({ data }) => (
-                    <DocumentHistorySheetChanges
-                      values={[
-                        {
-                          key: 'Signed by',
-                          value: data.recipientEmail,
-                        },
-                      ]}
-                    />
-                  ))
                  .with(
                    { type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_VISIBILITY_UPDATED },
                    ({ data }) => (
@@ -270,12 +270,11 @@ export const ZGenerateDocumentFromTemplateMutationSchema = z.object({
    )
    .refine(
      (schema) => {
-        const emails = schema.map((signer) => signer.email.toLowerCase());
        const ids = schema.map((signer) => signer.id);

-        return new Set(emails).size === emails.length && new Set(ids).size === ids.length;
+        return new Set(ids).size === ids.length;
      },
-      { message: 'Recipient IDs and emails must be unique' },
+      { message: 'Recipient IDs must be unique' },
    ),
  meta: z
    .object({
@@ -0,0 +1,304 @@
+import { expect, test } from '@playwright/test';
+
+import { seedBlankDocument } from '@documenso/prisma/seed/documents';
+import { seedUser } from '@documenso/prisma/seed/users';
+
+import { apiSignin } from '../fixtures/authentication';
+
+test.describe.configure({ mode: 'parallel' });
+
+test('[DOCUMENT_FLOW]: add signature fields for unique recipients', async ({ page }) => {
+  const user = await seedUser();
+  const document = await seedBlankDocument(user);
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/documents/${document.id}/edit`,
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+
+  // Add 2 signers.
+  await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
+  await page.getByPlaceholder('Name').fill('Recipient 1');
+
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  await page.getByLabel('Email').nth(1).fill('recipient2@documenso.com');
+  await page.getByLabel('Name').nth(1).fill('Recipient 2');
+
+  // Advanced settings should not be visible for non EE users.
+  await expect(page.getByLabel('Show advanced settings')).toBeHidden();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 100,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Recipient 2 (recipient2@documenso.com)' }).click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 200,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Distribute Document' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Send' }).click();
+
+  await page.waitForURL('**/documents');
+
+  await expect(page.getByRole('link', { name: document.title })).toBeVisible();
+});
+
+test('[DOCUMENT_FLOW]: add signature fields for duplicate recipients', async ({ page }) => {
+  const user = await seedUser();
+  const document = await seedBlankDocument(user);
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/documents/${document.id}/edit`,
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+
+  await page.getByPlaceholder('Email').fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').fill('Recipient');
+
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  await page.getByLabel('Email').nth(1).fill('recipient@documenso.com');
+  await page.getByLabel('Name').nth(1).fill('Recipient');
+
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  await page.getByLabel('Email').nth(2).fill('recipient@documenso.com');
+  await page.getByLabel('Name').nth(2).fill('Recipient');
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  // Add signature fields for each recipient
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 100,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Recipient (recipient@documenso.com)' }).nth(1).click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 200,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Recipient (recipient@documenso.com)' }).nth(2).click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 300,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Distribute Document' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Send' }).click();
+
+  await page.waitForURL('**/documents');
+
+  await expect(page.getByRole('link', { name: document.title })).toBeVisible();
+});
+
+test('[DOCUMENT_FLOW]: add signature fields for recipients with different roles', async ({
+  page,
+}) => {
+  const user = await seedUser();
+  const document = await seedBlankDocument(user);
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/documents/${document.id}/edit`,
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+
+  // Add a signer
+  await page.getByPlaceholder('Email').fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').fill('Documenso Recipient');
+  await page.getByRole('combobox').click();
+  await page.getByLabel('Needs to sign').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Add an approver
+  await page.getByLabel('Email').nth(1).fill('recipient@documenso.com');
+  await page.getByLabel('Name').nth(1).fill('Documenso Recipient');
+  await page.getByRole('combobox').nth(1).click();
+  await page.getByLabel('Needs to approve').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Add a viewer
+  await page.getByLabel('Email').nth(2).fill('recipient@documenso.com');
+  await page.getByLabel('Name').nth(2).fill('Documenso Recipient');
+  await page.getByRole('combobox').nth(2).click();
+  await page.getByLabel('Needs to view').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Add a CC
+  await page.getByLabel('Email').nth(3).fill('recipient@documenso.com');
+  await page.getByLabel('Name').nth(3).fill('Documenso Recipient');
+  await page.getByRole('combobox').nth(3).click();
+  await page.getByLabel('Receives copy').click();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  // Add signature fields for signer and approver
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 100,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page
+    .getByRole('option', { name: 'Documenso Recipient (recipient@documenso.com)' })
+    .nth(1)
+    .click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 200,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Distribute Document' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Send' }).click();
+
+  await page.waitForURL('**/documents');
+
+  await expect(page.getByRole('link', { name: document.title })).toBeVisible();
+});
+
+test('[DOCUMENT_FLOW]: add signature fields for mixed recipients', async ({ page }) => {
+  const user = await seedUser();
+  const document = await seedBlankDocument(user);
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/documents/${document.id}/edit`,
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+
+  // First recipient (unique)
+  await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
+  await page.getByPlaceholder('Name').fill('First Recipient');
+  await page.getByRole('combobox').click();
+  await page.getByLabel('Needs to approve').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Second recipient (duplicate of first)
+  await page.getByLabel('Email').nth(1).fill('recipient1@documenso.com');
+  await page.getByLabel('Name').nth(1).fill('First Recipient');
+  await page.getByRole('combobox').nth(1).click();
+  await page.getByLabel('Needs to view').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Third recipient (unique)
+  await page.getByLabel('Email').nth(2).fill('recipient2@documenso.com');
+  await page.getByLabel('Name').nth(2).fill('Second Recipient');
+  await page.getByRole('combobox').nth(2).click();
+  await page.getByLabel('Needs to sign').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Fourth recipient (duplicate of first)
+  await page.getByLabel('Email').nth(3).fill('recipient1@documenso.com');
+  await page.getByLabel('Name').nth(3).fill('First Recipient');
+  await page.getByRole('combobox').nth(3).click();
+  await page.getByLabel('Receives copy').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Fifth recipient (unique)
+  await page.getByLabel('Email').nth(4).fill('recipient3@documenso.com');
+  await page.getByLabel('Name').nth(4).fill('Third Recipient');
+  await page.getByRole('combobox').nth(4).click();
+  await page.getByLabel('Needs to sign').click();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  // Add signature fields for approver and signers
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 100,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Second Recipient (recipient2@documenso.com)' }).click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 200,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Third Recipient (recipient3@documenso.com)' }).click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 300,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Distribute Document' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Send' }).click();
+
+  await page.waitForURL('**/documents');
+
+  await expect(page.getByRole('link', { name: document.title })).toBeVisible();
+});
@@ -91,3 +91,191 @@ test('[DOCUMENT_FLOW]: add signers', async ({ page }) => {
  await page.getByRole('button', { name: 'Go Back' }).click();
  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
 });
+
+test('[DOCUMENT_FLOW]: add only recipients with the same email address', async ({ page }) => {
+  const user = await seedUser();
+  const document = await seedBlankDocument(user);
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/documents/${document.id}/edit`,
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+
+  await page.getByPlaceholder('Email').fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').fill('Recipient');
+
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  await page.getByLabel('Email').nth(1).fill('recipient@documenso.com');
+  await page.getByLabel('Name').nth(1).fill('Recipient');
+
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  await page.getByLabel('Email').nth(2).fill('recipient@documenso.com');
+  await page.getByLabel('Name').nth(2).fill('Recipient');
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Go Back' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+});
+
+test('[DOCUMENT_FLOW]: duplicate email recipients', async ({ page }) => {
+  const user = await seedUser();
+  const document = await seedBlankDocument(user);
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/documents/${document.id}/edit`,
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+
+  // Add a signer
+  await page.getByPlaceholder('Email').fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').fill('Documenso Recipient');
+  await page.getByRole('combobox').click();
+  await page.getByLabel('Needs to sign').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Add an approver
+  await page.getByLabel('Email').nth(1).fill('recipient@documenso.com');
+  await page.getByLabel('Name').nth(1).fill('Documenso Recipient');
+  await page.getByRole('combobox').nth(1).click();
+  await page.getByLabel('Needs to approve').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Add a viewer
+  await page.getByLabel('Email').nth(2).fill('recipient@documenso.com');
+  await page.getByLabel('Name').nth(2).fill('Documenso Recipient');
+  await page.getByRole('combobox').nth(2).click();
+  await page.getByLabel('Needs to view').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Add a CC
+  await page.getByLabel('Email').nth(3).fill('recipient@documenso.com');
+  await page.getByLabel('Name').nth(3).fill('Documenso Recipient');
+  await page.getByRole('combobox').nth(3).click();
+  await page.getByLabel('Receives copy').click();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Go Back' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+});
+
+test('[DOCUMENT_FLOW]: same email with different roles', async ({ page }) => {
+  const user = await seedUser();
+  const document = await seedBlankDocument(user);
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/documents/${document.id}/edit`,
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+
+  // First recipient (unique)
+  await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
+  await page.getByPlaceholder('Name').fill('First Recipient');
+  await page.getByRole('combobox').click();
+  await page.getByLabel('Needs to approve').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Second recipient (duplicate of first)
+  await page.getByLabel('Email').nth(1).fill('recipient1@documenso.com');
+  await page.getByLabel('Name').nth(1).fill('First Recipient');
+  await page.getByRole('combobox').nth(1).click();
+  await page.getByLabel('Needs to view').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Third recipient (unique)
+  await page.getByLabel('Email').nth(2).fill('recipient2@documenso.com');
+  await page.getByLabel('Name').nth(2).fill('Second Recipient');
+  await page.getByRole('combobox').nth(2).click();
+  await page.getByLabel('Needs to sign').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Fourth recipient (duplicate of first)
+  await page.getByLabel('Email').nth(3).fill('recipient1@documenso.com');
+  await page.getByLabel('Name').nth(3).fill('First Recipient');
+  await page.getByRole('combobox').nth(3).click();
+  await page.getByLabel('Receives copy').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Fifth recipient (unique)
+  await page.getByLabel('Email').nth(4).fill('recipient3@documenso.com');
+  await page.getByLabel('Name').nth(4).fill('Third Recipient');
+  await page.getByRole('combobox').nth(4).click();
+  await page.getByLabel('Needs to sign').click();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Go Back' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+});
+
+test('[DOCUMENT_FLOW]: mixed unique and duplicate recipients', async ({ page }) => {
+  const user = await seedUser();
+  const document = await seedBlankDocument(user);
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/documents/${document.id}/edit`,
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+
+  // First recipient (unique)
+  await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
+  await page.getByPlaceholder('Name').fill('First Recipient');
+  await page.getByRole('combobox').click();
+  await page.getByLabel('Needs to approve').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Second recipient (duplicate of first)
+  await page.getByLabel('Email').nth(1).fill('recipient1@documenso.com');
+  await page.getByLabel('Name').nth(1).fill('First Recipient');
+  await page.getByRole('combobox').nth(1).click();
+  await page.getByLabel('Needs to view').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Third recipient (unique)
+  await page.getByLabel('Email').nth(2).fill('recipient2@documenso.com');
+  await page.getByLabel('Name').nth(2).fill('Second Recipient');
+  await page.getByRole('combobox').nth(2).click();
+  await page.getByLabel('Needs to sign').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Fourth recipient (duplicate of first)
+  await page.getByLabel('Email').nth(3).fill('recipient1@documenso.com');
+  await page.getByLabel('Name').nth(3).fill('First Recipient');
+  await page.getByRole('combobox').nth(3).click();
+  await page.getByLabel('Receives copy').click();
+  await page.getByRole('button', { name: 'Add Signer' }).click();
+
+  // Fifth recipient (unique)
+  await page.getByLabel('Email').nth(4).fill('recipient3@documenso.com');
+  await page.getByLabel('Name').nth(4).fill('Third Recipient');
+  await page.getByRole('combobox').nth(4).click();
+  await page.getByLabel('Needs to sign').click();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Go Back' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+});
@@ -2,9 +2,7 @@ import { expect, test } from '@playwright/test';
 import { DateTime } from 'luxon';
 import path from 'node:path';

-import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
 import { getRecipientByEmail } from '@documenso/lib/server-only/recipient/get-recipient-by-email';
-import { getRecipientById } from '@documenso/lib/server-only/recipient/get-recipient-by-id';
 import { prisma } from '@documenso/prisma';
 import {
  DocumentSigningOrder,
@@ -614,7 +612,7 @@ test('[DOCUMENT_FLOW]: should be able to create and sign a document with 3 recip
      expect(previousRecipient?.signingStatus).toBe(SigningStatus.SIGNED);
    }

-    await page.goto(`/sign/${recipient!.token}`);
+    await page.goto(`/sign/${recipient?.token}`);
    await expect(page.getByRole('heading', { name: 'Sign Document' })).toBeVisible();

    await page.locator(`#field-${recipientField.id}`).getByRole('button').click();
@@ -632,22 +630,24 @@ test('[DOCUMENT_FLOW]: should be able to create and sign a document with 3 recip
    await page.getByRole('button', { name: 'Complete' }).click();
    await page.getByRole('button', { name: 'Sign' }).click();

-    await page.waitForURL(`/sign/${recipient!.token}/complete`);
+    await page.waitForURL(`/sign/${recipient?.token}/complete`);
    await expect(page.getByText('Document Signed')).toBeVisible();

-    const updatedRecipient = await getRecipientById({
-      documentId: document.id,
-      id: recipient!.id,
+    const updatedRecipient = await prisma.recipient.findFirst({
+      where: { id: recipient?.id },
    });

    expect(updatedRecipient?.signingStatus).toBe(SigningStatus.SIGNED);
  }

  // Wait for the document to be signed.
-  await expect(async () => {
-    const signedDocument = await getDocumentById({ id: document.id, userId: user.id });
-    expect(signedDocument?.status).toBe(DocumentStatus.COMPLETED);
-  }).toPass();
+  await page.waitForTimeout(5000);
+
+  const finalDocument = await prisma.document.findFirst({
+    where: { id: createdDocument?.id },
+  });
+
+  expect(finalDocument?.status).toBe(DocumentStatus.COMPLETED);
 });

 test('[DOCUMENT_FLOW]: should prevent out-of-order signing in sequential mode', async ({
@@ -655,7 +655,7 @@ test('[DOCUMENT_FLOW]: should prevent out-of-order signing in sequential mode',
 }) => {
  const user = await seedUser();

-  const { recipients } = await seedPendingDocumentWithFullFields({
+  const { document, recipients } = await seedPendingDocumentWithFullFields({
    owner: user,
    recipients: ['user1@example.com', 'user2@example.com', 'user3@example.com'],
    fields: [FieldType.SIGNATURE],
@@ -682,85 +682,3 @@ test('[DOCUMENT_FLOW]: should prevent out-of-order signing in sequential mode',
  await expect(page).not.toHaveURL(`/sign/${activeRecipient?.token}/waiting`);
  await expect(page.getByRole('heading', { name: 'Sign Document' })).toBeVisible();
 });
-
-test('[DOCUMENT_FLOW]: should be able to self sign a document', async ({ page }) => {
-  const user = await seedUser();
-  const document = await seedBlankDocument(user);
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/documents/${document.id}/edit`,
-  });
-
-  const documentTitle = `Self-Signing-${Date.now()}.pdf`;
-
-  await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
-  await page.getByLabel('Title').fill(documentTitle);
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
-  await page.getByRole('button', { name: 'Add myself' }).click();
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-
-  await page.getByRole('button', { name: 'Signature' }).click();
-  await page.locator('canvas').click({
-    position: {
-      x: 100,
-      y: 100,
-    },
-  });
-
-  await page.getByRole('button', { name: 'Sign', exact: true }).click();
-
-  const documentRecipients = await prisma.recipient.findMany({
-    where: {
-      documentId: document.id,
-    },
-  });
-
-  const { token, email, id: recipientId } = documentRecipients[0];
-
-  expect(documentRecipients.length).toBe(1);
-  expect(email).toBe(user.email);
-
-  await page.waitForURL(`/sign/${token}`);
-  await expect(page.getByRole('heading', { name: documentTitle })).toBeVisible();
-
-  const { status } = await getDocumentByToken(token);
-  expect(status).toBe(DocumentStatus.PENDING);
-
-  const fields = await prisma.field.findMany({
-    where: { recipientId, documentId: document.id },
-  });
-  const recipientField = fields[0];
-  expect(recipientField).not.toBeNull();
-
-  await page.locator(`#field-${recipientField.id}`).getByRole('button').click();
-
-  const canvas = page.locator('canvas#signature');
-  const box = await canvas.boundingBox();
-  if (box) {
-    await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
-    await page.mouse.down();
-    await page.mouse.move(box.x + box.width / 4, box.y + box.height / 4);
-    await page.mouse.up();
-  }
-
-  await page.getByRole('button', { name: 'Sign', exact: true }).click();
-  await page.getByRole('button', { name: 'Complete' }).click();
-  await page.getByRole('button', { name: 'Sign' }).click();
-
-  await page.waitForURL(`/sign/${token}/complete`);
-  await expect(page.getByText('Document Signed')).toBeVisible();
-
-  const updatedRecipient = await getRecipientById({ documentId: document.id, id: recipientId });
-  expect(updatedRecipient?.signingStatus).toBe(SigningStatus.SIGNED);
-
-  await expect(async () => {
-    const signedDocument = await getDocumentById({ id: document.id, userId: user.id });
-    expect(signedDocument?.status).toBe(DocumentStatus.COMPLETED);
-  }).toPass();
-});
@@ -0,0 +1,292 @@
+import { expect, test } from '@playwright/test';
+
+import { seedBlankTemplate } from '@documenso/prisma/seed/templates';
+import { seedUser } from '@documenso/prisma/seed/users';
+
+import { apiSignin } from '../fixtures/authentication';
+
+test.describe.configure({ mode: 'parallel' });
+
+test('[TEMPLATE_FLOW]: add signature fields for unique recipients', async ({ page }) => {
+  const user = await seedUser();
+  const template = await seedBlankTemplate(user);
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/templates/${template.id}/edit`,
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Placeholders' })).toBeVisible();
+
+  // Add 2 placeholder recipients.
+  await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
+  await page.getByPlaceholder('Name').fill('Recipient 1');
+
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  await page.getByPlaceholder('Email').nth(1).fill('recipient2@documenso.com');
+  await page.getByPlaceholder('Name').nth(1).fill('Recipient 2');
+
+  // Advanced settings should not be visible for non EE users.
+  await expect(page.getByLabel('Show advanced settings')).toBeHidden();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 100,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Recipient 2 (recipient2@documenso.com)' }).click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 200,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('button', { name: 'Save Template' }).click();
+
+  await page.waitForURL('**/templates');
+
+  await expect(page.getByRole('link', { name: template.title })).toBeVisible();
+});
+
+test('[TEMPLATE_FLOW]: add signature fields for duplicate recipients', async ({ page }) => {
+  const user = await seedUser();
+  const template = await seedBlankTemplate(user);
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/templates/${template.id}/edit`,
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Placeholders' })).toBeVisible();
+
+  await page.getByPlaceholder('Email').fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').fill('Recipient');
+
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  await page.getByPlaceholder('Email').nth(1).fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').nth(1).fill('Recipient');
+
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  await page.getByPlaceholder('Email').nth(2).fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').nth(2).fill('Recipient');
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  // Add signature fields for each recipient
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 100,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Recipient (recipient@documenso.com)' }).nth(1).click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 200,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Recipient (recipient@documenso.com)' }).nth(2).click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 300,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('button', { name: 'Save Template' }).click();
+
+  await page.waitForURL('**/templates');
+
+  await expect(page.getByRole('link', { name: template.title })).toBeVisible();
+});
+
+test('[TEMPLATE_FLOW]: add signature fields for recipients with different roles', async ({
+  page,
+}) => {
+  const user = await seedUser();
+  const template = await seedBlankTemplate(user);
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/templates/${template.id}/edit`,
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Placeholders' })).toBeVisible();
+
+  // Add a placeholder recipient
+  await page.getByPlaceholder('Email').fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').fill('Documenso Recipient');
+  await page.getByRole('combobox').click();
+  await page.getByLabel('Needs to sign').click();
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  // Add an approver
+  await page.getByPlaceholder('Email').nth(1).fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').nth(1).fill('Documenso Recipient');
+  await page.getByRole('combobox').nth(1).click();
+  await page.getByLabel('Needs to approve').click();
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  // Add a viewer
+  await page.getByPlaceholder('Email').nth(2).fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').nth(2).fill('Documenso Recipient');
+  await page.getByRole('combobox').nth(2).click();
+  await page.getByLabel('Needs to view').click();
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  // Add a CC
+  await page.getByPlaceholder('Email').nth(3).fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').nth(3).fill('Documenso Recipient');
+  await page.getByRole('combobox').nth(3).click();
+  await page.getByLabel('Receives copy').click();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  // Add signature fields for signer and approver
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 100,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page
+    .getByRole('option', { name: 'Documenso Recipient (recipient@documenso.com)' })
+    .nth(1)
+    .click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 200,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('button', { name: 'Save Template' }).click();
+
+  await page.waitForURL('**/templates');
+
+  await expect(page.getByRole('link', { name: template.title })).toBeVisible();
+});
+
+test('[TEMPLATE_FLOW]: add signature fields for mixed recipients', async ({ page }) => {
+  const user = await seedUser();
+  const template = await seedBlankTemplate(user);
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/templates/${template.id}/edit`,
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Placeholders' })).toBeVisible();
+
+  // First placeholder recipient (unique)
+  await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
+  await page.getByPlaceholder('Name').fill('First Recipient');
+  await page.getByRole('combobox').click();
+  await page.getByLabel('Needs to approve').click();
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  // Second placeholder recipient (duplicate of first)
+  await page.getByPlaceholder('Email').nth(1).fill('recipient1@documenso.com');
+  await page.getByPlaceholder('Name').nth(1).fill('First Recipient');
+  await page.getByRole('combobox').nth(1).click();
+  await page.getByLabel('Needs to view').click();
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  // Third placeholder recipient (unique)
+  await page.getByPlaceholder('Email').nth(2).fill('recipient2@documenso.com');
+  await page.getByPlaceholder('Name').nth(2).fill('Second Recipient');
+  await page.getByRole('combobox').nth(2).click();
+  await page.getByLabel('Needs to sign').click();
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  // Fourth placeholder recipient (duplicate of first)
+  await page.getByPlaceholder('Email').nth(3).fill('recipient1@documenso.com');
+  await page.getByPlaceholder('Name').nth(3).fill('First Recipient');
+  await page.getByRole('combobox').nth(3).click();
+  await page.getByLabel('Receives copy').click();
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  // Fifth placeholder recipient (unique)
+  await page.getByPlaceholder('Email').nth(4).fill('recipient3@documenso.com');
+  await page.getByPlaceholder('Name').nth(4).fill('Third Recipient');
+  await page.getByRole('combobox').nth(4).click();
+  await page.getByLabel('Needs to sign').click();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  // Add signature fields for approver and signers
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 100,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Second Recipient (recipient2@documenso.com)' }).click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 200,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Third Recipient (recipient3@documenso.com)' }).click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 300,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('button', { name: 'Save Template' }).click();
+
+  await page.waitForURL('**/templates');
+
+  await expect(page.getByRole('link', { name: template.title })).toBeVisible();
+});
@@ -98,3 +98,135 @@ test('[TEMPLATE_FLOW]: add placeholder', async ({ page }) => {
  // Advanced settings should not be visible for non EE users.
  await expect(page.getByLabel('Show advanced settings')).toBeHidden();
 });
+
+test('[TEMPLATE_FLOW]: duplicate recipients', async ({ page }) => {
+  const user = await seedUser();
+  const template = await seedBlankTemplate(user);
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/templates/${template.id}/edit`,
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Placeholder' })).toBeVisible();
+
+  await page.getByPlaceholder('Email').fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').fill('Recipient');
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  await page.getByPlaceholder('Email').nth(1).fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').nth(1).fill('Recipient');
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  await page.getByPlaceholder('Email').nth(2).fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').nth(2).fill('Recipient');
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Go Back' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Placeholder' })).toBeVisible();
+});
+
+test('[TEMPLATE_FLOW]: same email different roles', async ({ page }) => {
+  const user = await seedUser();
+  const template = await seedBlankTemplate(user);
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/templates/${template.id}/edit`,
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Placeholder' })).toBeVisible();
+
+  // Add a signer
+  await page.getByPlaceholder('Email').fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').fill('Documenso Recipient');
+  await page.getByRole('combobox').click();
+  await page.getByLabel('Needs to sign').click();
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  // Add an approver
+  await page.getByPlaceholder('Email').nth(1).fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').nth(1).fill('Documenso Recipient');
+  await page.getByRole('combobox').nth(1).click();
+  await page.getByLabel('Needs to approve').click();
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  // Add a viewer
+  await page.getByPlaceholder('Email').nth(2).fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').nth(2).fill('Documenso Recipient');
+  await page.getByRole('combobox').nth(2).click();
+  await page.getByLabel('Needs to view').click();
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  // Add a CC
+  await page.getByPlaceholder('Email').nth(3).fill('recipient@documenso.com');
+  await page.getByPlaceholder('Name').nth(3).fill('Documenso Recipient');
+  await page.getByRole('combobox').nth(3).click();
+  await page.getByLabel('Receives copy').click();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Go Back' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Placeholder' })).toBeVisible();
+});
+
+test('[TEMPLATE_FLOW]: mixed recipients', async ({ page }) => {
+  const user = await seedUser();
+  const template = await seedBlankTemplate(user);
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/templates/${template.id}/edit`,
+  });
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Placeholder' })).toBeVisible();
+
+  // First recipient (unique)
+  await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
+  await page.getByPlaceholder('Name').fill('First Recipient');
+  await page.getByRole('combobox').click();
+  await page.getByLabel('Needs to approve').click();
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  // Second recipient (duplicate of first)
+  await page.getByPlaceholder('Email').nth(1).fill('recipient1@documenso.com');
+  await page.getByPlaceholder('Name').nth(1).fill('First Recipient');
+  await page.getByRole('combobox').nth(1).click();
+  await page.getByLabel('Needs to view').click();
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  // Third recipient (unique)
+  await page.getByPlaceholder('Email').nth(2).fill('recipient2@documenso.com');
+  await page.getByPlaceholder('Name').nth(2).fill('Second Recipient');
+  await page.getByRole('combobox').nth(2).click();
+  await page.getByLabel('Needs to sign').click();
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  // Fourth recipient (duplicate of first)
+  await page.getByPlaceholder('Email').nth(3).fill('recipient1@documenso.com');
+  await page.getByPlaceholder('Name').nth(3).fill('First Recipient');
+  await page.getByRole('combobox').nth(3).click();
+  await page.getByLabel('Receives copy').click();
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  // Fifth recipient (unique)
+  await page.getByPlaceholder('Email').nth(4).fill('recipient3@documenso.com');
+  await page.getByPlaceholder('Name').nth(4).fill('Third Recipient');
+  await page.getByRole('combobox').nth(4).click();
+  await page.getByLabel('Needs to sign').click();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Go Back' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Placeholder' })).toBeVisible();
+});
@@ -110,14 +110,13 @@ test('[TEMPLATE]: should create a document from a template', async ({ page }) =>
  await page.getByRole('button', { name: 'Save template' }).click();

  // Use template
-  await page.waitForURL('/templates');
+  await page.waitForURL('**/templates');
  await page.getByRole('button', { name: 'Use Template' }).click();
  await page.getByRole('button', { name: 'Create as draft' }).click();

  // Review that the document was created with the correct values.
-  await page.waitForURL(/documents/);
-
-  const documentId = Number(page.url().split('/').pop());
+  await page.waitForURL(/\/documents\/\d+/);
+  const documentId = Number(page.url().match(/\/documents\/(\d+)/)?.[1]);

  const document = await prisma.document.findFirstOrThrow({
    where: {
@@ -250,9 +249,8 @@ test('[TEMPLATE]: should create a team document from a team template', async ({
  await page.getByRole('button', { name: 'Create as draft' }).click();

  // Review that the document was created with the correct values.
-  await page.waitForURL(/documents/);
-
-  const documentId = Number(page.url().split('/').pop());
+  await page.waitForURL(/\/documents\/\d+/);
+  const documentId = Number(page.url().match(/\/documents\/(\d+)/)?.[1]);

  const document = await prisma.document.findFirstOrThrow({
    where: {
@@ -353,9 +351,8 @@ test('[TEMPLATE]: should create a document from a template with custom document'
    await page.getByRole('button', { name: 'Create as draft' }).click();

    // Review that the document was created with the custom document data
-    await page.waitForURL(/documents/);
-
-    const documentId = Number(page.url().split('/').pop());
+    await page.waitForURL(/\/documents\/\d+/);
+    const documentId = Number(page.url().match(/\/documents\/(\d+)/)?.[1]);

    const document = await prisma.document.findFirstOrThrow({
      where: {
@@ -434,9 +431,8 @@ test('[TEMPLATE]: should create a team document from a template with custom docu
    await page.getByRole('button', { name: 'Create as draft' }).click();

    // Review that the document was created with the custom document data
-    await page.waitForURL(/documents/);
-
-    const documentId = Number(page.url().split('/').pop());
+    await page.waitForURL(/\/documents\/\d+/);
+    const documentId = Number(page.url().match(/\/documents\/(\d+)/)?.[1]);

    const document = await prisma.document.findFirstOrThrow({
      where: {
@@ -500,9 +496,8 @@ test('[TEMPLATE]: should create a document from a template using template docume
  await page.getByRole('button', { name: 'Create as draft' }).click();

  // Review that the document was created with the template's document data
-  await page.waitForURL(/documents/);
-
-  const documentId = Number(page.url().split('/').pop());
+  await page.waitForURL(/\/documents\/\d+/);
+  const documentId = Number(page.url().match(/\/documents\/(\d+)/)?.[1]);

  const document = await prisma.document.findFirstOrThrow({
    where: {
@@ -591,9 +586,8 @@ test('[TEMPLATE]: should persist document visibility when creating from template
  await page.getByRole('button', { name: 'Create as draft' }).click();

  // Review that the document was created with the correct visibility
-  await page.waitForURL(/documents/);
-
-  const documentId = Number(page.url().split('/').pop());
+  await page.waitForURL(/\/documents\/\d+/);
+  const documentId = Number(page.url().match(/\/documents\/(\d+)/)?.[1]);

  const document = await prisma.document.findFirstOrThrow({
    where: {
@@ -616,3 +610,368 @@ test('[TEMPLATE]: should persist document visibility when creating from template
  // Template should not be visible to regular member
  await expect(page.getByRole('button', { name: 'Use Template' })).not.toBeVisible();
 });
+
+/**
+ * This test verifies that we can create a document from a template with duplicate recipients
+ **/
+test('[TEMPLATE]: should create a document from a template with duplicate recipients', async ({
+  page,
+}) => {
+  const user = await seedUser();
+  const template = await seedBlankTemplate(user);
+
+  const isBillingEnabled =
+    process.env.NEXT_PUBLIC_FEATURE_BILLING_ENABLED === 'true' && enterprisePriceId;
+
+  await seedUserSubscription({
+    userId: user.id,
+    priceId: enterprisePriceId,
+  });
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/templates/${template.id}/edit`,
+  });
+
+  // Set template title.
+  await page.getByLabel('Title').fill('TEMPLATE_TITLE');
+
+  // Set template document access.
+  await page.getByTestId('documentAccessSelectValue').click();
+  await page.getByLabel('Require account').getByText('Require account').click();
+  await expect(page.getByTestId('documentAccessSelectValue')).toContainText('Require account');
+
+  // Set EE action auth.
+  if (isBillingEnabled) {
+    await page.getByTestId('documentActionSelectValue').click();
+    await page.getByLabel('Require passkey').getByText('Require passkey').click();
+    await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require passkey');
+  }
+
+  // Set email options.
+  await page.getByRole('button', { name: 'Email Options' }).click();
+  await page.getByLabel('Subject (Optional)').fill('SUBJECT');
+  await page.getByLabel('Message (Optional)').fill('MESSAGE');
+
+  // Set advanced options.
+  await page.getByRole('button', { name: 'Advanced Options' }).click();
+  await page.locator('button').filter({ hasText: 'YYYY-MM-DD HH:mm a' }).click();
+  await page.getByLabel('DD/MM/YYYY').click();
+
+  await page.locator('.time-zone-field').click();
+  await page.getByRole('option', { name: 'Etc/UTC' }).click();
+  await page.getByLabel('Redirect URL').fill('https://documenso.com');
+  await page.getByRole('button', { name: 'Continue' }).click();
+
+  await expect(page.getByRole('heading', { name: 'Add Placeholder' })).toBeVisible();
+
+  // Add 2 signers.
+  await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
+  await page.getByPlaceholder('Name').fill('Recipient 1');
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+  await page.getByPlaceholder('Email').nth(1).fill('recipient1@documenso.com');
+  await page.getByPlaceholder('Name').nth(1).fill('Recipient 1');
+
+  // Apply require passkey for Recipient 1.
+  if (isBillingEnabled) {
+    await page.getByLabel('Show advanced settings').check();
+    await page.getByRole('combobox').first().click();
+    await page.getByLabel('Require passkey').click();
+  }
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  // Add signature fields for each recipient
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 100,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Recipient 1 (recipient1@documenso.com)' }).nth(1).click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 200,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('button', { name: 'Save template' }).click();
+
+  // Use template
+  await page.waitForURL('**/templates');
+  await page.getByRole('button', { name: 'Use Template' }).click();
+  await page.getByRole('button', { name: 'Create as draft' }).click();
+
+  // Review that the document was created with the correct values.
+  await page.waitForURL(/\/documents\/\d+/);
+  const documentId = Number(page.url().match(/\/documents\/(\d+)/)?.[1]);
+
+  const document = await prisma.document.findFirstOrThrow({
+    where: {
+      id: documentId,
+    },
+    include: {
+      recipients: true,
+      documentMeta: true,
+    },
+  });
+
+  const documentAuth = extractDocumentAuthMethods({
+    documentAuth: document.authOptions,
+  });
+
+  expect(document.title).toEqual('TEMPLATE_TITLE');
+  expect(documentAuth.documentAuthOption.globalAccessAuth).toEqual('ACCOUNT');
+  expect(documentAuth.documentAuthOption.globalActionAuth).toEqual(
+    isBillingEnabled ? 'PASSKEY' : null,
+  );
+  expect(document.documentMeta?.dateFormat).toEqual('dd/MM/yyyy hh:mm a');
+  expect(document.documentMeta?.message).toEqual('MESSAGE');
+  expect(document.documentMeta?.redirectUrl).toEqual('https://documenso.com');
+  expect(document.documentMeta?.subject).toEqual('SUBJECT');
+  expect(document.documentMeta?.timezone).toEqual('Etc/UTC');
+
+  const recipientOne = document.recipients[0];
+  const recipientTwo = document.recipients[1];
+
+  const recipientOneAuth = extractDocumentAuthMethods({
+    documentAuth: document.authOptions,
+    recipientAuth: recipientOne.authOptions,
+  });
+
+  const recipientTwoAuth = extractDocumentAuthMethods({
+    documentAuth: document.authOptions,
+    recipientAuth: recipientTwo.authOptions,
+  });
+
+  if (isBillingEnabled) {
+    expect(recipientOneAuth.derivedRecipientActionAuth).toEqual('PASSKEY');
+  }
+
+  expect(recipientOneAuth.derivedRecipientAccessAuth).toEqual('ACCOUNT');
+  expect(recipientTwoAuth.derivedRecipientAccessAuth).toEqual('ACCOUNT');
+
+  await page.getByRole('link', { name: 'Edit' }).click();
+  await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  await expect(page.getByText('SignatureRE').first()).toBeVisible();
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'recipient1@documenso.com' }).nth(1).click();
+
+  await expect(page.getByText('SignatureRE').nth(1)).toBeVisible();
+});
+
+/**
+ * This test verifies that we can create a document from a template with a mix of duplicate and unique recipients
+ **/
+test('[TEMPLATE]: should create a document from a template with mixed duplicate and unique recipients', async ({
+  page,
+}) => {
+  const user = await seedUser();
+  const template = await seedBlankTemplate(user);
+
+  const isBillingEnabled =
+    process.env.NEXT_PUBLIC_FEATURE_BILLING_ENABLED === 'true' && enterprisePriceId;
+
+  await seedUserSubscription({
+    userId: user.id,
+    priceId: enterprisePriceId,
+  });
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/templates/${template.id}/edit`,
+  });
+
+  // Set template title.
+  await page.getByLabel('Title').fill('TEMPLATE_MIXED_RECIPIENTS');
+
+  // Set template document access.
+  await page.getByTestId('documentAccessSelectValue').click();
+  await page.getByLabel('Require account').getByText('Require account').click();
+  await expect(page.getByTestId('documentAccessSelectValue')).toContainText('Require account');
+
+  // Set EE action auth.
+  if (isBillingEnabled) {
+    await page.getByTestId('documentActionSelectValue').click();
+    await page.getByLabel('Require passkey').getByText('Require passkey').click();
+    await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require passkey');
+  }
+
+  // Set email options.
+  await page.getByRole('button', { name: 'Email Options' }).click();
+  await page.getByLabel('Subject (Optional)').fill('SUBJECT');
+  await page.getByLabel('Message (Optional)').fill('MESSAGE');
+
+  // Set advanced options.
+  await page.getByRole('button', { name: 'Advanced Options' }).click();
+  await page.locator('button').filter({ hasText: 'YYYY-MM-DD HH:mm a' }).click();
+  await page.getByLabel('DD/MM/YYYY').click();
+
+  await page.locator('.time-zone-field').click();
+  await page.getByRole('option', { name: 'Etc/UTC' }).click();
+  await page.getByLabel('Redirect URL').fill('https://documenso.com');
+  await page.getByRole('button', { name: 'Continue' }).click();
+
+  await expect(page.getByRole('heading', { name: 'Add Placeholder' })).toBeVisible();
+
+  // Add 4 signers: 2 duplicates of recipient1 and 2 unique recipients
+  await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
+  await page.getByPlaceholder('Name').fill('Recipient 1');
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  await page.getByPlaceholder('Email').nth(1).fill('recipient2@documenso.com');
+  await page.getByPlaceholder('Name').nth(1).fill('Recipient 2');
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  await page.getByPlaceholder('Email').nth(2).fill('recipient1@documenso.com');
+  await page.getByPlaceholder('Name').nth(2).fill('Recipient 1');
+  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+
+  await page.getByPlaceholder('Email').nth(3).fill('recipient3@documenso.com');
+  await page.getByPlaceholder('Name').nth(3).fill('Recipient 3');
+
+  // Apply require passkey for first instance of Recipient 1
+  if (isBillingEnabled) {
+    await page.getByLabel('Show advanced settings').check();
+    await page.getByRole('combobox').first().click();
+    await page.getByLabel('Require passkey').click();
+  }
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  // Add signature fields for each recipient
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 100,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Recipient 2 (recipient2@documenso.com)' }).click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 200,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Recipient 1 (recipient1@documenso.com)' }).nth(1).click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 300,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Recipient 3 (recipient3@documenso.com)' }).click();
+
+  await page.getByRole('button', { name: 'Signature' }).click();
+  await page.locator('canvas').click({
+    position: {
+      x: 400,
+      y: 100,
+    },
+  });
+
+  await page.getByRole('button', { name: 'Save template' }).click();
+
+  // Use template
+  await page.waitForURL('**/templates');
+  await page.getByRole('button', { name: 'Use Template' }).click();
+  await page.getByRole('button', { name: 'Create as draft' }).click();
+
+  // Review that the document was created with the correct values.
+  await page.waitForURL(/\/documents\/\d+/);
+  const documentId = Number(page.url().match(/\/documents\/(\d+)/)?.[1]);
+
+  const document = await prisma.document.findFirstOrThrow({
+    where: {
+      id: documentId,
+    },
+    include: {
+      recipients: {
+        orderBy: {
+          email: 'asc',
+        },
+      },
+      documentMeta: true,
+    },
+  });
+
+  const documentAuth = extractDocumentAuthMethods({
+    documentAuth: document.authOptions,
+  });
+
+  expect(document.title).toEqual('TEMPLATE_MIXED_RECIPIENTS');
+  expect(documentAuth.documentAuthOption.globalAccessAuth).toEqual('ACCOUNT');
+  expect(documentAuth.documentAuthOption.globalActionAuth).toEqual(
+    isBillingEnabled ? 'PASSKEY' : null,
+  );
+  expect(document.documentMeta?.dateFormat).toEqual('dd/MM/yyyy hh:mm a');
+  expect(document.documentMeta?.message).toEqual('MESSAGE');
+  expect(document.documentMeta?.redirectUrl).toEqual('https://documenso.com');
+  expect(document.documentMeta?.subject).toEqual('SUBJECT');
+  expect(document.documentMeta?.timezone).toEqual('Etc/UTC');
+
+  // Check auth settings for first instance of recipient1
+  const firstRecipientOne = document.recipients[0];
+  const firstRecipientOneAuth = extractDocumentAuthMethods({
+    documentAuth: document.authOptions,
+    recipientAuth: firstRecipientOne.authOptions,
+  });
+
+  if (isBillingEnabled) {
+    expect(firstRecipientOneAuth.derivedRecipientActionAuth).toEqual('PASSKEY');
+  }
+
+  expect(firstRecipientOneAuth.derivedRecipientAccessAuth).toEqual('ACCOUNT');
+
+  await page.getByRole('link', { name: 'Edit' }).click();
+  await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+  await expect(page.getByText('SignatureRE').first()).toBeVisible();
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'recipient2@documenso.com' }).click();
+  await expect(page.getByText('SignatureRE').nth(1)).toBeVisible();
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'recipient1@documenso.com' }).nth(1).click();
+  await expect(page.getByText('SignatureRE').nth(2)).toBeVisible();
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'recipient3@documenso.com' }).click();
+  await expect(page.getByText('SignatureRE').nth(3)).toBeVisible();
+});
@@ -1,177 +0,0 @@
-import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
-import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
-import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
-import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
-import { prisma } from '@documenso/prisma';
-import { DocumentStatus, RecipientRole, SendStatus, SigningStatus } from '@documenso/prisma/client';
-
-import { jobs } from '../../jobs/client';
-import { getFile } from '../../universal/upload/get-file';
-import { insertFormValuesInPdf } from '../pdf/insert-form-values-in-pdf';
-
-export type SelfSignDocumentOptions = {
-  documentId: number;
-  userId: number;
-  teamId?: number;
-  requestMetadata?: ApiRequestMetadata;
-};
-
-export const selfSignDocument = async ({
-  documentId,
-  userId,
-  teamId,
-  requestMetadata,
-}: SelfSignDocumentOptions) => {
-  const user = await prisma.user.findFirstOrThrow({
-    where: {
-      id: userId,
-    },
-    select: {
-      id: true,
-      name: true,
-      email: true,
-    },
-  });
-
-  const document = await prisma.document.findUnique({
-    where: {
-      id: documentId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
-    },
-    include: {
-      recipients: {
-        orderBy: [{ signingOrder: { sort: 'asc', nulls: 'last' } }, { id: 'asc' }],
-      },
-      documentMeta: true,
-      documentData: true,
-    },
-  });
-
-  if (!document) {
-    throw new Error('Document not found');
-  }
-
-  if (document.recipients.length === 0) {
-    throw new Error('Document has no recipients');
-  }
-
-  if (document.recipients.length !== 1 || document.recipients[0].email !== user.email) {
-    throw new Error('Invalid document for self-signing');
-  }
-
-  if (document.status === DocumentStatus.COMPLETED) {
-    throw new Error('Can not sign completed document');
-  }
-
-  const { documentData } = document;
-
-  if (!documentData || !documentData.data) {
-    throw new Error('Document data not found');
-  }
-
-  if (document.formValues) {
-    const file = await getFile(documentData);
-
-    const prefilled = await insertFormValuesInPdf({
-      pdf: Buffer.from(file),
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      formValues: document.formValues as Record<string, string | number | boolean>,
-    });
-
-    const newDocumentData = await putPdfFile({
-      name: document.title,
-      type: 'application/pdf',
-      arrayBuffer: async () => Promise.resolve(prefilled),
-    });
-
-    const result = await prisma.document.update({
-      where: {
-        id: document.id,
-      },
-      data: {
-        documentDataId: newDocumentData.id,
-      },
-    });
-
-    Object.assign(document, result);
-  }
-
-  const recipientHasNoActionToTake =
-    document.recipients[0].role === RecipientRole.CC ||
-    document.recipients[0].signingStatus === SigningStatus.SIGNED;
-
-  if (recipientHasNoActionToTake) {
-    await jobs.triggerJob({
-      name: 'internal.seal-document',
-      payload: {
-        documentId,
-        requestMetadata: requestMetadata?.requestMetadata,
-      },
-    });
-
-    return await prisma.document.findFirstOrThrow({
-      where: {
-        id: documentId,
-      },
-      include: {
-        recipients: true,
-      },
-    });
-  }
-
-  const updatedDocument = await prisma.$transaction(async (tx) => {
-    if (document.status === DocumentStatus.DRAFT) {
-      await tx.documentAuditLog.create({
-        data: createDocumentAuditLogData({
-          type: DOCUMENT_AUDIT_LOG_TYPE.SELF_SIGN,
-          documentId: document.id,
-          requestMetadata: requestMetadata?.requestMetadata,
-          user,
-          data: {
-            recipientId: document.recipients[0].id,
-            recipientEmail: document.recipients[0].email,
-            recipientName: document.recipients[0].name,
-            recipientRole: document.recipients[0].role,
-          },
-        }),
-      });
-    }
-
-    await tx.recipient.update({
-      where: {
-        id: document.recipients[0].id,
-      },
-      data: {
-        sendStatus: SendStatus.SENT,
-      },
-    });
-
-    return await tx.document.update({
-      where: {
-        id: documentId,
-      },
-      data: {
-        status: DocumentStatus.PENDING,
-      },
-      include: {
-        recipients: true,
-      },
-    });
-  });
-
-  return updatedDocument;
-};
@@ -94,7 +94,7 @@ export const sendDocument = async ({

  const { documentData } = document;

-  if (!documentData || !documentData.data) {
+  if (!documentData.data) {
    throw new Error('Document data not found');
  }

@@ -72,6 +72,22 @@ export const setFieldsForDocument = async ({
    });
  }

+  // Check that every signer has a signature field
+  const signers = document.recipients.filter((recipient) => recipient.role === 'SIGNER');
+  const hasEverySignerSignature = signers.every((signer) =>
+    fields.some(
+      (field) =>
+        (field.type === FieldType.SIGNATURE || field.type === FieldType.FREE_SIGNATURE) &&
+        field.recipientId === signer.id,
+    ),
+  );
+
+  if (!hasEverySignerSignature) {
+    throw new AppError(AppErrorCode.INVALID_REQUEST, {
+      message: 'Every signer must have at least one signature field',
+    });
+  }
+
  if (document.completedAt) {
    throw new AppError(AppErrorCode.INVALID_REQUEST, {
      message: 'Document already complete',
@@ -94,9 +110,7 @@ export const setFieldsForDocument = async ({
  const linkedFields = fields.map((field) => {
    const existing = existingFields.find((existingField) => existingField.id === field.id);

-    const recipient = document.recipients.find(
-      (recipient) => recipient.email.toLowerCase() === field.signerEmail.toLowerCase(),
-    );
+    const recipient = document.recipients.find((recipient) => recipient.id === field.recipientId);

    // Each field MUST have a recipient associated with it.
    if (!recipient) {
@@ -236,10 +250,8 @@ export const setFieldsForDocument = async ({
            },
            recipient: {
              connect: {
-                documentId_email: {
-                  documentId,
-                  email: fieldSignerEmail,
-                },
+                documentId,
+                id: field.recipientId,
              },
            },
          },
@@ -340,6 +352,7 @@ type FieldData = {
  id?: number | null;
  type: FieldType;
  signerEmail: string;
+  recipientId: number;
  pageNumber: number;
  pageX: number;
  pageY: number;
@@ -22,6 +22,7 @@ export type SetFieldsForTemplateOptions = {
  fields: {
    id?: number | null;
    type: FieldType;
+    signerId: number;
    signerEmail: string;
    pageNumber: number;
    pageX: number;
@@ -57,12 +58,29 @@ export const setFieldsForTemplate = async ({
            teamId: null,
          }),
    },
+    include: {
+      recipients: true,
+    },
  });

  if (!template) {
    throw new Error('Template not found');
  }

+  // Check that every signer has a signature field
+  const signers = template.recipients.filter((recipient) => recipient.role === 'SIGNER');
+  const hasEverySignerSignature = signers.every((signer) =>
+    fields.some(
+      (field) =>
+        (field.type === FieldType.SIGNATURE || field.type === FieldType.FREE_SIGNATURE) &&
+        field.signerId === signer.id,
+    ),
+  );
+
+  if (!hasEverySignerSignature) {
+    throw new Error('Every signer must have at least one signature field');
+  }
+
  const existingFields = await prisma.field.findMany({
    where: {
      templateId,
@@ -180,10 +198,8 @@ export const setFieldsForTemplate = async ({
          },
          recipient: {
            connect: {
-              templateId_email: {
-                templateId,
-                email: field.signerEmail.toLowerCase(),
-              },
+              templateId,
+              id: field.signerId,
            },
          },
        },
@@ -125,16 +125,12 @@ export const setDocumentRecipients = async ({

  const removedRecipients = existingRecipients.filter(
    (existingRecipient) =>
-      !normalizedRecipients.find(
-        (recipient) =>
-          recipient.id === existingRecipient.id || recipient.email === existingRecipient.email,
-      ),
+      !normalizedRecipients.find((recipient) => recipient.id === existingRecipient.id),
  );

  const linkedRecipients = normalizedRecipients.map((recipient) => {
    const existing = existingRecipients.find(
-      (existingRecipient) =>
-        existingRecipient.id === recipient.id || existingRecipient.email === recipient.email,
+      (existingRecipient) => existingRecipient.id === recipient.id,
    );

    if (
@@ -103,10 +103,7 @@ export const setTemplateRecipients = async ({

  const removedRecipients = existingRecipients.filter(
    (existingRecipient) =>
-      !normalizedRecipients.find(
-        (recipient) =>
-          recipient.id === existingRecipient.id || recipient.email === existingRecipient.email,
-      ),
+      !normalizedRecipients.find((recipient) => recipient.id === existingRecipient.id),
  );

  if (template.directLink !== null) {
@@ -133,14 +130,10 @@ export const setTemplateRecipients = async ({

  const linkedRecipients = normalizedRecipients.map((recipient) => {
    const existing = existingRecipients.find(
-      (existingRecipient) =>
-        existingRecipient.id === recipient.id || existingRecipient.email === recipient.email,
+      (existingRecipient) => existingRecipient.id === recipient.id,
    );

-    return {
-      ...recipient,
-      _persisted: existing,
-    };
+    return { ...recipient, _persisted: existing };
  });

  const persistedRecipients = await prisma.$transaction(async (tx) => {
@@ -141,10 +141,8 @@ export const createDocumentFromTemplateLegacy = async ({

        return await prisma.recipient.upsert({
          where: {
-            documentId_email: {
-              documentId: document.id,
-              email: existingRecipient?.email ?? recipient.email,
-            },
+            documentId: document.id,
+            id: existingRecipient?.id,
          },
          update: {
            name: recipient.name,
@@ -256,10 +256,21 @@ export const createDocumentFromTemplate = async ({
      },
    });

+    const recipientMapping = new Map<number, number>();
+
+    template.recipients.forEach((templateRecipient, index) => {
+      const documentRecipient = document.recipients[index];
+
+      if (documentRecipient) {
+        recipientMapping.set(templateRecipient.id, documentRecipient.id);
+      }
+    });
+
    let fieldsToCreate: Omit<Field, 'id' | 'secondaryId' | 'templateId'>[] = [];

-    Object.values(finalRecipients).forEach(({ email, fields }) => {
-      const recipient = document.recipients.find((recipient) => recipient.email === email);
+    finalRecipients.forEach(({ templateRecipientId, fields }) => {
+      const documentRecipientId = recipientMapping.get(templateRecipientId);
+      const recipient = document.recipients.find((r) => r.id === documentRecipientId);

      if (!recipient) {
        throw new Error('Recipient not found.');
@@ -13,7 +13,6 @@ import { ZRecipientAccessAuthTypesSchema, ZRecipientActionAuthTypesSchema } from
 export const ZDocumentAuditLogTypeSchema = z.enum([
  // Document actions.
  'EMAIL_SENT',
-  'SELF_SIGN',

  // Document modification events.
  'FIELD_CREATED',
@@ -182,14 +181,6 @@ export const ZDocumentAuditLogEventEmailSentSchema = z.object({
  }),
 });

-/**
- * Event: Self sign
- */
-export const ZDocumentAuditLogSelfSignSchema = z.object({
-  type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.SELF_SIGN),
-  data: ZBaseRecipientDataSchema,
-});
-
 /**
 * Event: Document completed.
 */
@@ -575,7 +566,6 @@ export const ZDocumentAuditLogBaseSchema = z.object({
 export const ZDocumentAuditLogSchema = ZDocumentAuditLogBaseSchema.and(
  z.union([
    ZDocumentAuditLogEventEmailSentSchema,
-    ZDocumentAuditLogSelfSignSchema,
    ZDocumentAuditLogEventDocumentCompletedSchema,
    ZDocumentAuditLogEventDocumentCreatedSchema,
    ZDocumentAuditLogEventDocumentDeletedSchema,
@@ -369,6 +369,16 @@ export const formatDocumentAuditLogAction = (
        identified: result,
      };
    })
+    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_REJECTED }, ({ data }) => {
+      const userName = prefix || _(msg`Recipient`);
+
+      const result = msg`${userName} rejected the document`;
+
+      return {
+        anonymous: result,
+        identified: result,
+      };
+    })
    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT }, ({ data }) => ({
      anonymous: data.isResending ? msg`Email resent` : msg`Email sent`,
      identified: data.isResending
@@ -379,14 +389,6 @@ export const formatDocumentAuditLogAction = (
      anonymous: msg`Document completed`,
      identified: msg`Document completed`,
    }))
-    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.SELF_SIGN }, () => ({
-      anonymous: msg`Self-signed document`,
-      identified: msg`${prefix} self-signed the document`,
-    }))
-    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_REJECTED }, ({ data }) => ({
-      anonymous: msg`Document rejected`,
-      identified: msg`${prefix} rejected the document: ${data.reason}`,
-    }))
    .exhaustive();

  return {
@@ -0,0 +1,2 @@
+-- DropIndex
+DROP INDEX "Recipient_documentId_email_key";
@@ -0,0 +1,5 @@
+-- DropIndex
+DROP INDEX "Recipient_templateId_email_key";
+
+-- CreateIndex
+CREATE INDEX "Recipient_email_idx" ON "Recipient"("email");
@@ -443,11 +443,10 @@ model Recipient {
  fields            Field[]
  signatures        Signature[]

-  @@unique([documentId, email])
-  @@unique([templateId, email])
  @@index([documentId])
  @@index([templateId])
  @@index([token])
+  @@index([email])
 }

 enum FieldType {
@@ -5,6 +5,18 @@ import { hashSync } from '@documenso/lib/server-only/auth/hash';

 import { prisma } from '..';
 import { DocumentDataType, DocumentSource, Role, TeamMemberRole } from '../client';
+import { seedPendingDocument } from './documents';
+import { seedDirectTemplate, seedTemplate } from './templates';
+
+const createDocumentData = async ({ documentData }: { documentData: string }) => {
+  return prisma.documentData.create({
+    data: {
+      type: DocumentDataType.BYTES_64,
+      data: documentData,
+      initialData: documentData,
+    },
+  });
+};

 export const seedDatabase = async () => {
  const examplePdf = fs
@@ -39,35 +51,80 @@ export const seedDatabase = async () => {
    update: {},
  });

-  const examplePdfData = await prisma.documentData.upsert({
-    where: {
-      id: 'clmn0kv5k0000pe04vcqg5zla',
-    },
-    create: {
-      id: 'clmn0kv5k0000pe04vcqg5zla',
-      type: DocumentDataType.BYTES_64,
-      data: examplePdf,
-      initialData: examplePdf,
-    },
-    update: {},
-  });
+  for (let i = 1; i <= 4; i++) {
+    const documentData = await createDocumentData({ documentData: examplePdf });

-  await prisma.document.create({
-    data: {
-      source: DocumentSource.DOCUMENT,
-      title: 'Example Document',
-      documentDataId: examplePdfData.id,
-      userId: exampleUser.id,
-      recipients: {
-        create: {
-          name: String(adminUser.name),
-          email: adminUser.email,
-          token: Math.random().toString(36).slice(2, 9),
+    await prisma.document.create({
+      data: {
+        source: DocumentSource.DOCUMENT,
+        title: `Example Document ${i}`,
+        documentDataId: documentData.id,
+        userId: exampleUser.id,
+        recipients: {
+          create: {
+            name: String(adminUser.name),
+            email: adminUser.email,
+            token: Math.random().toString(36).slice(2, 9),
+          },
        },
      },
+    });
+  }
+
+  for (let i = 1; i <= 4; i++) {
+    const documentData = await createDocumentData({ documentData: examplePdf });
+
+    await prisma.document.create({
+      data: {
+        source: DocumentSource.DOCUMENT,
+        title: `Document ${i}`,
+        documentDataId: documentData.id,
+        userId: adminUser.id,
+        recipients: {
+          create: {
+            name: String(exampleUser.name),
+            email: exampleUser.email,
+            token: Math.random().toString(36).slice(2, 9),
+          },
+        },
+      },
+    });
+  }
+
+  await seedPendingDocument(exampleUser, [adminUser], {
+    key: 'example-pending',
+    createDocumentOptions: {
+      title: 'Pending Document',
    },
  });

+  await seedPendingDocument(adminUser, [exampleUser], {
+    key: 'admin-pending',
+    createDocumentOptions: {
+      title: 'Pending Document',
+    },
+  });
+
+  await Promise.all([
+    seedTemplate({
+      title: 'Template 1',
+      userId: exampleUser.id,
+    }),
+    seedDirectTemplate({
+      title: 'Direct Template 1',
+      userId: exampleUser.id,
+    }),
+
+    seedTemplate({
+      title: 'Template 1',
+      userId: adminUser.id,
+    }),
+    seedDirectTemplate({
+      title: 'Direct Template 1',
+      userId: adminUser.id,
+    }),
+  ]);
+
  const testUsers = [
    'test@documenso.com',
    'test2@documenso.com',
@@ -20,7 +20,6 @@ import { getDocumentWithDetailsById } from '@documenso/lib/server-only/document/
 import { moveDocumentToTeam } from '@documenso/lib/server-only/document/move-document-to-team';
 import { resendDocument } from '@documenso/lib/server-only/document/resend-document';
 import { searchDocumentsWithKeyword } from '@documenso/lib/server-only/document/search-documents-with-keyword';
-import { selfSignDocument } from '@documenso/lib/server-only/document/self-sign-document';
 import { sendDocument } from '@documenso/lib/server-only/document/send-document';
 import { updateDocument } from '@documenso/lib/server-only/document/update-document';
 import { symmetricEncrypt } from '@documenso/lib/universal/crypto';
@@ -51,7 +50,6 @@ import {
  ZMoveDocumentToTeamSchema,
  ZResendDocumentMutationSchema,
  ZSearchDocumentsMutationSchema,
-  ZSelfSignDocumentMutationSchema,
  ZSetPasswordForDocumentMutationSchema,
  ZSetSigningOrderForDocumentMutationSchema,
  ZSuccessResponseSchema,
@@ -469,28 +467,6 @@ export const documentRouter = router({
      });
    }),

-  selfSignDocument: authenticatedProcedure
-    .input(ZSelfSignDocumentMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      try {
-        const { documentId, teamId } = input;
-
-        return await selfSignDocument({
-          userId: ctx.user.id,
-          documentId,
-          teamId,
-          requestMetadata: ctx.metadata,
-        });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to self sign this document. Please try again later.',
-        });
-      }
-    }),
-
  /**
   * @public
   *
@@ -192,14 +192,6 @@ export const ZCreateDocumentV2RequestSchema = z.object({
          .optional(),
      }),
    )
-    .refine(
-      (recipients) => {
-        const emails = recipients.map((recipient) => recipient.email);
-
-        return new Set(emails).size === emails.length;
-      },
-      { message: 'Recipients must have unique emails' },
-    )
    .optional(),
  meta: z
    .object({
@@ -293,11 +285,6 @@ export const ZDistributeDocumentRequestSchema = z.object({
    .optional(),
 });

-export const ZSelfSignDocumentMutationSchema = z.object({
-  documentId: z.number(),
-  teamId: z.number().optional(),
-});
-
 export const ZDistributeDocumentResponseSchema = ZDocumentLiteSchema;

 export const ZSetPasswordForDocumentMutationSchema = z.object({
@@ -232,8 +232,9 @@ export const fieldRouter = router({
        teamId,
        fields: fields.map((field) => ({
          id: field.nativeId,
-          signerEmail: field.signerEmail,
+          recipientId: field.recipientId,
          type: field.type,
+          signerEmail: field.signerEmail,
          pageNumber: field.pageNumber,
          pageX: field.pageX,
          pageY: field.pageY,
@@ -429,6 +430,7 @@ export const fieldRouter = router({
        teamId,
        fields: fields.map((field) => ({
          id: field.nativeId,
+          signerId: field.recipientId,
          signerEmail: field.signerEmail,
          type: field.type,
          pageNumber: field.pageNumber,
@@ -112,13 +112,15 @@ export const ZSetDocumentFieldsRequestSchema = z.object({
    z.object({
      formId: z.string().min(1),
      nativeId: z.number().optional(),
+      id: z.number().optional(),
      type: z.nativeEnum(FieldType),
+      recipientId: z.number(),
      signerEmail: z.string().min(1),
-      pageNumber: z.number().min(1),
-      pageX: z.number().min(0),
-      pageY: z.number().min(0),
-      pageWidth: z.number().min(0),
-      pageHeight: z.number().min(0),
+      pageNumber: ZFieldPageNumberSchema,
+      pageX: ZFieldPageXSchema,
+      pageY: ZFieldPageYSchema,
+      pageWidth: ZFieldWidthSchema,
+      pageHeight: ZFieldHeightSchema,
      fieldMeta: ZFieldMetaSchema,
    }),
  ),
@@ -136,6 +138,8 @@ export const ZSetFieldsForTemplateRequestSchema = z.object({
      nativeId: z.number().optional(),
      type: z.nativeEnum(FieldType),
      signerEmail: z.string().min(1),
+      recipientId: z.number().min(1),
+      signerId: z.number().min(1),
      pageNumber: z.number().min(1),
      pageX: z.number().min(0),
      pageY: z.number().min(0),
@@ -49,16 +49,7 @@ export const ZCreateDocumentRecipientResponseSchema = ZRecipientLiteSchema;

 export const ZCreateDocumentRecipientsRequestSchema = z.object({
  documentId: z.number(),
-  recipients: z.array(ZCreateRecipientSchema).refine(
-    (recipients) => {
-      const emails = recipients.map((recipient) => recipient.email.toLowerCase());
-
-      return new Set(emails).size === emails.length;
-    },
-    {
-      message: 'Recipients must have unique emails',
-    },
-  ),
+  recipients: z.array(ZCreateRecipientSchema),
 });

 export const ZCreateDocumentRecipientsResponseSchema = z.object({
@@ -74,18 +65,7 @@ export const ZUpdateDocumentRecipientResponseSchema = ZRecipientSchema;

 export const ZUpdateDocumentRecipientsRequestSchema = z.object({
  documentId: z.number(),
-  recipients: z.array(ZUpdateRecipientSchema).refine(
-    (recipients) => {
-      const emails = recipients
-        .filter((recipient) => recipient.email !== undefined)
-        .map((recipient) => recipient.email?.toLowerCase());
-
-      return new Set(emails).size === emails.length;
-    },
-    {
-      message: 'Recipients must have unique emails',
-    },
-  ),
+  recipients: z.array(ZUpdateRecipientSchema),
 });

 export const ZUpdateDocumentRecipientsResponseSchema = z.object({
@@ -96,29 +76,19 @@ export const ZDeleteDocumentRecipientRequestSchema = z.object({
  recipientId: z.number(),
 });

-export const ZSetDocumentRecipientsRequestSchema = z
-  .object({
-    documentId: z.number(),
-    recipients: z.array(
-      z.object({
-        nativeId: z.number().optional(),
-        email: z.string().toLowerCase().email().min(1),
-        name: z.string(),
-        role: z.nativeEnum(RecipientRole),
-        signingOrder: z.number().optional(),
-        actionAuth: ZRecipientActionAuthTypesSchema.optional().nullable(),
-      }),
-    ),
-  })
-  .refine(
-    (schema) => {
-      const emails = schema.recipients.map((recipient) => recipient.email.toLowerCase());
-
-      return new Set(emails).size === emails.length;
-    },
-    // Dirty hack to handle errors when .root is populated for an array type
-    { message: 'Recipients must have unique emails', path: ['recipients__root'] },
-  );
+export const ZSetDocumentRecipientsRequestSchema = z.object({
+  documentId: z.number(),
+  recipients: z.array(
+    z.object({
+      nativeId: z.number().optional(),
+      email: z.string().toLowerCase().email().min(1),
+      name: z.string(),
+      role: z.nativeEnum(RecipientRole),
+      signingOrder: z.number().optional(),
+      actionAuth: ZRecipientActionAuthTypesSchema.optional().nullable(),
+    }),
+  ),
+});

 export const ZSetDocumentRecipientsResponseSchema = z.object({
  recipients: ZRecipientLiteSchema.array(),
@@ -133,16 +103,7 @@ export const ZCreateTemplateRecipientResponseSchema = ZRecipientLiteSchema;

 export const ZCreateTemplateRecipientsRequestSchema = z.object({
  templateId: z.number(),
-  recipients: z.array(ZCreateRecipientSchema).refine(
-    (recipients) => {
-      const emails = recipients.map((recipient) => recipient.email);
-
-      return new Set(emails).size === emails.length;
-    },
-    {
-      message: 'Recipients must have unique emails',
-    },
-  ),
+  recipients: z.array(ZCreateRecipientSchema),
 });

 export const ZCreateTemplateRecipientsResponseSchema = z.object({
@@ -158,18 +119,7 @@ export const ZUpdateTemplateRecipientResponseSchema = ZRecipientSchema;

 export const ZUpdateTemplateRecipientsRequestSchema = z.object({
  templateId: z.number(),
-  recipients: z.array(ZUpdateRecipientSchema).refine(
-    (recipients) => {
-      const emails = recipients
-        .filter((recipient) => recipient.email !== undefined)
-        .map((recipient) => recipient.email);
-
-      return new Set(emails).size === emails.length;
-    },
-    {
-      message: 'Recipients must have unique emails',
-    },
-  ),
+  recipients: z.array(ZUpdateRecipientSchema),
 });

 export const ZUpdateTemplateRecipientsResponseSchema = z.object({
@@ -180,29 +130,19 @@ export const ZDeleteTemplateRecipientRequestSchema = z.object({
  recipientId: z.number(),
 });

-export const ZSetTemplateRecipientsRequestSchema = z
-  .object({
-    templateId: z.number(),
-    recipients: z.array(
-      z.object({
-        nativeId: z.number().optional(),
-        email: z.string().toLowerCase().email().min(1),
-        name: z.string(),
-        role: z.nativeEnum(RecipientRole),
-        signingOrder: z.number().optional(),
-        actionAuth: ZRecipientActionAuthTypesSchema.optional().nullable(),
-      }),
-    ),
-  })
-  .refine(
-    (schema) => {
-      const emails = schema.recipients.map((recipient) => recipient.email);
-
-      return new Set(emails).size === emails.length;
-    },
-    // Dirty hack to handle errors when .root is populated for an array type
-    { message: 'Recipients must have unique emails', path: ['recipients__root'] },
-  );
+export const ZSetTemplateRecipientsRequestSchema = z.object({
+  templateId: z.number(),
+  recipients: z.array(
+    z.object({
+      nativeId: z.number().optional(),
+      email: z.string().toLowerCase().email().min(1),
+      name: z.string(),
+      role: z.nativeEnum(RecipientRole),
+      signingOrder: z.number().optional(),
+      actionAuth: ZRecipientActionAuthTypesSchema.optional().nullable(),
+    }),
+  ),
+});

 export const ZSetTemplateRecipientsResponseSchema = z.object({
  recipients: ZRecipientLiteSchema.array(),
@@ -51,12 +51,7 @@ export const ZCreateDocumentFromTemplateRequestSchema = z.object({
        name: z.string().optional(),
      }),
    )
-    .describe('The information of the recipients to create the document with.')
-    .refine((recipients) => {
-      const emails = recipients.map((signer) => signer.email);
-
-      return new Set(emails).size === emails.length;
-    }, 'Recipients must have unique emails'),
+    .describe('The information of the recipients to create the document with.'),
  distributeDocument: z
    .boolean()
    .describe('Whether to create the document as pending and distribute it to recipients.')
@@ -21,7 +21,6 @@ import {
  Type,
  User,
 } from 'lucide-react';
-import { useSession } from 'next-auth/react';
 import { useFieldArray, useForm } from 'react-hook-form';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { prop, sortBy } from 'remeda';
@@ -93,6 +92,7 @@ export type FieldFormType = {
  pageY: number;
  pageWidth: number;
  pageHeight: number;
+  recipientId: number;
  signerEmail: string;
  fieldMeta?: FieldMeta;
 };
@@ -121,7 +121,6 @@ export const AddFieldsFormPartial = ({
  teamId,
 }: AddFieldsFormProps) => {
  const { toast } = useToast();
-  const { data: session } = useSession();
  const { _ } = useLingui();

  const [isMissingSignatureDialogVisible, setIsMissingSignatureDialogVisible] = useState(false);
@@ -145,6 +144,7 @@ export const AddFieldsFormPartial = ({
        pageY: Number(field.positionY),
        pageWidth: Number(field.width),
        pageHeight: Number(field.height),
+        recipientId: field.recipientId,
        signerEmail:
          recipients.find((recipient) => recipient.id === field.recipientId)?.email ?? '',
        fieldMeta: field.fieldMeta ? ZFieldMetaSchema.parse(field.fieldMeta) : undefined,
@@ -350,6 +350,7 @@ export const AddFieldsFormPartial = ({
        pageY,
        pageWidth: fieldPageWidth,
        pageHeight: fieldPageHeight,
+        recipientId: selectedSigner.id,
        signerEmail: selectedSigner.email,
        fieldMeta: undefined,
      };
@@ -443,6 +444,7 @@ export const AddFieldsFormPartial = ({
        const newField: TAddFieldsFormSchema['fields'][0] = {
          ...structuredClone(lastActiveField),
          formId: nanoid(12),
+          recipientId: selectedSigner?.id ?? lastActiveField.recipientId,
          signerEmail: selectedSigner?.email ?? lastActiveField.signerEmail,
          pageX: lastActiveField.pageX + 3,
          pageY: lastActiveField.pageY + 3,
@@ -451,7 +453,7 @@ export const AddFieldsFormPartial = ({
        append(newField);
      }
    },
-    [append, lastActiveField, selectedSigner?.email, toast],
+    [append, lastActiveField, selectedSigner?.id, selectedSigner?.email, toast],
  );

  const onFieldPaste = useCallback(
@@ -464,13 +466,15 @@ export const AddFieldsFormPartial = ({
        append({
          ...copiedField,
          formId: nanoid(12),
+          recipientId: selectedSigner?.id ?? copiedField.recipientId,
          signerEmail: selectedSigner?.email ?? copiedField.signerEmail,
+
          pageX: copiedField.pageX + 3,
          pageY: copiedField.pageY + 3,
        });
      }
    },
-    [append, fieldClipboard, selectedSigner?.email],
+    [append, fieldClipboard, selectedSigner?.id, selectedSigner?.email],
  );

  useEffect(() => {
@@ -560,10 +564,6 @@ export const AddFieldsFormPartial = ({
      );
  }, [recipientsByRole]);

-  const hasSameOwnerAsRecipient =
-    recipientsByRole.SIGNER.length === 1 &&
-    recipientsByRole.SIGNER[0].email === session?.user?.email;
-
  const handleAdvancedSettings = () => {
    setShowAdvancedSettings((prev) => !prev);
  };
@@ -573,7 +573,7 @@ export const AddFieldsFormPartial = ({
      localFields.some(
        (field) =>
          (field.type === FieldType.SIGNATURE || field.type === FieldType.FREE_SIGNATURE) &&
-          field.signerEmail === signer.email,
+          field.recipientId === signer.id,
      ),
    );

@@ -643,7 +643,7 @@ export const AddFieldsFormPartial = ({

              {isDocumentPdfLoaded &&
                localFields.map((field, index) => {
-                  const recipientIndex = recipients.findIndex((r) => r.email === field.signerEmail);
+                  const recipientIndex = recipients.findIndex((r) => r.id === field.recipientId);
                  const hasFieldError =
                    emptyCheckboxFields.find((f) => f.formId === field.formId) ||
                    emptyRadioFields.find((f) => f.formId === field.formId) ||
@@ -655,7 +655,7 @@ export const AddFieldsFormPartial = ({
                      recipientIndex={recipientIndex === -1 ? 0 : recipientIndex}
                      field={field}
                      disabled={
-                        selectedSigner?.email !== field.signerEmail ||
+                        selectedSigner?.id !== field.recipientId ||
                        !canRecipientBeModified(selectedSigner, fields)
                      }
                      minHeight={MIN_HEIGHT_PX}
@@ -1138,7 +1138,6 @@ export const AddFieldsFormPartial = ({
                documentFlow.onBackStep?.();
              }}
              goBackLabel={canRenderBackButtonAsRemove ? msg`Remove` : undefined}
-              goNextLabel={hasSameOwnerAsRecipient ? msg`Sign` : undefined}
              onGoNextClick={handleGoNextClick}
            />
          </DocumentFlowFormContainerFooter>
@@ -10,6 +10,7 @@ export const ZAddFieldsFormSchema = z.object({
      nativeId: z.number().optional(),
      type: z.nativeEnum(FieldType),
      signerEmail: z.string().min(1),
+      recipientId: z.number(),
      pageNumber: z.number().min(1),
      pageX: z.number().min(0),
      pageY: z.number().min(0),
@@ -6,34 +6,22 @@ import { ZRecipientActionAuthTypesSchema } from '@documenso/lib/types/document-a
 import { ZMapNegativeOneToUndefinedSchema } from './add-settings.types';
 import { DocumentSigningOrder, RecipientRole } from '.prisma/client';

-export const ZAddSignersFormSchema = z
-  .object({
-    signers: z.array(
-      z.object({
-        formId: z.string().min(1),
-        nativeId: z.number().optional(),
-        email: z
-          .string()
-          .email({ message: msg`Invalid email`.id })
-          .min(1),
-        name: z.string(),
-        role: z.nativeEnum(RecipientRole),
-        signingOrder: z.number().optional(),
-        actionAuth: ZMapNegativeOneToUndefinedSchema.pipe(
-          ZRecipientActionAuthTypesSchema.optional(),
-        ),
-      }),
-    ),
-    signingOrder: z.nativeEnum(DocumentSigningOrder),
-  })
-  .refine(
-    (schema) => {
-      const emails = schema.signers.map((signer) => signer.email.toLowerCase());
-
-      return new Set(emails).size === emails.length;
-    },
-    // Dirty hack to handle errors when .root is populated for an array type
-    { message: msg`Signers must have unique emails`.id, path: ['signers__root'] },
-  );
+export const ZAddSignersFormSchema = z.object({
+  signers: z.array(
+    z.object({
+      formId: z.string().min(1),
+      nativeId: z.number().optional(),
+      email: z
+        .string()
+        .email({ message: msg`Invalid email`.id })
+        .min(1),
+      name: z.string(),
+      role: z.nativeEnum(RecipientRole),
+      signingOrder: z.number().optional(),
+      actionAuth: ZMapNegativeOneToUndefinedSchema.pipe(ZRecipientActionAuthTypesSchema.optional()),
+    }),
+  ),
+  signingOrder: z.nativeEnum(DocumentSigningOrder),
+});

 export type TAddSignersFormSchema = z.infer<typeof ZAddSignersFormSchema>;
@@ -8,19 +8,14 @@ import { FieldType } from '@documenso/prisma/client';
 export const ZDocumentFlowFormSchema = z.object({
  title: z.string().min(1),

-  signers: z
-    .array(
-      z.object({
-        formId: z.string().min(1),
-        nativeId: z.number().optional(),
-        email: z.string().min(1).email(),
-        name: z.string(),
-      }),
-    )
-    .refine((signers) => {
-      const emails = signers.map((signer) => signer.email);
-      return new Set(emails).size === emails.length;
-    }, 'Signers must have unique emails'),
+  signers: z.array(
+    z.object({
+      formId: z.string().min(1),
+      nativeId: z.number().optional(),
+      email: z.string().min(1).email(),
+      name: z.string(),
+    }),
+  ),

  fields: z.array(
    z.object({
@@ -60,6 +60,7 @@ import { getSignerColorStyles, useSignerColors } from '../../lib/signer-colors';
 import { Checkbox } from '../checkbox';
 import type { FieldFormType } from '../document-flow/add-fields';
 import { FieldAdvancedSettings } from '../document-flow/field-item-advanced-settings';
+import { MissingSignatureFieldDialog } from '../document-flow/missing-signature-field-dialog';
 import { Form, FormControl, FormField, FormItem, FormLabel } from '../form/form';
 import { useStep } from '../stepper';
 import type { TAddTemplateFieldsFormSchema } from './add-template-fields.types';
@@ -110,6 +111,7 @@ export const AddTemplateFieldsFormPartial = ({
  const [fieldClipboard, setFieldClipboard] = useState<
    TAddTemplateFieldsFormSchema['fields'][0] | null
  >(null);
+  const [isMissingSignatureDialogVisible, setIsMissingSignatureDialogVisible] = useState(false);

  const form = useForm<TAddTemplateFieldsFormSchema>({
    defaultValues: {
@@ -122,6 +124,7 @@ export const AddTemplateFieldsFormPartial = ({
        pageY: Number(field.positionY),
        pageWidth: Number(field.width),
        pageHeight: Number(field.height),
+        recipientId: field.recipientId ?? -1,
        signerId: field.recipientId ?? -1,
        signerEmail:
          recipients.find((recipient) => recipient.id === field.recipientId)?.email ?? '',
@@ -177,6 +180,8 @@ export const AddTemplateFieldsFormPartial = ({
          formId: nanoid(12),
          signerEmail: selectedSigner?.email ?? lastActiveField.signerEmail,
          signerId: selectedSigner?.id ?? lastActiveField.signerId,
+          recipientId:
+            selectedSigner?.id || lastActiveField.recipientId || lastActiveField.signerId || 0,
          signerToken: selectedSigner?.token ?? lastActiveField.signerToken,
          pageX: lastActiveField.pageX + 3,
          pageY: lastActiveField.pageY + 3,
@@ -201,19 +206,29 @@ export const AddTemplateFieldsFormPartial = ({
        event.preventDefault();

        const copiedField = structuredClone(fieldClipboard);
+        const signerIndex = recipients.findIndex((r) => r.id === selectedSigner?.id);

        append({
          ...copiedField,
          formId: nanoid(12),
          signerEmail: selectedSigner?.email ?? copiedField.signerEmail,
          signerId: selectedSigner?.id ?? copiedField.signerId,
+          recipientId: selectedSigner?.id || copiedField.recipientId || copiedField.signerId || 0,
          signerToken: selectedSigner?.token ?? copiedField.signerToken,
+          signerIndex: signerIndex >= 0 ? signerIndex : 0,
          pageX: copiedField.pageX + 3,
          pageY: copiedField.pageY + 3,
        });
      }
    },
-    [append, fieldClipboard, selectedSigner?.email, selectedSigner?.id, selectedSigner?.token],
+    [
+      append,
+      fieldClipboard,
+      selectedSigner?.email,
+      selectedSigner?.id,
+      selectedSigner?.token,
+      recipients,
+    ],
  );

  useHotkeys(['ctrl+c', 'meta+c'], (evt) => onFieldCopy(evt));
@@ -319,6 +334,8 @@ export const AddTemplateFieldsFormPartial = ({
      pageX -= fieldPageWidth / 2;
      pageY -= fieldPageHeight / 2;

+      const signerIndex = recipients.findIndex((r) => r.id === selectedSigner.id);
+
      append({
        formId: nanoid(12),
        type: selectedField,
@@ -329,14 +346,17 @@ export const AddTemplateFieldsFormPartial = ({
        pageHeight: fieldPageHeight,
        signerEmail: selectedSigner.email,
        signerId: selectedSigner.id,
+        recipientId:
+          selectedSigner.id || lastActiveField?.recipientId || lastActiveField?.signerId || 0,
        signerToken: selectedSigner.token ?? '',
+        signerIndex: signerIndex >= 0 ? signerIndex : 0,
        fieldMeta: undefined,
      });

      setIsFieldWithinBounds(false);
      setSelectedField(null);
    },
-    [append, isWithinPageBounds, selectedField, selectedSigner, getPage],
+    [append, isWithinPageBounds, selectedField, selectedSigner, getPage, recipients],
  );

  const onFieldResize = useCallback(
@@ -499,6 +519,23 @@ export const AddTemplateFieldsFormPartial = ({
    form.setValue('typedSignatureEnabled', value, { shouldDirty: true });
  };

+  const handleGoNextClick = () => {
+    const everySignerHasSignature = recipientsByRole.SIGNER.every((signer) =>
+      localFields.some(
+        (field) =>
+          (field.type === FieldType.SIGNATURE || field.type === FieldType.FREE_SIGNATURE) &&
+          field.recipientId === signer.id,
+      ),
+    );
+
+    if (!everySignerHasSignature) {
+      setIsMissingSignatureDialogVisible(true);
+      return;
+    }
+
+    void onFormSubmit();
+  };
+
  return (
    <>
      {showAdvancedSettings && currentField ? (
@@ -546,14 +583,15 @@ export const AddTemplateFieldsFormPartial = ({
              )}

              {localFields.map((field, index) => {
-                const recipientIndex = recipients.findIndex((r) => r.email === field.signerEmail);
+                const recipientIndex =
+                  field.signerIndex ?? recipients.findIndex((r) => r.id === field.signerId);

                return (
                  <FieldItem
                    key={index}
-                    recipientIndex={recipientIndex === -1 ? 0 : recipientIndex}
+                    recipientIndex={recipientIndex >= 0 ? recipientIndex : 0}
                    field={field}
-                    disabled={selectedSigner?.email !== field.signerEmail}
+                    disabled={selectedSigner?.id !== field.signerId}
                    minHeight={MIN_HEIGHT_PX}
                    minWidth={MIN_WIDTH_PX}
                    defaultHeight={DEFAULT_HEIGHT_PX}
@@ -993,9 +1031,14 @@ export const AddTemplateFieldsFormPartial = ({
                    previousStep();
                    remove();
                  }}
-                  onGoNextClick={() => void onFormSubmit()}
+                  onGoNextClick={handleGoNextClick}
                />
              </DocumentFlowFormContainerFooter>
+
+              <MissingSignatureFieldDialog
+                isOpen={isMissingSignatureDialogVisible}
+                onOpenChange={(value) => setIsMissingSignatureDialogVisible(value)}
+              />
            </div>
          </DocumentFlowFormContainerContent>
        </>
@@ -11,12 +11,14 @@ export const ZAddTemplateFieldsFormSchema = z.object({
      type: z.nativeEnum(FieldType),
      signerEmail: z.string().min(1),
      signerToken: z.string(),
-      signerId: z.number().optional(),
+      signerId: z.number(),
+      recipientId: z.number(),
      pageNumber: z.number().min(1),
      pageX: z.number().min(0),
      pageY: z.number().min(0),
      pageWidth: z.number().min(0),
      pageHeight: z.number().min(0),
+      signerIndex: z.number().min(0),
      fieldMeta: ZFieldMetaSchema,
    }),
  ),
@@ -92,6 +92,7 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
          actionAuth: undefined,
          ...generateRecipientPlaceholder(1),
          signingOrder: 1,
+          signerIndex: 0,
        },
      ];
    }
@@ -104,6 +105,7 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
      role: recipient.role,
      actionAuth: ZRecipientAuthOptionsSchema.parse(recipient.authOptions)?.actionAuth ?? undefined,
      signingOrder: recipient.signingOrder ?? index + 1,
+      signerIndex: index,
    }));

    if (signingOrder === DocumentSigningOrder.SEQUENTIAL) {
@@ -174,21 +176,35 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
  });

  const onAddPlaceholderSelfRecipient = () => {
+    const currentSigners = form.getValues('signers');
+    const nextSignerIndex = currentSigners.length;
+
    appendSigner({
      formId: nanoid(12),
      name: user?.name ?? '',
      email: user?.email ?? '',
      role: RecipientRole.SIGNER,
-      signingOrder: signers.length > 0 ? (signers[signers.length - 1]?.signingOrder ?? 0) + 1 : 1,
+      signingOrder:
+        currentSigners.length > 0
+          ? (currentSigners[currentSigners.length - 1]?.signingOrder ?? 0) + 1
+          : 1,
+      signerIndex: nextSignerIndex,
    });
  };

  const onAddPlaceholderRecipient = () => {
+    const currentSigners = form.getValues('signers');
+    const nextSignerIndex = currentSigners.length;
+
    appendSigner({
      formId: nanoid(12),
      role: RecipientRole.SIGNER,
      ...generateRecipientPlaceholder(placeholderRecipientCount),
-      signingOrder: signers.length > 0 ? (signers[signers.length - 1]?.signingOrder ?? 0) + 1 : 1,
+      signingOrder:
+        currentSigners.length > 0
+          ? (currentSigners[currentSigners.length - 1]?.signingOrder ?? 0) + 1
+          : 1,
+      signerIndex: nextSignerIndex,
    });

    setPlaceholderRecipientCount((count) => count + 1);
@@ -5,32 +5,21 @@ import { DocumentSigningOrder, RecipientRole } from '@documenso/prisma/client';

 import { ZMapNegativeOneToUndefinedSchema } from '../document-flow/add-settings.types';

-export const ZAddTemplatePlacholderRecipientsFormSchema = z
-  .object({
-    signers: z.array(
-      z.object({
-        formId: z.string().min(1),
-        nativeId: z.number().optional(),
-        email: z.string().min(1).email(),
-        name: z.string(),
-        role: z.nativeEnum(RecipientRole),
-        signingOrder: z.number().optional(),
-        actionAuth: ZMapNegativeOneToUndefinedSchema.pipe(
-          ZRecipientActionAuthTypesSchema.optional(),
-        ),
-      }),
-    ),
-    signingOrder: z.nativeEnum(DocumentSigningOrder),
-  })
-  .refine(
-    (schema) => {
-      const emails = schema.signers.map((signer) => signer.email.toLowerCase());
-
-      return new Set(emails).size === emails.length;
-    },
-    // Dirty hack to handle errors when .root is populated for an array type
-    { message: 'Signers must have unique emails', path: ['signers__root'] },
-  );
+export const ZAddTemplatePlacholderRecipientsFormSchema = z.object({
+  signers: z.array(
+    z.object({
+      formId: z.string().min(1),
+      nativeId: z.number().optional(),
+      email: z.string().min(1).email(),
+      name: z.string(),
+      role: z.nativeEnum(RecipientRole),
+      signingOrder: z.number().optional(),
+      signerIndex: z.number().min(0),
+      actionAuth: ZMapNegativeOneToUndefinedSchema.pipe(ZRecipientActionAuthTypesSchema.optional()),
+    }),
+  ),
+  signingOrder: z.nativeEnum(DocumentSigningOrder),
+});

 export type TAddTemplatePlacholderRecipientsFormSchema = z.infer<
  typeof ZAddTemplatePlacholderRecipientsFormSchema
Author	SHA1	Message	Date
Catalin Pit	7e9c7f1b11	Merge branch 'main' into feat/allow-same-signer-email-multiple-times	2025-02-13 13:58:03 +02:00
Catalin Pit	bc2ec9a2d7	chore: disable next step on backend for signers without signature field	2025-02-13 13:57:20 +02:00
Catalin Pit	763b7f82c9	chore: disable next step for signers without signature field	2025-02-13 10:21:24 +02:00
Catalin Pit	c670f64b1f	chore: tests for creating a document from a template	2025-02-12 13:30:43 +02:00
Catalin Pit	369e16afab	chore: template fields testing	2025-02-11 16:52:02 +02:00
Catalin Pit	4a5f565591	chore: template fields testing	2025-02-11 14:21:23 +02:00
Catalin Pit	f544eae2a6	chore: add template tests	2025-02-11 10:29:56 +02:00
Catalin Pit	a2ffd75c17	chore: add tests	2025-02-11 09:50:46 +02:00
Catalin Pit	8619eec67a	chore: self-review pr	2025-02-10 16:47:07 +02:00
Catalin Pit	f325a04cb5	chore: update templates	2025-02-10 15:49:21 +02:00
Ephraim Duncan	2ff330f9d4	chore: update local seed data (#1622 ) ## Description Add multiple example documents, pending documents, and templates for both admin and example users ## Changes Made - Added seeding of multiple example documents and templates for both example and admin users ## Checklist - [x] I have tested these changes locally and they work as expected. - [ ] I have added/updated tests that prove the effectiveness of these changes. - [ ] I have updated the documentation to reflect these changes, if applicable. - [x] I have followed the project's coding style guidelines. - [x] I have addressed the code review feedback from the previous submission, if applicable.	2025-02-10 22:55:12 +11:00
Catalin Pit	6a47b3a6e5	chore: documents work properly	2025-02-10 13:44:13 +02:00
Catalin Pit	a7adb77e47	chore: allow document creation from template	2025-02-07 18:08:14 +02:00
Catalin Pit	bfcbaea3a9	chore: remove unique email constraint	2025-02-07 15:22:50 +02:00
Catalin Pit	64964f420a	chore: make duplicate recipients work for remplates	2025-02-07 14:29:38 +02:00
Catalin Pit	2896673a23	chore: allow duplicate recipient in templates	2025-02-06 16:58:16 +02:00
Catalin Pit	b684b9574d	chore: reverse some code changes	2025-02-06 15:17:06 +02:00
Catalin Pit	12803d1a5e	chore: undo code	2025-02-06 14:32:18 +02:00
Catalin Pit	c41002313a	chore: allow same signer docs	2025-02-06 14:27:37 +02:00
Catalin Pit	516435fa2a	Merge branch 'main' into feat/allow-same-signer-email-multiple-times	2025-02-05 10:27:18 +02:00
Catalin Pit	0216af4ae8	Merge branch 'main' into feat/allow-same-signer-email-multiple-times	2025-02-03 14:12:42 +02:00
Catalin Pit	3cde3cb7b2	Merge branch 'main' into feat/allow-same-signer-email-multiple-times	2025-01-28 12:40:45 +02:00
Catalin Pit	071f5c546d	chore: remove same email check from backend	2025-01-27 17:08:55 +02:00
Catalin Pit	9f9f6701c8	chore: remove same email check from backend	2025-01-27 16:44:21 +02:00
Catalin Pit	b01eaceeb8	feat: allow same signer email multiple times	2025-01-27 16:36:53 +02:00