feat: add envelopes (#2025)

This PR is handles the changes required to support envelopes. The new envelope editor/signing page will be hidden during release. The core changes here is to migrate the documents and templates model to a centralized envelopes model. Even though Documents and Templates are removed, from the user perspective they will still exist as we remap envelopes to documents and templates.
2026-07-26 18:04:55 +10:00 · 2025-10-14 21:56:36 +11:00
parent 7b17156e56
commit 7f09ba72f4
447 changed files with 33467 additions and 9622 deletions
@@ -1,6 +1,7 @@
 import {
  DocumentSigningOrder,
  DocumentStatus,
+  EnvelopeType,
  RecipientRole,
  SendStatus,
  SigningStatus,
@@ -22,9 +23,11 @@ import type { TRecipientAccessAuth, TRecipientActionAuth } from '../../types/doc
 import { DocumentAuth } from '../../types/document-auth';
 import {
  ZWebhookDocumentSchema,
-  mapDocumentToWebhookDocumentPayload,
+  mapEnvelopeToWebhookDocumentPayload,
 } from '../../types/webhook-payload';
 import { extractDocumentAuthMethods } from '../../utils/document-auth';
+import type { EnvelopeIdOptions } from '../../utils/envelope';
+import { mapSecondaryIdToDocumentId, unsafeBuildEnvelopeIdQuery } from '../../utils/envelope';
 import { getIsRecipientsTurnToSign } from '../recipient/get-is-recipient-turn';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
 import { isRecipientAuthorized } from './is-recipient-authorized';
@@ -32,7 +35,7 @@ import { sendPendingEmail } from './send-pending-email';

 export type CompleteDocumentWithTokenOptions = {
  token: string;
-  documentId: number;
+  id: EnvelopeIdOptions;
  userId?: number;
  authOptions?: TRecipientActionAuth;
  accessAuthOptions?: TRecipientAccessAuth;
@@ -43,10 +46,17 @@ export type CompleteDocumentWithTokenOptions = {
  };
 };

-const getDocument = async ({ token, documentId }: CompleteDocumentWithTokenOptions) => {
-  return await prisma.document.findFirstOrThrow({
+export const completeDocumentWithToken = async ({
+  token,
+  id,
+  userId,
+  accessAuthOptions,
+  requestMetadata,
+  nextSigner,
+}: CompleteDocumentWithTokenOptions) => {
+  const envelope = await prisma.envelope.findFirstOrThrow({
    where: {
-      id: documentId,
+      ...unsafeBuildEnvelopeIdQuery(id, EnvelopeType.DOCUMENT),
      recipients: {
        some: {
          token,
@@ -62,27 +72,18 @@ const getDocument = async ({ token, documentId }: CompleteDocumentWithTokenOptio
      },
    },
  });
-};

-export const completeDocumentWithToken = async ({
-  token,
-  documentId,
-  userId,
-  accessAuthOptions,
-  requestMetadata,
-  nextSigner,
-}: CompleteDocumentWithTokenOptions) => {
-  const document = await getDocument({ token, documentId });
+  const legacyDocumentId = mapSecondaryIdToDocumentId(envelope.secondaryId);

-  if (document.status !== DocumentStatus.PENDING) {
-    throw new Error(`Document ${document.id} must be pending`);
+  if (envelope.status !== DocumentStatus.PENDING) {
+    throw new Error(`Document ${envelope.id} must be pending`);
  }

-  if (document.recipients.length === 0) {
-    throw new Error(`Document ${document.id} has no recipient with token ${token}`);
+  if (envelope.recipients.length === 0) {
+    throw new Error(`Document ${envelope.id} has no recipient with token ${token}`);
  }

-  const [recipient] = document.recipients;
+  const [recipient] = envelope.recipients;

  if (recipient.signingStatus === SigningStatus.SIGNED) {
    throw new Error(`Recipient ${recipient.id} has already signed`);
@@ -95,7 +96,7 @@ export const completeDocumentWithToken = async ({
    });
  }

-  if (document.documentMeta?.signingOrder === DocumentSigningOrder.SEQUENTIAL) {
+  if (envelope.documentMeta?.signingOrder === DocumentSigningOrder.SEQUENTIAL) {
    const isRecipientsTurn = await getIsRecipientsTurnToSign({ token: recipient.token });

    if (!isRecipientsTurn) {
@@ -107,7 +108,7 @@ export const completeDocumentWithToken = async ({

  const fields = await prisma.field.findMany({
    where: {
-      documentId: document.id,
+      envelopeId: envelope.id,
      recipientId: recipient.id,
    },
  });
@@ -118,7 +119,7 @@ export const completeDocumentWithToken = async ({

  // Check ACCESS AUTH 2FA validation during document completion
  const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({
-    documentAuth: document.authOptions,
+    documentAuth: envelope.authOptions,
    recipientAuth: recipient.authOptions,
  });

@@ -131,7 +132,7 @@ export const completeDocumentWithToken = async ({

    const isValid = await isRecipientAuthorized({
      type: 'ACCESS_2FA',
-      documentAuthOptions: document.authOptions,
+      documentAuthOptions: envelope.authOptions,
      recipient: recipient,
      userId, // Can be undefined for non-account recipients
      authOptions: accessAuthOptions,
@@ -141,7 +142,7 @@ export const completeDocumentWithToken = async ({
      await prisma.documentAuditLog.create({
        data: createDocumentAuditLogData({
          type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_ACCESS_AUTH_2FA_FAILED,
-          documentId: document.id,
+          envelopeId: envelope.id,
          data: {
            recipientId: recipient.id,
            recipientName: recipient.name,
@@ -158,7 +159,7 @@ export const completeDocumentWithToken = async ({
    await prisma.documentAuditLog.create({
      data: createDocumentAuditLogData({
        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_ACCESS_AUTH_2FA_VALIDATED,
-        documentId: document.id,
+        envelopeId: envelope.id,
        data: {
          recipientId: recipient.id,
          recipientName: recipient.name,
@@ -180,14 +181,14 @@ export const completeDocumentWithToken = async ({
    });

    const authOptions = extractDocumentAuthMethods({
-      documentAuth: document.authOptions,
+      documentAuth: envelope.authOptions,
      recipientAuth: recipient.authOptions,
    });

    await tx.documentAuditLog.create({
      data: createDocumentAuditLogData({
        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_COMPLETED,
-        documentId: document.id,
+        envelopeId: envelope.id,
        user: {
          name: recipient.name,
          email: recipient.email,
@@ -207,7 +208,7 @@ export const completeDocumentWithToken = async ({
  await jobs.triggerJob({
    name: 'send.recipient.signed.email',
    payload: {
-      documentId: document.id,
+      documentId: legacyDocumentId,
      recipientId: recipient.id,
    },
  });
@@ -221,7 +222,7 @@ export const completeDocumentWithToken = async ({
      role: true,
    },
    where: {
-      documentId: document.id,
+      envelopeId: envelope.id,
      signingStatus: {
        not: SigningStatus.SIGNED,
      },
@@ -235,17 +236,17 @@ export const completeDocumentWithToken = async ({
  });

  if (pendingRecipients.length > 0) {
-    await sendPendingEmail({ documentId, recipientId: recipient.id });
+    await sendPendingEmail({ id, recipientId: recipient.id });

-    if (document.documentMeta?.signingOrder === DocumentSigningOrder.SEQUENTIAL) {
+    if (envelope.documentMeta?.signingOrder === DocumentSigningOrder.SEQUENTIAL) {
      const [nextRecipient] = pendingRecipients;

      await prisma.$transaction(async (tx) => {
-        if (nextSigner && document.documentMeta?.allowDictateNextSigner) {
+        if (nextSigner && envelope.documentMeta?.allowDictateNextSigner) {
          await tx.documentAuditLog.create({
            data: createDocumentAuditLogData({
              type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_UPDATED,
-              documentId: document.id,
+              envelopeId: envelope.id,
              user: {
                name: recipient.name,
                email: recipient.email,
@@ -277,7 +278,7 @@ export const completeDocumentWithToken = async ({
          where: { id: nextRecipient.id },
          data: {
            sendStatus: SendStatus.SENT,
-            ...(nextSigner && document.documentMeta?.allowDictateNextSigner
+            ...(nextSigner && envelope.documentMeta?.allowDictateNextSigner
              ? {
                  name: nextSigner.name,
                  email: nextSigner.email,
@@ -289,8 +290,8 @@ export const completeDocumentWithToken = async ({
        await jobs.triggerJob({
          name: 'send.signing.requested.email',
          payload: {
-            userId: document.userId,
-            documentId: document.id,
+            userId: envelope.userId,
+            documentId: legacyDocumentId,
            recipientId: nextRecipient.id,
            requestMetadata,
          },
@@ -299,9 +300,9 @@ export const completeDocumentWithToken = async ({
    }
  }

-  const haveAllRecipientsSigned = await prisma.document.findFirst({
+  const haveAllRecipientsSigned = await prisma.envelope.findFirst({
    where: {
-      id: document.id,
+      id: envelope.id,
      recipients: {
        every: {
          OR: [{ signingStatus: SigningStatus.SIGNED }, { role: RecipientRole.CC }],
@@ -314,15 +315,16 @@ export const completeDocumentWithToken = async ({
    await jobs.triggerJob({
      name: 'internal.seal-document',
      payload: {
-        documentId: document.id,
+        documentId: legacyDocumentId,
        requestMetadata,
      },
    });
  }

-  const updatedDocument = await prisma.document.findFirstOrThrow({
+  const updatedDocument = await prisma.envelope.findFirstOrThrow({
    where: {
-      id: document.id,
+      id: envelope.id,
+      type: EnvelopeType.DOCUMENT,
    },
    include: {
      documentMeta: true,
@@ -332,7 +334,7 @@ export const completeDocumentWithToken = async ({

  await triggerWebhook({
    event: WebhookTriggerEvents.DOCUMENT_SIGNED,
-    data: ZWebhookDocumentSchema.parse(mapDocumentToWebhookDocumentPayload(updatedDocument)),
+    data: ZWebhookDocumentSchema.parse(mapEnvelopeToWebhookDocumentPayload(updatedDocument)),
    userId: updatedDocument.userId,
    teamId: updatedDocument.teamId ?? undefined,
  });
@@ -1,278 +0,0 @@
-import type { DocumentVisibility, TemplateMeta } from '@prisma/client';
-import {
-  DocumentSource,
-  FolderType,
-  RecipientRole,
-  SendStatus,
-  SigningStatus,
-  WebhookTriggerEvents,
-} from '@prisma/client';
-
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { normalizePdf as makeNormalizedPdf } from '@documenso/lib/server-only/pdf/normalize-pdf';
-import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
-import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
-import { nanoid, prefixedId } from '@documenso/lib/universal/id';
-import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
-import { prisma } from '@documenso/prisma';
-import type { TCreateDocumentTemporaryRequest } from '@documenso/trpc/server/document-router/create-document-temporary.types';
-
-import type { TDocumentAccessAuthTypes, TDocumentActionAuthTypes } from '../../types/document-auth';
-import type { TDocumentFormValues } from '../../types/document-form-values';
-import {
-  ZWebhookDocumentSchema,
-  mapDocumentToWebhookDocumentPayload,
-} from '../../types/webhook-payload';
-import { getFileServerSide } from '../../universal/upload/get-file.server';
-import { putPdfFileServerSide } from '../../universal/upload/put-file.server';
-import { extractDerivedDocumentMeta } from '../../utils/document';
-import { createDocumentAuthOptions, createRecipientAuthOptions } from '../../utils/document-auth';
-import { determineDocumentVisibility } from '../../utils/document-visibility';
-import { buildTeamWhereQuery } from '../../utils/teams';
-import { getMemberRoles } from '../team/get-member-roles';
-import { getTeamSettings } from '../team/get-team-settings';
-import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
-
-export type CreateDocumentOptions = {
-  userId: number;
-  teamId: number;
-  documentDataId: string;
-  normalizePdf?: boolean;
-  data: {
-    title: string;
-    externalId?: string;
-    visibility?: DocumentVisibility;
-    globalAccessAuth?: TDocumentAccessAuthTypes[];
-    globalActionAuth?: TDocumentActionAuthTypes[];
-    formValues?: TDocumentFormValues;
-    recipients: TCreateDocumentTemporaryRequest['recipients'];
-    folderId?: string;
-  };
-  meta?: Partial<Omit<TemplateMeta, 'id' | 'templateId'>>;
-  requestMetadata: ApiRequestMetadata;
-};
-
-export const createDocumentV2 = async ({
-  userId,
-  teamId,
-  documentDataId,
-  normalizePdf,
-  data,
-  meta,
-  requestMetadata,
-}: CreateDocumentOptions) => {
-  const { title, formValues, folderId } = data;
-
-  const team = await prisma.team.findFirst({
-    where: buildTeamWhereQuery({ teamId, userId }),
-    include: {
-      organisation: {
-        select: {
-          organisationClaim: true,
-        },
-      },
-    },
-  });
-
-  if (!team) {
-    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'Team not found',
-    });
-  }
-
-  if (folderId) {
-    const folder = await prisma.folder.findUnique({
-      where: {
-        id: folderId,
-        type: FolderType.DOCUMENT,
-        team: buildTeamWhereQuery({ teamId, userId }),
-      },
-    });
-
-    if (!folder) {
-      throw new AppError(AppErrorCode.NOT_FOUND, {
-        message: 'Folder not found',
-      });
-    }
-  }
-
-  const settings = await getTeamSettings({
-    userId,
-    teamId,
-  });
-
-  if (normalizePdf) {
-    const documentData = await prisma.documentData.findFirst({
-      where: {
-        id: documentDataId,
-      },
-    });
-
-    if (documentData) {
-      const buffer = await getFileServerSide(documentData);
-
-      const normalizedPdf = await makeNormalizedPdf(Buffer.from(buffer));
-
-      const newDocumentData = await putPdfFileServerSide({
-        name: title.endsWith('.pdf') ? title : `${title}.pdf`,
-        type: 'application/pdf',
-        arrayBuffer: async () => Promise.resolve(normalizedPdf),
-      });
-
-      // eslint-disable-next-line require-atomic-updates
-      documentDataId = newDocumentData.id;
-    }
-  }
-
-  const authOptions = createDocumentAuthOptions({
-    globalAccessAuth: data?.globalAccessAuth || [],
-    globalActionAuth: data?.globalActionAuth || [],
-  });
-
-  const recipientsHaveActionAuth = data.recipients?.some(
-    (recipient) => recipient.actionAuth && recipient.actionAuth.length > 0,
-  );
-
-  // Check if user has permission to set the global action auth.
-  if (
-    (authOptions.globalActionAuth.length > 0 || recipientsHaveActionAuth) &&
-    !team.organisation.organisationClaim.flags.cfr21
-  ) {
-    throw new AppError(AppErrorCode.UNAUTHORIZED, {
-      message: 'You do not have permission to set the action auth',
-    });
-  }
-
-  const { teamRole } = await getMemberRoles({
-    teamId,
-    reference: {
-      type: 'User',
-      id: userId,
-    },
-  });
-
-  const visibility = determineDocumentVisibility(settings.documentVisibility, teamRole);
-
-  const emailId = meta?.emailId;
-
-  // Validate that the email ID belongs to the organisation.
-  if (emailId) {
-    const email = await prisma.organisationEmail.findFirst({
-      where: {
-        id: emailId,
-        organisationId: team.organisationId,
-      },
-    });
-
-    if (!email) {
-      throw new AppError(AppErrorCode.NOT_FOUND, {
-        message: 'Email not found',
-      });
-    }
-  }
-
-  return await prisma.$transaction(async (tx) => {
-    const document = await tx.document.create({
-      data: {
-        title,
-        qrToken: prefixedId('qr'),
-        externalId: data.externalId,
-        documentDataId,
-        userId,
-        teamId,
-        authOptions,
-        visibility,
-        folderId,
-        formValues,
-        source: DocumentSource.DOCUMENT,
-        documentMeta: {
-          create: extractDerivedDocumentMeta(settings, meta),
-        },
-      },
-    });
-
-    await Promise.all(
-      (data.recipients || []).map(async (recipient) => {
-        const recipientAuthOptions = createRecipientAuthOptions({
-          accessAuth: recipient.accessAuth ?? [],
-          actionAuth: recipient.actionAuth ?? [],
-        });
-
-        await tx.recipient.create({
-          data: {
-            documentId: document.id,
-            name: recipient.name,
-            email: recipient.email,
-            role: recipient.role,
-            signingOrder: recipient.signingOrder,
-            token: nanoid(),
-            sendStatus: recipient.role === RecipientRole.CC ? SendStatus.SENT : SendStatus.NOT_SENT,
-            signingStatus:
-              recipient.role === RecipientRole.CC ? SigningStatus.SIGNED : SigningStatus.NOT_SIGNED,
-            authOptions: recipientAuthOptions,
-            fields: {
-              createMany: {
-                data: (recipient.fields || []).map((field) => ({
-                  documentId: document.id,
-                  type: field.type,
-                  page: field.pageNumber,
-                  positionX: field.pageX,
-                  positionY: field.pageY,
-                  width: field.width,
-                  height: field.height,
-                  customText: '',
-                  inserted: false,
-                  fieldMeta: field.fieldMeta,
-                })),
-              },
-            },
-          },
-        });
-      }),
-    );
-
-    // Todo: Is it necessary to create a full audit logs with all fields and recipients audit logs?
-
-    await tx.documentAuditLog.create({
-      data: createDocumentAuditLogData({
-        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_CREATED,
-        documentId: document.id,
-        metadata: requestMetadata,
-        data: {
-          title,
-          source: {
-            type: DocumentSource.DOCUMENT,
-          },
-        },
-      }),
-    });
-
-    const createdDocument = await tx.document.findFirst({
-      where: {
-        id: document.id,
-      },
-      include: {
-        documentData: true,
-        documentMeta: true,
-        recipients: true,
-        fields: true,
-        folder: true,
-      },
-    });
-
-    if (!createdDocument) {
-      throw new AppError(AppErrorCode.NOT_FOUND, {
-        message: 'Document not found',
-      });
-    }
-
-    await triggerWebhook({
-      event: WebhookTriggerEvents.DOCUMENT_CREATED,
-      data: ZWebhookDocumentSchema.parse(mapDocumentToWebhookDocumentPayload(createdDocument)),
-      userId,
-      teamId,
-    });
-
-    return createdDocument;
-  });
-};
@@ -1,171 +0,0 @@
-import { DocumentSource, WebhookTriggerEvents } from '@prisma/client';
-import type { DocumentVisibility } from '@prisma/client';
-
-import { normalizePdf as makeNormalizedPdf } from '@documenso/lib/server-only/pdf/normalize-pdf';
-import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
-import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
-import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
-import { prisma } from '@documenso/prisma';
-
-import { AppError, AppErrorCode } from '../../errors/app-error';
-import {
-  ZWebhookDocumentSchema,
-  mapDocumentToWebhookDocumentPayload,
-} from '../../types/webhook-payload';
-import { prefixedId } from '../../universal/id';
-import { getFileServerSide } from '../../universal/upload/get-file.server';
-import { putPdfFileServerSide } from '../../universal/upload/put-file.server';
-import { extractDerivedDocumentMeta } from '../../utils/document';
-import { determineDocumentVisibility } from '../../utils/document-visibility';
-import { buildTeamWhereQuery } from '../../utils/teams';
-import { getTeamById } from '../team/get-team';
-import { getTeamSettings } from '../team/get-team-settings';
-import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
-
-export type CreateDocumentOptions = {
-  title: string;
-  externalId?: string | null;
-  userId: number;
-  teamId: number;
-  documentDataId: string;
-  formValues?: Record<string, string | number | boolean>;
-  normalizePdf?: boolean;
-  timezone?: string;
-  userTimezone?: string;
-  requestMetadata: ApiRequestMetadata;
-  folderId?: string;
-};
-
-export const createDocument = async ({
-  userId,
-  title,
-  externalId,
-  documentDataId,
-  teamId,
-  normalizePdf,
-  formValues,
-  requestMetadata,
-  timezone,
-  userTimezone,
-  folderId,
-}: CreateDocumentOptions) => {
-  const team = await getTeamById({ userId, teamId });
-
-  const settings = await getTeamSettings({
-    userId,
-    teamId,
-  });
-
-  let folderVisibility: DocumentVisibility | undefined;
-
-  if (folderId) {
-    const folder = await prisma.folder.findFirst({
-      where: {
-        id: folderId,
-        team: buildTeamWhereQuery({
-          teamId,
-          userId,
-        }),
-      },
-      select: {
-        visibility: true,
-      },
-    });
-
-    if (!folder) {
-      throw new AppError(AppErrorCode.NOT_FOUND, {
-        message: 'Folder not found',
-      });
-    }
-
-    folderVisibility = folder.visibility;
-  }
-
-  if (normalizePdf) {
-    const documentData = await prisma.documentData.findFirst({
-      where: {
-        id: documentDataId,
-      },
-    });
-
-    if (documentData) {
-      const buffer = await getFileServerSide(documentData);
-
-      const normalizedPdf = await makeNormalizedPdf(Buffer.from(buffer));
-
-      const newDocumentData = await putPdfFileServerSide({
-        name: title.endsWith('.pdf') ? title : `${title}.pdf`,
-        type: 'application/pdf',
-        arrayBuffer: async () => Promise.resolve(normalizedPdf),
-      });
-
-      // eslint-disable-next-line require-atomic-updates
-      documentDataId = newDocumentData.id;
-    }
-  }
-
-  // userTimezone is last because it's always passed in regardless of the organisation/team settings
-  // for uploads from the frontend
-  const timezoneToUse = timezone || settings.documentTimezone || userTimezone;
-
-  return await prisma.$transaction(async (tx) => {
-    const document = await tx.document.create({
-      data: {
-        title,
-        qrToken: prefixedId('qr'),
-        externalId,
-        documentDataId,
-        userId,
-        teamId,
-        folderId,
-        visibility:
-          folderVisibility ??
-          determineDocumentVisibility(settings.documentVisibility, team.currentTeamRole),
-        formValues,
-        source: DocumentSource.DOCUMENT,
-        documentMeta: {
-          create: extractDerivedDocumentMeta(settings, {
-            timezone: timezoneToUse,
-          }),
-        },
-      },
-    });
-
-    await tx.documentAuditLog.create({
-      data: createDocumentAuditLogData({
-        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_CREATED,
-        documentId: document.id,
-        metadata: requestMetadata,
-        data: {
-          title,
-          source: {
-            type: DocumentSource.DOCUMENT,
-          },
-        },
-      }),
-    });
-
-    const createdDocument = await tx.document.findFirst({
-      where: {
-        id: document.id,
-      },
-      include: {
-        documentMeta: true,
-        recipients: true,
-      },
-    });
-
-    if (!createdDocument) {
-      throw new Error('Document not found');
-    }
-
-    await triggerWebhook({
-      event: WebhookTriggerEvents.DOCUMENT_CREATED,
-      data: ZWebhookDocumentSchema.parse(mapDocumentToWebhookDocumentPayload(createdDocument)),
-      userId,
-      teamId,
-    });
-
-    return createdDocument;
-  });
-};
@@ -1,8 +1,8 @@
 import { createElement } from 'react';

 import { msg } from '@lingui/core/macro';
-import type { Document, DocumentMeta, Recipient, User } from '@prisma/client';
-import { DocumentStatus, SendStatus, WebhookTriggerEvents } from '@prisma/client';
+import type { DocumentMeta, Envelope, Recipient, User } from '@prisma/client';
+import { DocumentStatus, EnvelopeType, SendStatus, WebhookTriggerEvents } from '@prisma/client';

 import { mailer } from '@documenso/email/mailer';
 import DocumentCancelTemplate from '@documenso/email/templates/document-cancel';
@@ -15,18 +15,19 @@ import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import {
  ZWebhookDocumentSchema,
-  mapDocumentToWebhookDocumentPayload,
+  mapEnvelopeToWebhookDocumentPayload,
 } from '../../types/webhook-payload';
 import type { ApiRequestMetadata } from '../../universal/extract-request-metadata';
 import { isDocumentCompleted } from '../../utils/document';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
+import { type EnvelopeIdOptions, unsafeBuildEnvelopeIdQuery } from '../../utils/envelope';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 import { getEmailContext } from '../email/get-email-context';
 import { getMemberRoles } from '../team/get-member-roles';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';

 export type DeleteDocumentOptions = {
-  id: number;
+  id: EnvelopeIdOptions;
  userId: number;
  teamId: number;
  requestMetadata: ApiRequestMetadata;
@@ -50,24 +51,23 @@ export const deleteDocument = async ({
    });
  }

-  const document = await prisma.document.findUnique({
-    where: {
-      id,
-    },
+  // Note: This is an unsafe request, we validate the ownership later in the function.
+  const envelope = await prisma.envelope.findUnique({
+    where: unsafeBuildEnvelopeIdQuery(id, EnvelopeType.DOCUMENT),
    include: {
      recipients: true,
      documentMeta: true,
    },
  });

-  if (!document) {
+  if (!envelope) {
    throw new AppError(AppErrorCode.NOT_FOUND, {
      message: 'Document not found',
    });
  }

  const isUserTeamMember = await getMemberRoles({
-    teamId: document.teamId,
+    teamId: envelope.teamId,
    reference: {
      type: 'User',
      id: userId,
@@ -76,8 +76,8 @@ export const deleteDocument = async ({
    .then(() => true)
    .catch(() => false);

-  const isUserOwner = document.userId === userId;
-  const userRecipient = document.recipients.find((recipient) => recipient.email === user.email);
+  const isUserOwner = envelope.userId === userId;
+  const userRecipient = envelope.recipients.find((recipient) => recipient.email === user.email);

  if (!isUserOwner && !isUserTeamMember && !userRecipient) {
    throw new AppError(AppErrorCode.UNAUTHORIZED, {
@@ -88,7 +88,7 @@ export const deleteDocument = async ({
  // Handle hard or soft deleting the actual document if user has permission.
  if (isUserOwner || isUserTeamMember) {
    await handleDocumentOwnerDelete({
-      document,
+      envelope,
      user,
      requestMetadata,
    });
@@ -113,27 +113,16 @@ export const deleteDocument = async ({

  await triggerWebhook({
    event: WebhookTriggerEvents.DOCUMENT_CANCELLED,
-    data: ZWebhookDocumentSchema.parse(mapDocumentToWebhookDocumentPayload(document)),
+    data: ZWebhookDocumentSchema.parse(mapEnvelopeToWebhookDocumentPayload(envelope)),
    userId,
    teamId,
  });

-  // Return partial document for API v1 response.
-  return {
-    id: document.id,
-    userId: document.userId,
-    teamId: document.teamId,
-    title: document.title,
-    status: document.status,
-    documentDataId: document.documentDataId,
-    createdAt: document.createdAt,
-    updatedAt: document.updatedAt,
-    completedAt: document.completedAt,
-  };
+  return envelope;
 };

 type HandleDocumentOwnerDeleteOptions = {
-  document: Document & {
+  envelope: Envelope & {
    recipients: Recipient[];
    documentMeta: DocumentMeta | null;
  };
@@ -142,11 +131,11 @@ type HandleDocumentOwnerDeleteOptions = {
 };

 const handleDocumentOwnerDelete = async ({
-  document,
+  envelope,
  user,
  requestMetadata,
 }: HandleDocumentOwnerDeleteOptions) => {
-  if (document.deletedAt) {
+  if (envelope.deletedAt) {
    return;
  }

@@ -154,17 +143,17 @@ const handleDocumentOwnerDelete = async ({
    emailType: 'RECIPIENT',
    source: {
      type: 'team',
-      teamId: document.teamId,
+      teamId: envelope.teamId,
    },
-    meta: document.documentMeta,
+    meta: envelope.documentMeta,
  });

  // Soft delete completed documents.
-  if (isDocumentCompleted(document.status)) {
+  if (isDocumentCompleted(envelope.status)) {
    return await prisma.$transaction(async (tx) => {
      await tx.documentAuditLog.create({
        data: createDocumentAuditLogData({
-          documentId: document.id,
+          envelopeId: envelope.id,
          type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_DELETED,
          metadata: requestMetadata,
          data: {
@@ -173,9 +162,9 @@ const handleDocumentOwnerDelete = async ({
        }),
      });

-      return await tx.document.update({
+      return await tx.envelope.update({
        where: {
-          id: document.id,
+          id: envelope.id,
        },
        data: {
          deletedAt: new Date().toISOString(),
@@ -185,12 +174,12 @@ const handleDocumentOwnerDelete = async ({
  }

  // Hard delete draft and pending documents.
-  const deletedDocument = await prisma.$transaction(async (tx) => {
+  const deletedEnvelope = await prisma.$transaction(async (tx) => {
    // Currently redundant since deleting a document will delete the audit logs.
    // However may be useful if we disassociate audit logs and documents if required.
    await tx.documentAuditLog.create({
      data: createDocumentAuditLogData({
-        documentId: document.id,
+        envelopeId: envelope.id,
        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_DELETED,
        metadata: requestMetadata,
        data: {
@@ -199,9 +188,9 @@ const handleDocumentOwnerDelete = async ({
      }),
    });

-    return await tx.document.delete({
+    return await tx.envelope.delete({
      where: {
-        id: document.id,
+        id: envelope.id,
        status: {
          not: DocumentStatus.COMPLETED,
        },
@@ -209,17 +198,17 @@ const handleDocumentOwnerDelete = async ({
    });
  });

-  const isDocumentDeleteEmailEnabled = extractDerivedDocumentEmailSettings(
-    document.documentMeta,
+  const isEnvelopeDeleteEmailEnabled = extractDerivedDocumentEmailSettings(
+    envelope.documentMeta,
  ).documentDeleted;

-  if (!isDocumentDeleteEmailEnabled) {
-    return deletedDocument;
+  if (!isEnvelopeDeleteEmailEnabled) {
+    return deletedEnvelope;
  }

  // Send cancellation emails to recipients.
  await Promise.all(
-    document.recipients.map(async (recipient) => {
+    envelope.recipients.map(async (recipient) => {
      if (recipient.sendStatus !== SendStatus.SENT) {
        return;
      }
@@ -227,7 +216,7 @@ const handleDocumentOwnerDelete = async ({
      const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';

      const template = createElement(DocumentCancelTemplate, {
-        documentName: document.title,
+        documentName: envelope.title,
        inviterName: user.name || undefined,
        inviterEmail: user.email,
        assetBaseUrl,
@@ -258,5 +247,5 @@ const handleDocumentOwnerDelete = async ({
    }),
  );

-  return deletedDocument;
+  return deletedEnvelope;
 };
@@ -1,152 +0,0 @@
-import type { Prisma, Recipient } from '@prisma/client';
-import { DocumentSource, WebhookTriggerEvents } from '@prisma/client';
-import { omit } from 'remeda';
-
-import { prisma } from '@documenso/prisma';
-
-import { AppError, AppErrorCode } from '../../errors/app-error';
-import {
-  ZWebhookDocumentSchema,
-  mapDocumentToWebhookDocumentPayload,
-} from '../../types/webhook-payload';
-import { nanoid, prefixedId } from '../../universal/id';
-import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
-import { getDocumentWhereInput } from './get-document-by-id';
-
-export interface DuplicateDocumentOptions {
-  documentId: number;
-  userId: number;
-  teamId: number;
-}
-
-export const duplicateDocument = async ({
-  documentId,
-  userId,
-  teamId,
-}: DuplicateDocumentOptions) => {
-  const { documentWhereInput } = await getDocumentWhereInput({
-    documentId,
-    userId,
-    teamId,
-  });
-
-  const document = await prisma.document.findFirst({
-    where: documentWhereInput,
-    select: {
-      title: true,
-      userId: true,
-      documentData: {
-        select: {
-          data: true,
-          initialData: true,
-          type: true,
-        },
-      },
-      authOptions: true,
-      visibility: true,
-      documentMeta: true,
-      recipients: {
-        select: {
-          email: true,
-          name: true,
-          role: true,
-          signingOrder: true,
-          fields: true,
-        },
-      },
-    },
-  });
-
-  if (!document) {
-    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'Document not found',
-    });
-  }
-
-  const documentData = await prisma.documentData.create({
-    data: {
-      type: document.documentData.type,
-      data: document.documentData.initialData,
-      initialData: document.documentData.initialData,
-    },
-  });
-
-  let documentMeta: Prisma.DocumentCreateArgs['data']['documentMeta'] | undefined = undefined;
-
-  if (document.documentMeta) {
-    documentMeta = {
-      create: {
-        ...omit(document.documentMeta, ['id', 'documentId']),
-        emailSettings: document.documentMeta.emailSettings || undefined,
-      },
-    };
-  }
-
-  const createdDocument = await prisma.document.create({
-    data: {
-      userId: document.userId,
-      teamId: teamId,
-      title: document.title,
-      documentDataId: documentData.id,
-      authOptions: document.authOptions || undefined,
-      visibility: document.visibility,
-      qrToken: prefixedId('qr'),
-      documentMeta,
-      source: DocumentSource.DOCUMENT,
-    },
-    include: {
-      recipients: true,
-      documentMeta: true,
-    },
-  });
-
-  const recipientsToCreate = document.recipients.map((recipient) => ({
-    documentId: createdDocument.id,
-    email: recipient.email,
-    name: recipient.name,
-    role: recipient.role,
-    signingOrder: recipient.signingOrder,
-    token: nanoid(),
-    fields: {
-      createMany: {
-        data: recipient.fields.map((field) => ({
-          documentId: createdDocument.id,
-          type: field.type,
-          page: field.page,
-          positionX: field.positionX,
-          positionY: field.positionY,
-          width: field.width,
-          height: field.height,
-          customText: '',
-          inserted: false,
-          fieldMeta: field.fieldMeta as PrismaJson.FieldMeta,
-        })),
-      },
-    },
-  }));
-
-  const recipients: Recipient[] = [];
-
-  for (const recipientData of recipientsToCreate) {
-    const newRecipient = await prisma.recipient.create({
-      data: recipientData,
-    });
-
-    recipients.push(newRecipient);
-  }
-
-  await triggerWebhook({
-    event: WebhookTriggerEvents.DOCUMENT_CREATED,
-    data: ZWebhookDocumentSchema.parse({
-      ...mapDocumentToWebhookDocumentPayload(createdDocument),
-      recipients,
-      documentMeta: createdDocument.documentMeta,
-    }),
-    userId: userId,
-    teamId: teamId,
-  });
-
-  return {
-    documentId: createdDocument.id,
-  };
-};
@@ -1,4 +1,4 @@
-import type { DocumentAuditLog, Prisma } from '@prisma/client';
+import { type DocumentAuditLog, EnvelopeType, type Prisma } from '@prisma/client';

 import { prisma } from '@documenso/prisma';

@@ -6,7 +6,7 @@ import { AppError, AppErrorCode } from '../../errors/app-error';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
 import type { FindResultResponse } from '../../types/search-params';
 import { parseDocumentAuditLogData } from '../../utils/document-audit-logs';
-import { getDocumentWhereInput } from './get-document-by-id';
+import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';

 export interface FindDocumentAuditLogsOptions {
  userId: number;
@@ -35,22 +35,26 @@ export const findDocumentAuditLogs = async ({
  const orderByColumn = orderBy?.column ?? 'createdAt';
  const orderByDirection = orderBy?.direction ?? 'desc';

-  const { documentWhereInput } = await getDocumentWhereInput({
-    documentId,
+  const { envelopeWhereInput } = await getEnvelopeWhereInput({
+    id: {
+      type: 'documentId',
+      id: documentId,
+    },
+    type: EnvelopeType.DOCUMENT,
    userId,
    teamId,
  });

-  const document = await prisma.document.findFirst({
-    where: documentWhereInput,
+  const envelope = await prisma.envelope.findUnique({
+    where: envelopeWhereInput,
  });

-  if (!document) {
+  if (!envelope) {
    throw new AppError(AppErrorCode.NOT_FOUND);
  }

  const whereClause: Prisma.DocumentAuditLogWhereInput = {
-    documentId,
+    envelopeId: envelope.id,
  };

  // Filter events down to what we consider recent activity.
@@ -1,5 +1,5 @@
-import type { Document, DocumentSource, Prisma, Team, TeamEmail, User } from '@prisma/client';
-import { RecipientRole, SigningStatus, TeamMemberRole } from '@prisma/client';
+import type { DocumentSource, Envelope, Prisma, Team, TeamEmail, User } from '@prisma/client';
+import { EnvelopeType, RecipientRole, SigningStatus, TeamMemberRole } from '@prisma/client';
 import { DateTime } from 'luxon';
 import { match } from 'ts-pattern';

@@ -22,7 +22,7 @@ export type FindDocumentsOptions = {
  page?: number;
  perPage?: number;
  orderBy?: {
-    column: keyof Omit<Document, 'document'>;
+    column: keyof Pick<Envelope, 'createdAt'>;
    direction: 'asc' | 'desc';
  };
  period?: PeriodSelectorValue;
@@ -69,7 +69,7 @@ export const findDocuments = async ({
  const orderByDirection = orderBy?.direction ?? 'desc';
  const teamMemberRole = team?.currentTeamRole ?? null;

-  const searchFilter: Prisma.DocumentWhereInput = {
+  const searchFilter: Prisma.EnvelopeWhereInput = {
    OR: [
      { title: { contains: query, mode: 'insensitive' } },
      { externalId: { contains: query, mode: 'insensitive' } },
@@ -111,7 +111,7 @@ export const findDocuments = async ({
    },
  ];

-  let filters: Prisma.DocumentWhereInput | null = findDocumentsFilter(status, user, folderId);
+  let filters: Prisma.EnvelopeWhereInput | null = findDocumentsFilter(status, user, folderId);

  if (team) {
    filters = findTeamDocumentsFilter(status, team, visibilityFilters, folderId);
@@ -127,7 +127,7 @@ export const findDocuments = async ({
    };
  }

-  let deletedFilter: Prisma.DocumentWhereInput = {
+  let deletedFilter: Prisma.EnvelopeWhereInput = {
    AND: {
      OR: [
        {
@@ -180,7 +180,7 @@ export const findDocuments = async ({
    };
  }

-  const whereAndClause: Prisma.DocumentWhereInput['AND'] = [
+  const whereAndClause: Prisma.EnvelopeWhereInput['AND'] = [
    { ...filters },
    { ...deletedFilter },
    { ...searchFilter },
@@ -198,7 +198,8 @@ export const findDocuments = async ({
    });
  }

-  const whereClause: Prisma.DocumentWhereInput = {
+  const whereClause: Prisma.EnvelopeWhereInput = {
+    type: EnvelopeType.DOCUMENT,
    AND: whereAndClause,
  };

@@ -225,7 +226,7 @@ export const findDocuments = async ({
  }

  const [data, count] = await Promise.all([
-    prisma.document.findMany({
+    prisma.envelope.findMany({
      where: whereClause,
      skip: Math.max(page - 1, 0) * perPage,
      take: perPage,
@@ -249,7 +250,7 @@ export const findDocuments = async ({
        },
      },
    }),
-    prisma.document.count({
+    prisma.envelope.count({
      where: whereClause,
    }),
  ]);
@@ -275,7 +276,7 @@ const findDocumentsFilter = (
  user: Pick<User, 'id' | 'email' | 'name'>,
  folderId?: string | null,
 ) => {
-  return match<ExtendedDocumentStatus, Prisma.DocumentWhereInput>(status)
+  return match<ExtendedDocumentStatus, Prisma.EnvelopeWhereInput>(status)
    .with(ExtendedDocumentStatus.ALL, () => ({
      OR: [
        {
@@ -414,14 +415,14 @@ const findDocumentsFilter = (
 const findTeamDocumentsFilter = (
  status: ExtendedDocumentStatus,
  team: Team & { teamEmail: TeamEmail | null },
-  visibilityFilters: Prisma.DocumentWhereInput[],
+  visibilityFilters: Prisma.EnvelopeWhereInput[],
  folderId?: string,
 ) => {
  const teamEmail = team.teamEmail?.email ?? null;

-  return match<ExtendedDocumentStatus, Prisma.DocumentWhereInput | null>(status)
+  return match<ExtendedDocumentStatus, Prisma.EnvelopeWhereInput | null>(status)
    .with(ExtendedDocumentStatus.ALL, () => {
-      const filter: Prisma.DocumentWhereInput = {
+      const filter: Prisma.EnvelopeWhereInput = {
        // Filter to display all documents that belong to the team.
        OR: [
          {
@@ -483,7 +484,7 @@ const findTeamDocumentsFilter = (
      };
    })
    .with(ExtendedDocumentStatus.DRAFT, () => {
-      const filter: Prisma.DocumentWhereInput = {
+      const filter: Prisma.EnvelopeWhereInput = {
        OR: [
          {
            teamId: team.id,
@@ -508,7 +509,7 @@ const findTeamDocumentsFilter = (
      return filter;
    })
    .with(ExtendedDocumentStatus.PENDING, () => {
-      const filter: Prisma.DocumentWhereInput = {
+      const filter: Prisma.EnvelopeWhereInput = {
        OR: [
          {
            teamId: team.id,
@@ -550,7 +551,7 @@ const findTeamDocumentsFilter = (
      return filter;
    })
    .with(ExtendedDocumentStatus.COMPLETED, () => {
-      const filter: Prisma.DocumentWhereInput = {
+      const filter: Prisma.EnvelopeWhereInput = {
        status: ExtendedDocumentStatus.COMPLETED,
        OR: [
          {
@@ -582,7 +583,7 @@ const findTeamDocumentsFilter = (
      return filter;
    })
    .with(ExtendedDocumentStatus.REJECTED, () => {
-      const filter: Prisma.DocumentWhereInput = {
+      const filter: Prisma.EnvelopeWhereInput = {
        status: ExtendedDocumentStatus.REJECTED,
        OR: [
          {
@@ -1,5 +1,9 @@
+import { DocumentStatus, EnvelopeType } from '@prisma/client';
+
 import { prisma } from '@documenso/prisma';

+import { mapSecondaryIdToDocumentId } from '../../utils/envelope';
+
 export type GetDocumentByAccessTokenOptions = {
  token: string;
 };
@@ -9,30 +13,62 @@ export const getDocumentByAccessToken = async ({ token }: GetDocumentByAccessTok
    throw new Error('Missing token');
  }

-  const result = await prisma.document.findFirstOrThrow({
+  const result = await prisma.envelope.findFirstOrThrow({
    where: {
+      type: EnvelopeType.DOCUMENT,
+      status: DocumentStatus.COMPLETED,
      qrToken: token,
    },
+    // Do not provide extra information that is not needed.
    select: {
      id: true,
+      secondaryId: true,
+      internalVersion: true,
      title: true,
      completedAt: true,
-      documentData: {
+      team: {
+        select: {
+          url: true,
+        },
+      },
+      envelopeItems: {
        select: {
          id: true,
-          type: true,
-          data: true,
-          initialData: true,
+          title: true,
+          order: true,
+          documentDataId: true,
+          envelopeId: true,
+          documentData: {
+            select: {
+              id: true,
+              type: true,
+              data: true,
+              initialData: true,
+            },
+          },
        },
      },
-      documentMeta: {
+      _count: {
        select: {
-          password: true,
+          recipients: true,
        },
      },
-      recipients: true,
    },
  });

-  return result;
+  const firstDocumentData = result.envelopeItems[0].documentData;
+
+  if (!firstDocumentData) {
+    throw new Error('Missing document data');
+  }
+
+  return {
+    id: mapSecondaryIdToDocumentId(result.secondaryId),
+    internalVersion: result.internalVersion,
+    title: result.title,
+    completedAt: result.completedAt,
+    envelopeItems: result.envelopeItems,
+    recipientCount: result._count.recipients,
+    documentTeamUrl: result.team.url,
+  };
 };
@@ -1,156 +0,0 @@
-import type { Prisma } from '@prisma/client';
-import { DocumentStatus, TeamMemberRole } from '@prisma/client';
-import { match } from 'ts-pattern';
-
-import { prisma } from '@documenso/prisma';
-
-import { AppError, AppErrorCode } from '../../errors/app-error';
-import { DocumentVisibility } from '../../types/document-visibility';
-import { getTeamById } from '../team/get-team';
-
-export type GetDocumentByIdOptions = {
-  documentId: number;
-  userId: number;
-  teamId: number;
-  folderId?: string;
-};
-
-export const getDocumentById = async ({
-  documentId,
-  userId,
-  teamId,
-  folderId,
-}: GetDocumentByIdOptions) => {
-  const { documentWhereInput } = await getDocumentWhereInput({
-    documentId,
-    userId,
-    teamId,
-  });
-
-  const document = await prisma.document.findFirst({
-    where: {
-      ...documentWhereInput,
-      folderId,
-    },
-    include: {
-      documentData: true,
-      documentMeta: true,
-      user: {
-        select: {
-          id: true,
-          name: true,
-          email: true,
-        },
-      },
-      recipients: {
-        select: {
-          email: true,
-        },
-      },
-      team: {
-        select: {
-          id: true,
-          url: true,
-        },
-      },
-    },
-  });
-
-  if (!document) {
-    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'Document could not be found',
-    });
-  }
-
-  return document;
-};
-
-export type GetDocumentWhereInputOptions = {
-  documentId: number;
-  userId: number;
-  teamId: number;
-};
-
-/**
- * Generate the where input for a given Prisma document query.
- *
- * This will return a query that allows a user to get a document if they have valid access to it.
- */
-export const getDocumentWhereInput = async ({
-  documentId,
-  userId,
-  teamId,
-}: GetDocumentWhereInputOptions) => {
-  const team = await getTeamById({ teamId, userId });
-
-  const user = await prisma.user.findFirstOrThrow({
-    where: {
-      id: userId,
-    },
-  });
-
-  const teamVisibilityFilters = match(team.currentTeamRole)
-    .with(TeamMemberRole.ADMIN, () => [
-      DocumentVisibility.EVERYONE,
-      DocumentVisibility.MANAGER_AND_ABOVE,
-      DocumentVisibility.ADMIN,
-    ])
-    .with(TeamMemberRole.MANAGER, () => [
-      DocumentVisibility.EVERYONE,
-      DocumentVisibility.MANAGER_AND_ABOVE,
-    ])
-    .otherwise(() => [DocumentVisibility.EVERYONE]);
-
-  const documentOrInput: Prisma.DocumentWhereInput[] = [
-    // Allow access if they own the document.
-    {
-      userId,
-    },
-    // Or, if they belong to the team that the document is associated with.
-    {
-      visibility: {
-        in: teamVisibilityFilters,
-      },
-      teamId: team.id,
-    },
-    // Or, if they are a recipient of the document.
-    {
-      status: {
-        not: DocumentStatus.DRAFT,
-      },
-      recipients: {
-        some: {
-          email: user.email,
-        },
-      },
-    },
-  ];
-
-  // Allow access to documents sent to or from the team email.
-  if (team.teamEmail) {
-    documentOrInput.push(
-      {
-        recipients: {
-          some: {
-            email: team.teamEmail.email,
-          },
-        },
-      },
-      {
-        user: {
-          email: team.teamEmail.email,
-        },
-      },
-    );
-  }
-
-  const documentWhereInput: Prisma.DocumentWhereUniqueInput = {
-    id: documentId,
-    OR: documentOrInput,
-  };
-
-  return {
-    documentWhereInput,
-    team,
-  };
-};
@@ -1,8 +1,10 @@
+import { EnvelopeType } from '@prisma/client';
+
 import { prisma } from '@documenso/prisma';
-import type { DocumentWithRecipient } from '@documenso/prisma/types/document-with-recipient';

 import { AppError, AppErrorCode } from '../../errors/app-error';
 import type { TDocumentAuthMethods } from '../../types/document-auth';
+import { mapSecondaryIdToDocumentId } from '../../utils/envelope';
 import { isRecipientAuthorized } from './is-recipient-authorized';

 export interface GetDocumentAndSenderByTokenOptions {
@@ -39,8 +41,9 @@ export const getDocumentByToken = async ({ token }: GetDocumentByTokenOptions) =
    throw new Error('Missing token');
  }

-  const result = await prisma.document.findFirstOrThrow({
+  const result = await prisma.envelope.findFirstOrThrow({
    where: {
+      type: EnvelopeType.DOCUMENT,
      recipients: {
        some: {
          token,
@@ -64,8 +67,9 @@ export const getDocumentAndSenderByToken = async ({
    throw new Error('Missing token');
  }

-  const result = await prisma.document.findFirstOrThrow({
+  const result = await prisma.envelope.findFirstOrThrow({
    where: {
+      type: EnvelopeType.DOCUMENT,
      recipients: {
        some: {
          token,
@@ -80,13 +84,17 @@ export const getDocumentAndSenderByToken = async ({
          name: true,
        },
      },
-      documentData: true,
      documentMeta: true,
      recipients: {
        where: {
          token,
        },
      },
+      envelopeItems: {
+        select: {
+          documentData: true,
+        },
+      },
      team: {
        select: {
          name: true,
@@ -102,6 +110,12 @@ export const getDocumentAndSenderByToken = async ({
    },
  });

+  const firstDocumentData = result.envelopeItems[0].documentData;
+
+  if (!firstDocumentData) {
+    throw new Error('Missing document data');
+  }
+
  const recipient = result.recipients[0];

  // Sanity check, should not be possible.
@@ -127,6 +141,8 @@ export const getDocumentAndSenderByToken = async ({
    });
  }

+  const legacyDocumentId = mapSecondaryIdToDocumentId(result.secondaryId);
+
  return {
    ...result,
    user: {
@@ -134,64 +150,8 @@ export const getDocumentAndSenderByToken = async ({
      email: result.user.email,
      name: result.user.name,
    },
+    documentData: firstDocumentData,
+    id: legacyDocumentId,
+    envelopeId: result.id,
  };
 };
-
-/**
- * Get a Document and a Recipient by the recipient token.
- */
-export const getDocumentAndRecipientByToken = async ({
-  token,
-  userId,
-  accessAuth,
-  requireAccessAuth = true,
-}: GetDocumentAndRecipientByTokenOptions): Promise<DocumentWithRecipient> => {
-  if (!token) {
-    throw new Error('Missing token');
-  }
-
-  const result = await prisma.document.findFirstOrThrow({
-    where: {
-      recipients: {
-        some: {
-          token,
-        },
-      },
-    },
-    include: {
-      recipients: {
-        where: {
-          token,
-        },
-      },
-      documentData: true,
-    },
-  });
-
-  const [recipient] = result.recipients;
-
-  // Sanity check, should not be possible.
-  if (!recipient) {
-    throw new Error('Missing recipient');
-  }
-
-  let documentAccessValid = true;
-
-  if (requireAccessAuth) {
-    documentAccessValid = await isRecipientAuthorized({
-      type: 'ACCESS',
-      documentAuthOptions: result.authOptions,
-      recipient,
-      userId,
-      authOptions: accessAuth,
-    });
-  }
-
-  if (!documentAccessValid) {
-    throw new AppError(AppErrorCode.UNAUTHORIZED, {
-      message: 'Invalid access values',
-    });
-  }
-
-  return result;
-};
@@ -4,15 +4,15 @@ import { DOCUMENT_AUDIT_LOG_TYPE, DOCUMENT_EMAIL_TYPE } from '../../types/docume
 import { parseDocumentAuditLogData } from '../../utils/document-audit-logs';

 export type GetDocumentCertificateAuditLogsOptions = {
-  id: number;
+  envelopeId: string;
 };

 export const getDocumentCertificateAuditLogs = async ({
-  id,
+  envelopeId,
 }: GetDocumentCertificateAuditLogsOptions) => {
  const rawAuditLogs = await prisma.documentAuditLog.findMany({
    where: {
-      documentId: id,
+      envelopeId,
      type: {
        in: [
          DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_COMPLETED,
@@ -1,13 +0,0 @@
-import { prisma } from '@documenso/prisma';
-
-export interface GetDocumentMetaByDocumentIdOptions {
-  id: number;
-}
-
-export const getDocumentMetaByDocumentId = async ({ id }: GetDocumentMetaByDocumentIdOptions) => {
-  return await prisma.documentMeta.findFirstOrThrow({
-    where: {
-      documentId: id,
-    },
-  });
-};
@@ -1,67 +1,66 @@
-import { prisma } from '@documenso/prisma';
+import { EnvelopeType } from '@prisma/client';

-import { AppError, AppErrorCode } from '../../errors/app-error';
-import { getDocumentWhereInput } from './get-document-by-id';
+import { type EnvelopeIdOptions, mapSecondaryIdToDocumentId } from '../../utils/envelope';
+import { getEnvelopeById } from '../envelope/get-envelope-by-id';

 export type GetDocumentWithDetailsByIdOptions = {
-  documentId: number;
+  id: EnvelopeIdOptions;
  userId: number;
  teamId: number;
 };

 export const getDocumentWithDetailsById = async ({
-  documentId,
+  id,
  userId,
  teamId,
 }: GetDocumentWithDetailsByIdOptions) => {
-  const { documentWhereInput } = await getDocumentWhereInput({
-    documentId,
+  const envelope = await getEnvelopeById({
+    id,
+    type: EnvelopeType.DOCUMENT,
    userId,
    teamId,
  });

-  const document = await prisma.document.findFirst({
-    where: {
-      ...documentWhereInput,
-    },
-    include: {
-      documentData: true,
-      documentMeta: true,
-      recipients: true,
-      folder: true,
-      fields: {
-        include: {
-          signature: true,
-          recipient: {
-            select: {
-              name: true,
-              email: true,
-              signingStatus: true,
-            },
-          },
-        },
-      },
-      team: {
-        select: {
-          id: true,
-          url: true,
-        },
-      },
-      user: {
-        select: {
-          id: true,
-          name: true,
-          email: true,
-        },
-      },
-    },
-  });
+  const legacyDocumentId = mapSecondaryIdToDocumentId(envelope.secondaryId);

-  if (!document) {
-    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'Document not found',
-    });
+  const firstDocumentData = envelope.envelopeItems[0].documentData;
+
+  if (!firstDocumentData) {
+    throw new Error('Document data not found');
  }

-  return document;
+  return {
+    ...envelope,
+    envelopeId: envelope.id,
+    documentData: {
+      ...firstDocumentData,
+      envelopeItemId: envelope.envelopeItems[0].id,
+    },
+    id: legacyDocumentId,
+    fields: envelope.fields.map((field) => ({
+      ...field,
+      documentId: legacyDocumentId,
+      templateId: null,
+    })),
+    user: {
+      id: envelope.userId,
+      name: envelope.user.name,
+      email: envelope.user.email,
+    },
+    team: {
+      id: envelope.teamId,
+      url: envelope.team.url,
+    },
+    recipients: envelope.recipients.map((recipient) => ({
+      ...recipient,
+      documentId: legacyDocumentId,
+      templateId: null,
+    })),
+    documentDataId: firstDocumentData.id,
+    documentMeta: {
+      ...envelope.documentMeta,
+      documentId: legacyDocumentId,
+      password: null,
+    },
+  };
 };
@@ -7,7 +7,7 @@ export type GetRecipientOrSenderByShareLinkSlugOptions = {
 export const getRecipientOrSenderByShareLinkSlug = async ({
  slug,
 }: GetRecipientOrSenderByShareLinkSlugOptions) => {
-  const { documentId, email } = await prisma.documentShareLink.findFirstOrThrow({
+  const { envelopeId, email } = await prisma.documentShareLink.findFirstOrThrow({
    where: {
      slug,
    },
@@ -15,7 +15,7 @@ export const getRecipientOrSenderByShareLinkSlug = async ({

  const sender = await prisma.user.findFirst({
    where: {
-      documents: { some: { id: documentId } },
+      envelopes: { some: { id: envelopeId } },
      email,
    },
    select: {
@@ -31,7 +31,7 @@ export const getRecipientOrSenderByShareLinkSlug = async ({

  const recipient = await prisma.recipient.findFirst({
    where: {
-      documentId,
+      envelopeId,
      email,
    },
    select: {
@@ -1,4 +1,4 @@
-import { TeamMemberRole } from '@prisma/client';
+import { EnvelopeType, TeamMemberRole } from '@prisma/client';
 import type { Prisma, User } from '@prisma/client';
 import { SigningStatus } from '@prisma/client';
 import { DocumentVisibility } from '@prisma/client';
@@ -25,7 +25,7 @@ export const getStats = async ({
  folderId,
  ...options
 }: GetStatsInput) => {
-  let createdAt: Prisma.DocumentWhereInput['createdAt'];
+  let createdAt: Prisma.EnvelopeWhereInput['createdAt'];

  if (period) {
    const daysAgo = parseInt(period.replace(/d$/, ''), 10);
@@ -90,13 +90,13 @@ export const getStats = async ({

 type GetCountsOption = {
  user: Pick<User, 'id' | 'email'>;
-  createdAt: Prisma.DocumentWhereInput['createdAt'];
+  createdAt: Prisma.EnvelopeWhereInput['createdAt'];
  search?: string;
  folderId?: string | null;
 };

 const getCounts = async ({ user, createdAt, search, folderId }: GetCountsOption) => {
-  const searchFilter: Prisma.DocumentWhereInput = {
+  const searchFilter: Prisma.EnvelopeWhereInput = {
    OR: [
      { title: { contains: search, mode: 'insensitive' } },
      { recipients: { some: { name: { contains: search, mode: 'insensitive' } } } },
@@ -108,12 +108,13 @@ const getCounts = async ({ user, createdAt, search, folderId }: GetCountsOption)

  return Promise.all([
    // Owner counts.
-    prisma.document.groupBy({
+    prisma.envelope.groupBy({
      by: ['status'],
      _count: {
        _all: true,
      },
      where: {
+        type: EnvelopeType.DOCUMENT,
        userId: user.id,
        createdAt,
        deletedAt: null,
@@ -121,12 +122,13 @@ const getCounts = async ({ user, createdAt, search, folderId }: GetCountsOption)
      },
    }),
    // Not signed counts.
-    prisma.document.groupBy({
+    prisma.envelope.groupBy({
      by: ['status'],
      _count: {
        _all: true,
      },
      where: {
+        type: EnvelopeType.DOCUMENT,
        status: ExtendedDocumentStatus.PENDING,
        recipients: {
          some: {
@@ -140,12 +142,13 @@ const getCounts = async ({ user, createdAt, search, folderId }: GetCountsOption)
      },
    }),
    // Has signed counts.
-    prisma.document.groupBy({
+    prisma.envelope.groupBy({
      by: ['status'],
      _count: {
        _all: true,
      },
      where: {
+        type: EnvelopeType.DOCUMENT,
        createdAt,
        user: {
          email: {
@@ -186,7 +189,7 @@ type GetTeamCountsOption = {
  senderIds?: number[];
  currentUserEmail: string;
  userId: number;
-  createdAt: Prisma.DocumentWhereInput['createdAt'];
+  createdAt: Prisma.EnvelopeWhereInput['createdAt'];
  currentTeamMemberRole?: TeamMemberRole;
  search?: string;
  folderId?: string | null;
@@ -197,14 +200,14 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {

  const senderIds = options.senderIds ?? [];

-  const userIdWhereClause: Prisma.DocumentWhereInput['userId'] =
+  const userIdWhereClause: Prisma.EnvelopeWhereInput['userId'] =
    senderIds.length > 0
      ? {
          in: senderIds,
        }
      : undefined;

-  const searchFilter: Prisma.DocumentWhereInput = {
+  const searchFilter: Prisma.EnvelopeWhereInput = {
    OR: [
      { title: { contains: options.search, mode: 'insensitive' } },
      { recipients: { some: { name: { contains: options.search, mode: 'insensitive' } } } },
@@ -212,7 +215,8 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
    ],
  };

-  let ownerCountsWhereInput: Prisma.DocumentWhereInput = {
+  let ownerCountsWhereInput: Prisma.EnvelopeWhereInput = {
+    type: EnvelopeType.DOCUMENT,
    userId: userIdWhereClause,
    createdAt,
    teamId,
@@ -223,7 +227,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
  let notSignedCountsGroupByArgs = null;
  let hasSignedCountsGroupByArgs = null;

-  const visibilityFiltersWhereInput: Prisma.DocumentWhereInput = {
+  const visibilityFiltersWhereInput: Prisma.EnvelopeWhereInput = {
    AND: [
      { deletedAt: null },
      {
@@ -267,6 +271,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {

  if (teamEmail) {
    ownerCountsWhereInput = {
+      type: EnvelopeType.DOCUMENT,
      userId: userIdWhereClause,
      createdAt,
      OR: [
@@ -288,6 +293,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
        _all: true,
      },
      where: {
+        type: EnvelopeType.DOCUMENT,
        userId: userIdWhereClause,
        createdAt,
        folderId,
@@ -301,7 +307,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
        },
        deletedAt: null,
      },
-    } satisfies Prisma.DocumentGroupByArgs;
+    } satisfies Prisma.EnvelopeGroupByArgs;

    hasSignedCountsGroupByArgs = {
      by: ['status'],
@@ -309,6 +315,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
        _all: true,
      },
      where: {
+        type: EnvelopeType.DOCUMENT,
        userId: userIdWhereClause,
        createdAt,
        folderId,
@@ -336,18 +343,18 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
          },
        ],
      },
-    } satisfies Prisma.DocumentGroupByArgs;
+    } satisfies Prisma.EnvelopeGroupByArgs;
  }

  return Promise.all([
-    prisma.document.groupBy({
+    prisma.envelope.groupBy({
      by: ['status'],
      _count: {
        _all: true,
      },
      where: ownerCountsWhereInput,
    }),
-    notSignedCountsGroupByArgs ? prisma.document.groupBy(notSignedCountsGroupByArgs) : [],
-    hasSignedCountsGroupByArgs ? prisma.document.groupBy(hasSignedCountsGroupByArgs) : [],
+    notSignedCountsGroupByArgs ? prisma.envelope.groupBy(notSignedCountsGroupByArgs) : [],
+    hasSignedCountsGroupByArgs ? prisma.envelope.groupBy(hasSignedCountsGroupByArgs) : [],
  ]);
 };
@@ -1,4 +1,4 @@
-import type { Document, Recipient } from '@prisma/client';
+import type { Envelope, Recipient } from '@prisma/client';
 import { verifyAuthenticationResponse } from '@simplewebauthn/server';
 import { match } from 'ts-pattern';

@@ -17,8 +17,8 @@ import { extractDocumentAuthMethods } from '../../utils/document-auth';
 type IsRecipientAuthorizedOptions = {
  // !: Probably find a better name than 'ACCESS_2FA' if requirements change.
  type: 'ACCESS' | 'ACCESS_2FA' | 'ACTION';
-  documentAuthOptions: Document['authOptions'];
-  recipient: Pick<Recipient, 'authOptions' | 'email' | 'documentId'>;
+  documentAuthOptions: Envelope['authOptions'];
+  recipient: Pick<Recipient, 'authOptions' | 'email' | 'envelopeId'>;

  /**
   * The ID of the user who initiated the request.
@@ -125,14 +125,8 @@ export const isRecipientAuthorized = async ({
      }

      if (type === 'ACCESS_2FA' && method === 'email') {
-        if (!recipient.documentId) {
-          throw new AppError(AppErrorCode.NOT_FOUND, {
-            message: 'Document ID is required for email 2FA verification',
-          });
-        }
-
        return await validateTwoFactorTokenFromEmail({
-          documentId: recipient.documentId,
+          envelopeId: recipient.envelopeId,
          email: recipient.email,
          code: token,
          window: 10, // 5 minutes worth of tokens
@@ -1,4 +1,4 @@
-import { SigningStatus } from '@prisma/client';
+import { EnvelopeType, SigningStatus } from '@prisma/client';

 import { jobs } from '@documenso/lib/jobs/client';
 import { prisma } from '@documenso/prisma';
@@ -7,17 +7,19 @@ import { AppError, AppErrorCode } from '../../errors/app-error';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
+import type { EnvelopeIdOptions } from '../../utils/envelope';
+import { mapSecondaryIdToDocumentId, unsafeBuildEnvelopeIdQuery } from '../../utils/envelope';

 export type RejectDocumentWithTokenOptions = {
  token: string;
-  documentId: number;
+  id: EnvelopeIdOptions;
  reason: string;
  requestMetadata?: RequestMetadata;
 };

 export async function rejectDocumentWithToken({
  token,
-  documentId,
+  id,
  reason,
  requestMetadata,
 }: RejectDocumentWithTokenOptions) {
@@ -25,16 +27,16 @@ export async function rejectDocumentWithToken({
  const recipient = await prisma.recipient.findFirst({
    where: {
      token,
-      documentId,
+      envelope: unsafeBuildEnvelopeIdQuery(id, EnvelopeType.DOCUMENT),
    },
    include: {
-      document: true,
+      envelope: true,
    },
  });

-  const document = recipient?.document;
+  const envelope = recipient?.envelope;

-  if (!recipient || !document) {
+  if (!recipient || !envelope) {
    throw new AppError(AppErrorCode.NOT_FOUND, {
      message: 'Document or recipient not found',
    });
@@ -54,7 +56,7 @@ export async function rejectDocumentWithToken({
    }),
    prisma.documentAuditLog.create({
      data: createDocumentAuditLogData({
-        documentId,
+        envelopeId: envelope.id,
        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_REJECTED,
        user: {
          name: recipient.name,
@@ -72,11 +74,13 @@ export async function rejectDocumentWithToken({
    }),
  ]);

+  const legacyDocumentId = mapSecondaryIdToDocumentId(envelope.secondaryId);
+
  // Trigger the seal document job to process the document asynchronously
  await jobs.triggerJob({
    name: 'internal.seal-document',
    payload: {
-      documentId,
+      documentId: legacyDocumentId,
      requestMetadata,
    },
  });
@@ -86,7 +90,7 @@ export async function rejectDocumentWithToken({
    name: 'send.signing.rejected.emails',
    payload: {
      recipientId: recipient.id,
-      documentId,
+      documentId: legacyDocumentId,
    },
  });

@@ -94,7 +98,7 @@ export async function rejectDocumentWithToken({
  await jobs.triggerJob({
    name: 'send.document.cancelled.emails',
    payload: {
-      documentId,
+      documentId: legacyDocumentId,
      cancellationReason: reason,
      requestMetadata,
    },
@@ -1,7 +1,13 @@
 import { createElement } from 'react';

 import { msg } from '@lingui/core/macro';
-import { DocumentStatus, OrganisationType, RecipientRole, SigningStatus } from '@prisma/client';
+import {
+  DocumentStatus,
+  EnvelopeType,
+  OrganisationType,
+  RecipientRole,
+  SigningStatus,
+} from '@prisma/client';

 import { mailer } from '@documenso/email/mailer';
 import { DocumentInviteEmailTemplate } from '@documenso/email/templates/document-invite';
@@ -19,12 +25,13 @@ import { getI18nInstance } from '../../client-only/providers/i18n-server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import { isDocumentCompleted } from '../../utils/document';
+import type { EnvelopeIdOptions } from '../../utils/envelope';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 import { getEmailContext } from '../email/get-email-context';
-import { getDocumentWhereInput } from './get-document-by-id';
+import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';

 export type ResendDocumentOptions = {
-  documentId: number;
+  id: EnvelopeIdOptions;
  userId: number;
  recipients: number[];
  teamId: number;
@@ -32,7 +39,7 @@ export type ResendDocumentOptions = {
 };

 export const resendDocument = async ({
-  documentId,
+  id,
  userId,
  recipients,
  teamId,
@@ -42,16 +49,22 @@ export const resendDocument = async ({
    where: {
      id: userId,
    },
+    select: {
+      id: true,
+      email: true,
+      name: true,
+    },
  });

-  const { documentWhereInput } = await getDocumentWhereInput({
-    documentId,
+  const { envelopeWhereInput } = await getEnvelopeWhereInput({
+    id,
+    type: EnvelopeType.DOCUMENT,
    userId,
    teamId,
  });

-  const document = await prisma.document.findUnique({
-    where: documentWhereInput,
+  const envelope = await prisma.envelope.findUnique({
+    where: envelopeWhereInput,
    include: {
      recipients: true,
      documentMeta: true,
@@ -64,31 +77,29 @@ export const resendDocument = async ({
    },
  });

-  const customEmail = document?.documentMeta;
-
-  if (!document) {
+  if (!envelope) {
    throw new Error('Document not found');
  }

-  if (document.recipients.length === 0) {
+  if (envelope.recipients.length === 0) {
    throw new Error('Document has no recipients');
  }

-  if (document.status === DocumentStatus.DRAFT) {
+  if (envelope.status === DocumentStatus.DRAFT) {
    throw new Error('Can not send draft document');
  }

-  if (isDocumentCompleted(document.status)) {
+  if (isDocumentCompleted(envelope.status)) {
    throw new Error('Can not send completed document');
  }

-  const recipientsToRemind = document.recipients.filter(
+  const recipientsToRemind = envelope.recipients.filter(
    (recipient) =>
      recipients.includes(recipient.id) && recipient.signingStatus === SigningStatus.NOT_SIGNED,
  );

  const isRecipientSigningRequestEmailEnabled = extractDerivedDocumentEmailSettings(
-    document.documentMeta,
+    envelope.documentMeta,
  ).recipientSigningRequest;

  if (!isRecipientSigningRequestEmailEnabled) {
@@ -100,9 +111,9 @@ export const resendDocument = async ({
      emailType: 'RECIPIENT',
      source: {
        type: 'team',
-        teamId: document.teamId,
+        teamId: envelope.teamId,
      },
-      meta: document.documentMeta,
+      meta: envelope.documentMeta,
    });

  await Promise.all(
@@ -122,42 +133,42 @@ export const resendDocument = async ({
        ._(RECIPIENT_ROLES_DESCRIPTION[recipient.role].actionVerb)
        .toLowerCase();

-      let emailMessage = customEmail?.message || '';
+      let emailMessage = envelope.documentMeta.message || '';
      let emailSubject = i18n._(msg`Reminder: Please ${recipientActionVerb} this document`);

      if (selfSigner) {
        emailMessage = i18n._(
-          msg`You have initiated the document ${`"${document.title}"`} that requires you to ${recipientActionVerb} it.`,
+          msg`You have initiated the document ${`"${envelope.title}"`} that requires you to ${recipientActionVerb} it.`,
        );
        emailSubject = i18n._(msg`Reminder: Please ${recipientActionVerb} your document`);
      }

      if (organisationType === OrganisationType.ORGANISATION) {
        emailSubject = i18n._(
-          msg`Reminder: ${document.team.name} invited you to ${recipientActionVerb} a document`,
+          msg`Reminder: ${envelope.team.name} invited you to ${recipientActionVerb} a document`,
        );
        emailMessage =
-          customEmail?.message ||
+          envelope.documentMeta.message ||
          i18n._(
-            msg`${user.name || user.email} on behalf of "${document.team.name}" has invited you to ${recipientActionVerb} the document "${document.title}".`,
+            msg`${user.name || user.email} on behalf of "${envelope.team.name}" has invited you to ${recipientActionVerb} the document "${envelope.title}".`,
          );
      }

      const customEmailTemplate = {
        'signer.name': name,
        'signer.email': email,
-        'document.name': document.title,
+        'document.name': envelope.title,
      };

      const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';
      const signDocumentLink = `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${recipient.token}`;

      const template = createElement(DocumentInviteEmailTemplate, {
-        documentName: document.title,
+        documentName: envelope.title,
        inviterName: user.name || undefined,
        inviterEmail:
          organisationType === OrganisationType.ORGANISATION
-            ? document.team?.teamEmail?.email || user.email
+            ? envelope.team?.teamEmail?.email || user.email
            : user.email,
        assetBaseUrl,
        signDocumentLink,
@@ -165,7 +176,7 @@ export const resendDocument = async ({
        role: recipient.role,
        selfSigner,
        organisationType,
-        teamName: document.team?.name,
+        teamName: envelope.team?.name,
      });

      const [html, text] = await Promise.all([
@@ -189,9 +200,9 @@ export const resendDocument = async ({
            },
            from: senderEmail,
            replyTo: replyToEmail,
-            subject: customEmail?.subject
+            subject: envelope.documentMeta.subject
              ? renderCustomEmailTemplate(
-                  i18n._(msg`Reminder: ${customEmail.subject}`),
+                  i18n._(msg`Reminder: ${envelope.documentMeta.subject}`),
                  customEmailTemplate,
                )
              : emailSubject,
@@ -202,7 +213,7 @@ export const resendDocument = async ({
          await tx.documentAuditLog.create({
            data: createDocumentAuditLogData({
              type: DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT,
-              documentId: document.id,
+              envelopeId: envelope.id,
              metadata: requestMetadata,
              data: {
                emailType: recipientEmailType,
@@ -1,267 +0,0 @@
-import { DocumentStatus, RecipientRole, SigningStatus, WebhookTriggerEvents } from '@prisma/client';
-import { nanoid } from 'nanoid';
-import path from 'node:path';
-import { PDFDocument } from 'pdf-lib';
-
-import PostHogServerClient from '@documenso/lib/server-only/feature-flags/get-post-hog-server-client';
-import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
-import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
-import { prisma } from '@documenso/prisma';
-import { signPdf } from '@documenso/signing';
-
-import {
-  ZWebhookDocumentSchema,
-  mapDocumentToWebhookDocumentPayload,
-} from '../../types/webhook-payload';
-import type { RequestMetadata } from '../../universal/extract-request-metadata';
-import { getFileServerSide } from '../../universal/upload/get-file.server';
-import { putPdfFileServerSide } from '../../universal/upload/put-file.server';
-import { fieldsContainUnsignedRequiredField } from '../../utils/advanced-fields-helpers';
-import { getAuditLogsPdf } from '../htmltopdf/get-audit-logs-pdf';
-import { getCertificatePdf } from '../htmltopdf/get-certificate-pdf';
-import { addRejectionStampToPdf } from '../pdf/add-rejection-stamp-to-pdf';
-import { flattenAnnotations } from '../pdf/flatten-annotations';
-import { flattenForm } from '../pdf/flatten-form';
-import { insertFieldInPDF } from '../pdf/insert-field-in-pdf';
-import { legacy_insertFieldInPDF } from '../pdf/legacy-insert-field-in-pdf';
-import { normalizeSignatureAppearances } from '../pdf/normalize-signature-appearances';
-import { getTeamSettings } from '../team/get-team-settings';
-import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
-import { sendCompletedEmail } from './send-completed-email';
-
-export type SealDocumentOptions = {
-  documentId: number;
-  sendEmail?: boolean;
-  isResealing?: boolean;
-  requestMetadata?: RequestMetadata;
-};
-
-export const sealDocument = async ({
-  documentId,
-  sendEmail = true,
-  isResealing = false,
-  requestMetadata,
-}: SealDocumentOptions) => {
-  const document = await prisma.document.findFirstOrThrow({
-    where: {
-      id: documentId,
-    },
-    include: {
-      documentData: true,
-      documentMeta: true,
-      recipients: true,
-    },
-  });
-
-  const { documentData } = document;
-
-  if (!documentData) {
-    throw new Error(`Document ${document.id} has no document data`);
-  }
-
-  const settings = await getTeamSettings({
-    userId: document.userId,
-    teamId: document.teamId,
-  });
-
-  const recipients = await prisma.recipient.findMany({
-    where: {
-      documentId: document.id,
-      role: {
-        not: RecipientRole.CC,
-      },
-    },
-  });
-
-  // Determine if the document has been rejected by checking if any recipient has rejected it
-  const rejectedRecipient = recipients.find(
-    (recipient) => recipient.signingStatus === SigningStatus.REJECTED,
-  );
-
-  const isRejected = Boolean(rejectedRecipient);
-
-  // Get the rejection reason from the rejected recipient
-  const rejectionReason = rejectedRecipient?.rejectionReason ?? '';
-
-  // If the document is not rejected, ensure all recipients have signed
-  if (
-    !isRejected &&
-    recipients.some((recipient) => recipient.signingStatus !== SigningStatus.SIGNED)
-  ) {
-    throw new Error(`Document ${document.id} has unsigned recipients`);
-  }
-
-  const fields = await prisma.field.findMany({
-    where: {
-      documentId: document.id,
-    },
-    include: {
-      signature: true,
-    },
-  });
-
-  // Skip the field check if the document is rejected
-  if (!isRejected && fieldsContainUnsignedRequiredField(fields)) {
-    throw new Error(`Document ${document.id} has unsigned required fields`);
-  }
-
-  if (isResealing) {
-    // If we're resealing we want to use the initial data for the document
-    // so we aren't placing fields on top of eachother.
-    documentData.data = documentData.initialData;
-  }
-
-  // !: Need to write the fields onto the document as a hard copy
-  const pdfData = await getFileServerSide(documentData);
-
-  const certificateData = settings.includeSigningCertificate
-    ? await getCertificatePdf({
-        documentId,
-        language: document.documentMeta?.language,
-      }).catch((e) => {
-        console.log('Failed to get certificate PDF');
-        console.error(e);
-
-        return null;
-      })
-    : null;
-
-  const auditLogData = settings.includeAuditLog
-    ? await getAuditLogsPdf({
-        documentId,
-        language: document.documentMeta?.language,
-      }).catch((e) => {
-        console.log('Failed to get audit logs PDF');
-        console.error(e);
-
-        return null;
-      })
-    : null;
-
-  const doc = await PDFDocument.load(pdfData);
-
-  // Normalize and flatten layers that could cause issues with the signature
-  normalizeSignatureAppearances(doc);
-  await flattenForm(doc);
-  flattenAnnotations(doc);
-
-  // Add rejection stamp if the document is rejected
-  if (isRejected && rejectionReason) {
-    await addRejectionStampToPdf(doc, rejectionReason);
-  }
-
-  if (certificateData) {
-    const certificate = await PDFDocument.load(certificateData);
-
-    const certificatePages = await doc.copyPages(certificate, certificate.getPageIndices());
-
-    certificatePages.forEach((page) => {
-      doc.addPage(page);
-    });
-  }
-
-  if (auditLogData) {
-    const auditLog = await PDFDocument.load(auditLogData);
-
-    const auditLogPages = await doc.copyPages(auditLog, auditLog.getPageIndices());
-
-    auditLogPages.forEach((page) => {
-      doc.addPage(page);
-    });
-  }
-
-  for (const field of fields) {
-    document.useLegacyFieldInsertion
-      ? await legacy_insertFieldInPDF(doc, field)
-      : await insertFieldInPDF(doc, field);
-  }
-
-  // Re-flatten post-insertion to handle fields that create arcoFields
-  await flattenForm(doc);
-
-  const pdfBytes = await doc.save();
-
-  const pdfBuffer = await signPdf({ pdf: Buffer.from(pdfBytes) });
-
-  const { name } = path.parse(document.title);
-
-  // Add suffix based on document status
-  const suffix = isRejected ? '_rejected.pdf' : '_signed.pdf';
-
-  const { data: newData } = await putPdfFileServerSide({
-    name: `${name}${suffix}`,
-    type: 'application/pdf',
-    arrayBuffer: async () => Promise.resolve(pdfBuffer),
-  });
-
-  const postHog = PostHogServerClient();
-
-  if (postHog) {
-    postHog.capture({
-      distinctId: nanoid(),
-      event: 'App: Document Sealed',
-      properties: {
-        documentId: document.id,
-        isRejected,
-      },
-    });
-  }
-
-  await prisma.$transaction(async (tx) => {
-    await tx.document.update({
-      where: {
-        id: document.id,
-      },
-      data: {
-        status: isRejected ? DocumentStatus.REJECTED : DocumentStatus.COMPLETED,
-        completedAt: new Date(),
-      },
-    });
-
-    await tx.documentData.update({
-      where: {
-        id: documentData.id,
-      },
-      data: {
-        data: newData,
-      },
-    });
-
-    await tx.documentAuditLog.create({
-      data: createDocumentAuditLogData({
-        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_COMPLETED,
-        documentId: document.id,
-        requestMetadata,
-        user: null,
-        data: {
-          transactionId: nanoid(),
-          ...(isRejected ? { isRejected: true, rejectionReason } : {}),
-        },
-      }),
-    });
-  });
-
-  if (sendEmail && !isResealing) {
-    await sendCompletedEmail({ documentId, requestMetadata });
-  }
-
-  const updatedDocument = await prisma.document.findFirstOrThrow({
-    where: {
-      id: document.id,
-    },
-    include: {
-      documentData: true,
-      documentMeta: true,
-      recipients: true,
-    },
-  });
-
-  await triggerWebhook({
-    event: isRejected
-      ? WebhookTriggerEvents.DOCUMENT_REJECTED
-      : WebhookTriggerEvents.DOCUMENT_COMPLETED,
-    data: ZWebhookDocumentSchema.parse(mapDocumentToWebhookDocumentPayload(updatedDocument)),
-    userId: document.userId,
-    teamId: document.teamId ?? undefined,
-  });
-};
@@ -1,5 +1,6 @@
-import type { Document, Recipient, User } from '@prisma/client';
-import { DocumentStatus, DocumentVisibility, TeamMemberRole } from '@prisma/client';
+import { DocumentStatus, EnvelopeType } from '@prisma/client';
+import type { Envelope, Recipient, User } from '@prisma/client';
+import { DocumentVisibility, TeamMemberRole } from '@prisma/client';
 import { match } from 'ts-pattern';

 import {
@@ -9,6 +10,8 @@ import {
 } from '@documenso/lib/utils/teams';
 import { prisma } from '@documenso/prisma';

+import { mapSecondaryIdToDocumentId } from '../../utils/envelope';
+
 export type SearchDocumentsWithKeywordOptions = {
  query: string;
  userId: number;
@@ -26,8 +29,9 @@ export const searchDocumentsWithKeyword = async ({
    },
  });

-  const documents = await prisma.document.findMany({
+  const envelopes = await prisma.envelope.findMany({
    where: {
+      type: EnvelopeType.DOCUMENT,
      OR: [
        {
          title: {
@@ -128,26 +132,26 @@ export const searchDocumentsWithKeyword = async ({
    take: limit,
  });

-  const isOwner = (document: Document, user: User) => document.userId === user.id;
+  const isOwner = (envelope: Envelope, user: User) => envelope.userId === user.id;

  const getSigningLink = (recipients: Recipient[], user: User) =>
    `/sign/${recipients.find((r) => r.email === user.email)?.token}`;

-  const maskedDocuments = documents
-    .filter((document) => {
-      if (!document.teamId || isOwner(document, user)) {
+  const maskedDocuments = envelopes
+    .filter((envelope) => {
+      if (!envelope.teamId || isOwner(envelope, user)) {
        return true;
      }

      const teamMemberRole = getHighestTeamRoleInGroup(
-        document.team.teamGroups.filter((tg) => tg.teamId === document.teamId),
+        envelope.team.teamGroups.filter((tg) => tg.teamId === envelope.teamId),
      );

      if (!teamMemberRole) {
        return false;
      }

-      const canAccessDocument = match([document.visibility, teamMemberRole])
+      const canAccessDocument = match([envelope.visibility, teamMemberRole])
        .with([DocumentVisibility.EVERYONE, TeamMemberRole.ADMIN], () => true)
        .with([DocumentVisibility.EVERYONE, TeamMemberRole.MANAGER], () => true)
        .with([DocumentVisibility.EVERYONE, TeamMemberRole.MEMBER], () => true)
@@ -158,23 +162,29 @@ export const searchDocumentsWithKeyword = async ({

      return canAccessDocument;
    })
-    .map((document) => {
-      const { recipients, ...documentWithoutRecipient } = document;
+    .map((envelope) => {
+      const { recipients, ...documentWithoutRecipient } = envelope;

      let documentPath;

-      if (isOwner(document, user)) {
-        documentPath = `${formatDocumentsPath(document.team?.url)}/${document.id}`;
-      } else if (document.teamId && document.team.teamGroups.length > 0) {
-        documentPath = `${formatDocumentsPath(document.team.url)}/${document.id}`;
+      const legacyDocumentId = mapSecondaryIdToDocumentId(envelope.secondaryId);
+
+      if (isOwner(envelope, user)) {
+        documentPath = `${formatDocumentsPath(envelope.team.url)}/${legacyDocumentId}`;
+      } else if (envelope.teamId && envelope.team.teamGroups.length > 0) {
+        documentPath = `${formatDocumentsPath(envelope.team.url)}/${legacyDocumentId}`;
      } else {
        documentPath = getSigningLink(recipients, user);
      }

      return {
        ...documentWithoutRecipient,
+        team: {
+          id: envelope.teamId,
+          url: envelope.team.url,
+        },
        path: documentPath,
-        value: [document.id, document.title, ...document.recipients.map((r) => r.email)].join(' '),
+        value: [envelope.id, envelope.title, ...envelope.recipients.map((r) => r.email)].join(' '),
      };
    });

@@ -1,7 +1,7 @@
 import { createElement } from 'react';

 import { msg } from '@lingui/core/macro';
-import { DocumentSource } from '@prisma/client';
+import { DocumentSource, EnvelopeType } from '@prisma/client';

 import { mailer } from '@documenso/email/mailer';
 import { DocumentCompletedEmailTemplate } from '@documenso/email/templates/document-completed';
@@ -14,23 +14,33 @@ import { extractDerivedDocumentEmailSettings } from '../../types/document-email'
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { getFileServerSide } from '../../universal/upload/get-file.server';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
+import type { EnvelopeIdOptions } from '../../utils/envelope';
+import { unsafeBuildEnvelopeIdQuery } from '../../utils/envelope';
 import { renderCustomEmailTemplate } from '../../utils/render-custom-email-template';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 import { formatDocumentsPath } from '../../utils/teams';
 import { getEmailContext } from '../email/get-email-context';

 export interface SendDocumentOptions {
-  documentId: number;
+  id: EnvelopeIdOptions;
  requestMetadata?: RequestMetadata;
 }

-export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDocumentOptions) => {
-  const document = await prisma.document.findUnique({
-    where: {
-      id: documentId,
-    },
+export const sendCompletedEmail = async ({ id, requestMetadata }: SendDocumentOptions) => {
+  const envelope = await prisma.envelope.findUnique({
+    where: unsafeBuildEnvelopeIdQuery(id, EnvelopeType.DOCUMENT),
    include: {
-      documentData: true,
+      envelopeItems: {
+        include: {
+          documentData: {
+            select: {
+              type: true,
+              id: true,
+              data: true,
+            },
+          },
+        },
+      },
      documentMeta: true,
      recipients: true,
      user: {
@@ -49,13 +59,13 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
    },
  });

-  if (!document) {
+  if (!envelope) {
    throw new Error('Document not found');
  }

-  const isDirectTemplate = document?.source === DocumentSource.TEMPLATE_DIRECT_LINK;
+  const isDirectTemplate = envelope?.source === DocumentSource.TEMPLATE_DIRECT_LINK;

-  if (document.recipients.length === 0) {
+  if (envelope.recipients.length === 0) {
    throw new Error('Document has no recipients');
  }

@@ -63,28 +73,37 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
    emailType: 'RECIPIENT',
    source: {
      type: 'team',
-      teamId: document.teamId,
+      teamId: envelope.teamId,
    },
-    meta: document.documentMeta,
+    meta: envelope.documentMeta,
  });

-  const { user: owner } = document;
+  const { user: owner } = envelope;

-  const completedDocument = await getFileServerSide(document.documentData);
+  const completedDocumentEmailAttachments = await Promise.all(
+    envelope.envelopeItems.map(async (document) => {
+      const file = await getFileServerSide(document.documentData);
+
+      return {
+        fileName: document.title.endsWith('.pdf') ? document.title : document.title + '.pdf',
+        content: Buffer.from(file),
+      };
+    }),
+  );

  const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';

  let documentOwnerDownloadLink = `${NEXT_PUBLIC_WEBAPP_URL()}${formatDocumentsPath(
-    document.team?.url,
-  )}/${document.id}`;
+    envelope.team?.url,
+  )}/${envelope.id}`;

-  if (document.team?.url) {
-    documentOwnerDownloadLink = `${NEXT_PUBLIC_WEBAPP_URL()}/t/${document.team.url}/documents/${
-      document.id
+  if (envelope.team?.url) {
+    documentOwnerDownloadLink = `${NEXT_PUBLIC_WEBAPP_URL()}/t/${envelope.team.url}/documents/${
+      envelope.id
    }`;
  }

-  const emailSettings = extractDerivedDocumentEmailSettings(document.documentMeta);
+  const emailSettings = extractDerivedDocumentEmailSettings(envelope.documentMeta);
  const isDocumentCompletedEmailEnabled = emailSettings.documentCompleted;
  const isOwnerDocumentCompletedEmailEnabled = emailSettings.ownerDocumentCompleted;

@@ -95,11 +114,11 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
  //    - Recipient emails are disabled
  if (
    isOwnerDocumentCompletedEmailEnabled &&
-    (!document.recipients.find((recipient) => recipient.email === owner.email) ||
+    (!envelope.recipients.find((recipient) => recipient.email === owner.email) ||
      !isDocumentCompletedEmailEnabled)
  ) {
    const template = createElement(DocumentCompletedEmailTemplate, {
-      documentName: document.title,
+      documentName: envelope.title,
      assetBaseUrl,
      downloadLink: documentOwnerDownloadLink,
    });
@@ -127,18 +146,13 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
      subject: i18n._(msg`Signing Complete!`),
      html,
      text,
-      attachments: [
-        {
-          filename: document.title.endsWith('.pdf') ? document.title : document.title + '.pdf',
-          content: Buffer.from(completedDocument),
-        },
-      ],
+      attachments: completedDocumentEmailAttachments,
    });

    await prisma.documentAuditLog.create({
      data: createDocumentAuditLogData({
        type: DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT,
-        documentId: document.id,
+        envelopeId: envelope.id,
        user: null,
        requestMetadata,
        data: {
@@ -158,22 +172,22 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
  }

  await Promise.all(
-    document.recipients.map(async (recipient) => {
+    envelope.recipients.map(async (recipient) => {
      const customEmailTemplate = {
        'signer.name': recipient.name,
        'signer.email': recipient.email,
-        'document.name': document.title,
+        'document.name': envelope.title,
      };

      const downloadLink = `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${recipient.token}/complete`;

      const template = createElement(DocumentCompletedEmailTemplate, {
-        documentName: document.title,
+        documentName: envelope.title,
        assetBaseUrl,
        downloadLink: recipient.email === owner.email ? documentOwnerDownloadLink : downloadLink,
        customBody:
-          isDirectTemplate && document.documentMeta?.message
-            ? renderCustomEmailTemplate(document.documentMeta.message, customEmailTemplate)
+          isDirectTemplate && envelope.documentMeta?.message
+            ? renderCustomEmailTemplate(envelope.documentMeta.message, customEmailTemplate)
            : undefined,
      });

@@ -198,23 +212,18 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
        from: senderEmail,
        replyTo: replyToEmail,
        subject:
-          isDirectTemplate && document.documentMeta?.subject
-            ? renderCustomEmailTemplate(document.documentMeta.subject, customEmailTemplate)
+          isDirectTemplate && envelope.documentMeta?.subject
+            ? renderCustomEmailTemplate(envelope.documentMeta.subject, customEmailTemplate)
            : i18n._(msg`Signing Complete!`),
        html,
        text,
-        attachments: [
-          {
-            filename: document.title.endsWith('.pdf') ? document.title : document.title + '.pdf',
-            content: Buffer.from(completedDocument),
-          },
-        ],
+        attachments: completedDocumentEmailAttachments,
      });

      await prisma.documentAuditLog.create({
        data: createDocumentAuditLogData({
          type: DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT,
-          documentId: document.id,
+          envelopeId: envelope.id,
          user: null,
          requestMetadata,
          data: {
@@ -14,14 +14,15 @@ import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 import { getEmailContext } from '../email/get-email-context';

 export interface SendDeleteEmailOptions {
-  documentId: number;
+  envelopeId: string;
  reason: string;
 }

-export const sendDeleteEmail = async ({ documentId, reason }: SendDeleteEmailOptions) => {
-  const document = await prisma.document.findFirst({
+// Note: Currently only sent by Admin function
+export const sendDeleteEmail = async ({ envelopeId, reason }: SendDeleteEmailOptions) => {
+  const envelope = await prisma.envelope.findFirst({
    where: {
-      id: documentId,
+      id: envelopeId,
    },
    include: {
      user: {
@@ -35,14 +36,14 @@ export const sendDeleteEmail = async ({ documentId, reason }: SendDeleteEmailOpt
    },
  });

-  if (!document) {
+  if (!envelope) {
    throw new AppError(AppErrorCode.NOT_FOUND, {
      message: 'Document not found',
    });
  }

  const isDocumentDeletedEmailEnabled = extractDerivedDocumentEmailSettings(
-    document.documentMeta,
+    envelope.documentMeta,
  ).documentDeleted;

  if (!isDocumentDeletedEmailEnabled) {
@@ -53,17 +54,17 @@ export const sendDeleteEmail = async ({ documentId, reason }: SendDeleteEmailOpt
    emailType: 'INTERNAL',
    source: {
      type: 'team',
-      teamId: document.teamId,
+      teamId: envelope.teamId,
    },
-    meta: document.documentMeta,
+    meta: envelope.documentMeta,
  });

-  const { email, name } = document.user;
+  const { email, name } = envelope.user;

  const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';

  const template = createElement(DocumentSuperDeleteEmailTemplate, {
-    documentName: document.title,
+    documentName: envelope.title,
    reason,
    assetBaseUrl,
  });
@@ -1,6 +1,8 @@
+import type { DocumentData, Envelope, EnvelopeItem } from '@prisma/client';
 import {
  DocumentSigningOrder,
  DocumentStatus,
+  EnvelopeType,
  RecipientRole,
  SendStatus,
  SigningStatus,
@@ -16,17 +18,18 @@ import { jobs } from '../../jobs/client';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import {
  ZWebhookDocumentSchema,
-  mapDocumentToWebhookDocumentPayload,
+  mapEnvelopeToWebhookDocumentPayload,
 } from '../../types/webhook-payload';
 import { getFileServerSide } from '../../universal/upload/get-file.server';
 import { putPdfFileServerSide } from '../../universal/upload/put-file.server';
 import { isDocumentCompleted } from '../../utils/document';
+import { type EnvelopeIdOptions, mapSecondaryIdToDocumentId } from '../../utils/envelope';
+import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';
 import { insertFormValuesInPdf } from '../pdf/insert-form-values-in-pdf';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
-import { getDocumentWhereInput } from './get-document-by-id';

 export type SendDocumentOptions = {
-  documentId: number;
+  id: EnvelopeIdOptions;
  userId: number;
  teamId: number;
  sendEmail?: boolean;
@@ -34,93 +37,81 @@ export type SendDocumentOptions = {
 };

 export const sendDocument = async ({
-  documentId,
+  id,
  userId,
  teamId,
  sendEmail,
  requestMetadata,
 }: SendDocumentOptions) => {
-  const { documentWhereInput } = await getDocumentWhereInput({
-    documentId,
+  const { envelopeWhereInput } = await getEnvelopeWhereInput({
+    id,
+    type: EnvelopeType.DOCUMENT,
    userId,
    teamId,
  });

-  const document = await prisma.document.findFirst({
-    where: documentWhereInput,
+  const envelope = await prisma.envelope.findFirst({
+    where: envelopeWhereInput,
    include: {
      recipients: {
        orderBy: [{ signingOrder: { sort: 'asc', nulls: 'last' } }, { id: 'asc' }],
      },
      documentMeta: true,
-      documentData: true,
+      envelopeItems: {
+        select: {
+          id: true,
+          documentData: {
+            select: {
+              type: true,
+              id: true,
+              data: true,
+              initialData: true,
+            },
+          },
+        },
+      },
    },
  });

-  if (!document) {
+  if (!envelope) {
    throw new Error('Document not found');
  }

-  if (document.recipients.length === 0) {
+  if (envelope.recipients.length === 0) {
    throw new Error('Document has no recipients');
  }

-  if (isDocumentCompleted(document.status)) {
+  if (isDocumentCompleted(envelope.status)) {
    throw new Error('Can not send completed document');
  }

-  const signingOrder = document.documentMeta?.signingOrder || DocumentSigningOrder.PARALLEL;
+  const legacyDocumentId = mapSecondaryIdToDocumentId(envelope.secondaryId);

-  let recipientsToNotify = document.recipients;
+  const signingOrder = envelope.documentMeta?.signingOrder || DocumentSigningOrder.PARALLEL;
+
+  let recipientsToNotify = envelope.recipients;

  if (signingOrder === DocumentSigningOrder.SEQUENTIAL) {
    // Get the currently active recipient.
-    recipientsToNotify = document.recipients
+    recipientsToNotify = envelope.recipients
      .filter((r) => r.signingStatus === SigningStatus.NOT_SIGNED && r.role !== RecipientRole.CC)
      .slice(0, 1);

    // Secondary filter so we aren't resending if the current active recipient has already
-    // received the document.
+    // received the envelope.
    recipientsToNotify.filter((r) => r.sendStatus !== SendStatus.SENT);
  }

-  const { documentData } = document;
-
-  if (!documentData.data) {
-    throw new Error('Document data not found');
+  if (envelope.envelopeItems.length === 0) {
+    throw new Error('Missing envelope items');
  }

-  if (document.formValues) {
-    const file = await getFileServerSide(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>,
-    });
-
-    let fileName = document.title;
-
-    if (!document.title.endsWith('.pdf')) {
-      fileName = `${document.title}.pdf`;
-    }
-
-    const newDocumentData = await putPdfFileServerSide({
-      name: fileName,
-      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);
+  if (envelope.formValues) {
+    await Promise.all(
+      envelope.envelopeItems.map(async (envelopeItem) => {
+        await injectFormValuesIntoDocument(envelope, envelopeItem);
+      }),
+    );
  }

  // Commented out server side checks for minimum 1 signature per signer now since we need to
@@ -133,7 +124,7 @@ export const sendDocument = async ({
  // const fieldsWithSignerEmail = fields.map((field) => ({
  //   ...field,
  //   signerEmail:
-  //     document.Recipient.find((recipient) => recipient.id === field.recipientId)?.email ?? '',
+  //     envelope.Recipient.find((recipient) => recipient.id === field.recipientId)?.email ?? '',
  // }));

  // const everySignerHasSignature = document?.Recipient.every(
@@ -148,7 +139,7 @@ export const sendDocument = async ({
  //   throw new Error('Some signers have not been assigned a signature field.');
  // }

-  const allRecipientsHaveNoActionToTake = document.recipients.every(
+  const allRecipientsHaveNoActionToTake = envelope.recipients.every(
    (recipient) =>
      recipient.role === RecipientRole.CC || recipient.signingStatus === SigningStatus.SIGNED,
  );
@@ -157,15 +148,15 @@ export const sendDocument = async ({
    await jobs.triggerJob({
      name: 'internal.seal-document',
      payload: {
-        documentId,
+        documentId: legacyDocumentId,
        requestMetadata: requestMetadata?.requestMetadata,
      },
    });

    // Keep the return type the same for the `sendDocument` method
-    return await prisma.document.findFirstOrThrow({
+    return await prisma.envelope.findFirstOrThrow({
      where: {
-        id: documentId,
+        id: envelope.id,
      },
      include: {
        documentMeta: true,
@@ -174,21 +165,21 @@ export const sendDocument = async ({
    });
  }

-  const updatedDocument = await prisma.$transaction(async (tx) => {
-    if (document.status === DocumentStatus.DRAFT) {
+  const updatedEnvelope = await prisma.$transaction(async (tx) => {
+    if (envelope.status === DocumentStatus.DRAFT) {
      await tx.documentAuditLog.create({
        data: createDocumentAuditLogData({
          type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SENT,
-          documentId: document.id,
+          envelopeId: envelope.id,
          metadata: requestMetadata,
          data: {},
        }),
      });
    }

-    return await tx.document.update({
+    return await tx.envelope.update({
      where: {
-        id: documentId,
+        id: envelope.id,
      },
      data: {
        status: DocumentStatus.PENDING,
@@ -201,7 +192,7 @@ export const sendDocument = async ({
  });

  const isRecipientSigningRequestEmailEnabled = extractDerivedDocumentEmailSettings(
-    document.documentMeta,
+    envelope.documentMeta,
  ).recipientSigningRequest;

  // Only send email if one of the following is true:
@@ -218,7 +209,7 @@ export const sendDocument = async ({
          name: 'send.signing.requested.email',
          payload: {
            userId,
-            documentId,
+            documentId: legacyDocumentId,
            recipientId: recipient.id,
            requestMetadata: requestMetadata?.requestMetadata,
          },
@@ -229,10 +220,44 @@ export const sendDocument = async ({

  await triggerWebhook({
    event: WebhookTriggerEvents.DOCUMENT_SENT,
-    data: ZWebhookDocumentSchema.parse(mapDocumentToWebhookDocumentPayload(updatedDocument)),
+    data: ZWebhookDocumentSchema.parse(mapEnvelopeToWebhookDocumentPayload(updatedEnvelope)),
    userId,
    teamId,
  });

-  return updatedDocument;
+  return updatedEnvelope;
+};
+
+const injectFormValuesIntoDocument = async (
+  envelope: Envelope,
+  envelopeItem: Pick<EnvelopeItem, 'id'> & { documentData: DocumentData },
+) => {
+  const file = await getFileServerSide(envelopeItem.documentData);
+
+  const prefilled = await insertFormValuesInPdf({
+    pdf: Buffer.from(file),
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    formValues: envelope.formValues as Record<string, string | number | boolean>,
+  });
+
+  let fileName = envelope.title;
+
+  if (!envelope.title.endsWith('.pdf')) {
+    fileName = `${envelope.title}.pdf`;
+  }
+
+  const newDocumentData = await putPdfFileServerSide({
+    name: fileName,
+    type: 'application/pdf',
+    arrayBuffer: async () => Promise.resolve(prefilled),
+  });
+
+  await prisma.envelopeItem.update({
+    where: {
+      id: envelopeItem.id,
+    },
+    data: {
+      documentDataId: newDocumentData.id,
+    },
+  });
 };
@@ -1,6 +1,7 @@
 import { createElement } from 'react';

 import { msg } from '@lingui/core/macro';
+import { EnvelopeType } from '@prisma/client';

 import { mailer } from '@documenso/email/mailer';
 import { DocumentPendingEmailTemplate } from '@documenso/email/templates/document-pending';
@@ -9,18 +10,20 @@ import { prisma } from '@documenso/prisma';
 import { getI18nInstance } from '../../client-only/providers/i18n-server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
+import type { EnvelopeIdOptions } from '../../utils/envelope';
+import { unsafeBuildEnvelopeIdQuery } from '../../utils/envelope';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 import { getEmailContext } from '../email/get-email-context';

 export interface SendPendingEmailOptions {
-  documentId: number;
+  id: EnvelopeIdOptions;
  recipientId: number;
 }

-export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingEmailOptions) => {
-  const document = await prisma.document.findFirst({
+export const sendPendingEmail = async ({ id, recipientId }: SendPendingEmailOptions) => {
+  const envelope = await prisma.envelope.findFirst({
    where: {
-      id: documentId,
+      ...unsafeBuildEnvelopeIdQuery(id, EnvelopeType.DOCUMENT),
      recipients: {
        some: {
          id: recipientId,
@@ -37,11 +40,11 @@ export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingE
    },
  });

-  if (!document) {
+  if (!envelope) {
    throw new Error('Document not found');
  }

-  if (document.recipients.length === 0) {
+  if (envelope.recipients.length === 0) {
    throw new Error('Document has no recipients');
  }

@@ -49,27 +52,27 @@ export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingE
    emailType: 'RECIPIENT',
    source: {
      type: 'team',
-      teamId: document.teamId,
+      teamId: envelope.teamId,
    },
-    meta: document.documentMeta,
+    meta: envelope.documentMeta,
  });

  const isDocumentPendingEmailEnabled = extractDerivedDocumentEmailSettings(
-    document.documentMeta,
+    envelope.documentMeta,
  ).documentPending;

  if (!isDocumentPendingEmailEnabled) {
    return;
  }

-  const [recipient] = document.recipients;
+  const [recipient] = envelope.recipients;

  const { email, name } = recipient;

  const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';

  const template = createElement(DocumentPendingEmailTemplate, {
-    documentName: document.title,
+    documentName: envelope.title,
    assetBaseUrl,
  });

@@ -1,128 +0,0 @@
-import { createElement } from 'react';
-
-import { msg } from '@lingui/core/macro';
-import { DocumentStatus, SendStatus } from '@prisma/client';
-
-import { mailer } from '@documenso/email/mailer';
-import DocumentCancelTemplate from '@documenso/email/templates/document-cancel';
-import { prisma } from '@documenso/prisma';
-
-import { getI18nInstance } from '../../client-only/providers/i18n-server';
-import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
-import { AppError, AppErrorCode } from '../../errors/app-error';
-import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
-import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
-import type { RequestMetadata } from '../../universal/extract-request-metadata';
-import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
-import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
-import { getEmailContext } from '../email/get-email-context';
-
-export type SuperDeleteDocumentOptions = {
-  id: number;
-  requestMetadata?: RequestMetadata;
-};
-
-export const superDeleteDocument = async ({ id, requestMetadata }: SuperDeleteDocumentOptions) => {
-  const document = await prisma.document.findUnique({
-    where: {
-      id,
-    },
-    include: {
-      recipients: true,
-      documentMeta: true,
-      user: {
-        select: {
-          id: true,
-          email: true,
-          name: true,
-        },
-      },
-    },
-  });
-
-  if (!document) {
-    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'Document not found',
-    });
-  }
-
-  const { branding, settings, senderEmail, replyToEmail } = await getEmailContext({
-    emailType: 'RECIPIENT',
-    source: {
-      type: 'team',
-      teamId: document.teamId,
-    },
-    meta: document.documentMeta,
-  });
-
-  const { status, user } = document;
-
-  const isDocumentDeletedEmailEnabled = extractDerivedDocumentEmailSettings(
-    document.documentMeta,
-  ).documentDeleted;
-
-  // if the document is pending, send cancellation emails to all recipients
-  if (
-    status === DocumentStatus.PENDING &&
-    document.recipients.length > 0 &&
-    isDocumentDeletedEmailEnabled
-  ) {
-    await Promise.all(
-      document.recipients.map(async (recipient) => {
-        if (recipient.sendStatus !== SendStatus.SENT) {
-          return;
-        }
-
-        const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';
-        const template = createElement(DocumentCancelTemplate, {
-          documentName: document.title,
-          inviterName: user.name || undefined,
-          inviterEmail: user.email,
-          assetBaseUrl,
-        });
-
-        const lang = document.documentMeta?.language ?? settings.documentLanguage;
-
-        const [html, text] = await Promise.all([
-          renderEmailWithI18N(template, { lang, branding }),
-          renderEmailWithI18N(template, {
-            lang,
-            branding,
-            plainText: true,
-          }),
-        ]);
-
-        const i18n = await getI18nInstance(lang);
-
-        await mailer.sendMail({
-          to: {
-            address: recipient.email,
-            name: recipient.name,
-          },
-          from: senderEmail,
-          replyTo: replyToEmail,
-          subject: i18n._(msg`Document Cancelled`),
-          html,
-          text,
-        });
-      }),
-    );
-  }
-
-  // always hard delete if deleted from admin
-  return await prisma.$transaction(async (tx) => {
-    await tx.documentAuditLog.create({
-      data: createDocumentAuditLogData({
-        documentId: id,
-        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_DELETED,
-        user,
-        requestMetadata,
-        data: {
-          type: 'HARD',
-        },
-      }),
-    });
-
-    return await tx.document.delete({ where: { id } });
-  });
-};
@@ -1,248 +0,0 @@
-import { DocumentVisibility } from '@prisma/client';
-import { DocumentStatus, TeamMemberRole } from '@prisma/client';
-import { isDeepEqual } from 'remeda';
-import { match } from 'ts-pattern';
-
-import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
-import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
-import type { CreateDocumentAuditLogDataResponse } from '@documenso/lib/utils/document-audit-logs';
-import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
-import { prisma } from '@documenso/prisma';
-
-import { AppError, AppErrorCode } from '../../errors/app-error';
-import type { TDocumentAccessAuthTypes, TDocumentActionAuthTypes } from '../../types/document-auth';
-import { createDocumentAuthOptions, extractDocumentAuthMethods } from '../../utils/document-auth';
-import { getDocumentWhereInput } from './get-document-by-id';
-
-export type UpdateDocumentOptions = {
-  userId: number;
-  teamId: number;
-  documentId: number;
-  data?: {
-    title?: string;
-    externalId?: string | null;
-    visibility?: DocumentVisibility | null;
-    globalAccessAuth?: TDocumentAccessAuthTypes[];
-    globalActionAuth?: TDocumentActionAuthTypes[];
-    useLegacyFieldInsertion?: boolean;
-  };
-  requestMetadata: ApiRequestMetadata;
-};
-
-export const updateDocument = async ({
-  userId,
-  teamId,
-  documentId,
-  data,
-  requestMetadata,
-}: UpdateDocumentOptions) => {
-  const { documentWhereInput, team } = await getDocumentWhereInput({
-    documentId,
-    userId,
-    teamId,
-  });
-
-  const document = await prisma.document.findFirst({
-    where: documentWhereInput,
-    include: {
-      team: {
-        select: {
-          organisation: {
-            select: {
-              organisationClaim: true,
-            },
-          },
-        },
-      },
-    },
-  });
-
-  if (!document) {
-    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'Document not found',
-    });
-  }
-
-  const isDocumentOwner = document.userId === userId;
-  const requestedVisibility = data?.visibility;
-
-  if (!isDocumentOwner) {
-    match(team.currentTeamRole)
-      .with(TeamMemberRole.ADMIN, () => true)
-      .with(TeamMemberRole.MANAGER, () => {
-        const allowedVisibilities: DocumentVisibility[] = [
-          DocumentVisibility.EVERYONE,
-          DocumentVisibility.MANAGER_AND_ABOVE,
-        ];
-
-        if (
-          !allowedVisibilities.includes(document.visibility) ||
-          (requestedVisibility && !allowedVisibilities.includes(requestedVisibility))
-        ) {
-          throw new AppError(AppErrorCode.UNAUTHORIZED, {
-            message: 'You do not have permission to update the document visibility',
-          });
-        }
-      })
-      .with(TeamMemberRole.MEMBER, () => {
-        if (
-          document.visibility !== DocumentVisibility.EVERYONE ||
-          (requestedVisibility && requestedVisibility !== DocumentVisibility.EVERYONE)
-        ) {
-          throw new AppError(AppErrorCode.UNAUTHORIZED, {
-            message: 'You do not have permission to update the document visibility',
-          });
-        }
-      })
-      .otherwise(() => {
-        throw new AppError(AppErrorCode.UNAUTHORIZED, {
-          message: 'You do not have permission to update the document',
-        });
-      });
-  }
-
-  // If no data just return the document since this function is normally chained after a meta update.
-  if (!data || Object.values(data).length === 0) {
-    return document;
-  }
-
-  const { documentAuthOption } = extractDocumentAuthMethods({
-    documentAuth: document.authOptions,
-  });
-
-  const documentGlobalAccessAuth = documentAuthOption?.globalAccessAuth ?? null;
-  const documentGlobalActionAuth = documentAuthOption?.globalActionAuth ?? null;
-
-  // If the new global auth values aren't passed in, fallback to the current document values.
-  const newGlobalAccessAuth =
-    data?.globalAccessAuth === undefined ? documentGlobalAccessAuth : data.globalAccessAuth;
-  const newGlobalActionAuth =
-    data?.globalActionAuth === undefined ? documentGlobalActionAuth : data.globalActionAuth;
-
-  // Check if user has permission to set the global action auth.
-  if (newGlobalActionAuth.length > 0 && !document.team.organisation.organisationClaim.flags.cfr21) {
-    throw new AppError(AppErrorCode.UNAUTHORIZED, {
-      message: 'You do not have permission to set the action auth',
-    });
-  }
-
-  const isTitleSame = data.title === undefined || data.title === document.title;
-  const isExternalIdSame = data.externalId === undefined || data.externalId === document.externalId;
-  const isGlobalAccessSame =
-    documentGlobalAccessAuth === undefined ||
-    isDeepEqual(documentGlobalAccessAuth, newGlobalAccessAuth);
-  const isGlobalActionSame =
-    documentGlobalActionAuth === undefined ||
-    isDeepEqual(documentGlobalActionAuth, newGlobalActionAuth);
-  const isDocumentVisibilitySame =
-    data.visibility === undefined || data.visibility === document.visibility;
-
-  const auditLogs: CreateDocumentAuditLogDataResponse[] = [];
-
-  if (!isTitleSame && document.status !== DocumentStatus.DRAFT) {
-    throw new AppError(AppErrorCode.INVALID_BODY, {
-      message: 'You cannot update the title if the document has been sent',
-    });
-  }
-
-  if (!isTitleSame) {
-    auditLogs.push(
-      createDocumentAuditLogData({
-        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_TITLE_UPDATED,
-        documentId,
-        metadata: requestMetadata,
-        data: {
-          from: document.title,
-          to: data.title || '',
-        },
-      }),
-    );
-  }
-
-  if (!isExternalIdSame) {
-    auditLogs.push(
-      createDocumentAuditLogData({
-        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_EXTERNAL_ID_UPDATED,
-        documentId,
-        metadata: requestMetadata,
-        data: {
-          from: document.externalId,
-          to: data.externalId || '',
-        },
-      }),
-    );
-  }
-
-  if (!isGlobalAccessSame) {
-    auditLogs.push(
-      createDocumentAuditLogData({
-        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_GLOBAL_AUTH_ACCESS_UPDATED,
-        documentId,
-        metadata: requestMetadata,
-        data: {
-          from: documentGlobalAccessAuth,
-          to: newGlobalAccessAuth,
-        },
-      }),
-    );
-  }
-
-  if (!isGlobalActionSame) {
-    auditLogs.push(
-      createDocumentAuditLogData({
-        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_GLOBAL_AUTH_ACTION_UPDATED,
-        documentId,
-        metadata: requestMetadata,
-        data: {
-          from: documentGlobalActionAuth,
-          to: newGlobalActionAuth,
-        },
-      }),
-    );
-  }
-
-  if (!isDocumentVisibilitySame) {
-    auditLogs.push(
-      createDocumentAuditLogData({
-        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_VISIBILITY_UPDATED,
-        documentId,
-        metadata: requestMetadata,
-        data: {
-          from: document.visibility,
-          to: data.visibility || '',
-        },
-      }),
-    );
-  }
-
-  // Early return if nothing is required.
-  if (auditLogs.length === 0 && data.useLegacyFieldInsertion === undefined) {
-    return document;
-  }
-
-  return await prisma.$transaction(async (tx) => {
-    const authOptions = createDocumentAuthOptions({
-      globalAccessAuth: newGlobalAccessAuth,
-      globalActionAuth: newGlobalActionAuth,
-    });
-
-    const updatedDocument = await tx.document.update({
-      where: {
-        id: documentId,
-      },
-      data: {
-        title: data.title,
-        externalId: data.externalId,
-        visibility: data.visibility as DocumentVisibility,
-        useLegacyFieldInsertion: data.useLegacyFieldInsertion,
-        authOptions,
-      },
-    });
-
-    await tx.documentAuditLog.createMany({
-      data: auditLogs,
-    });
-
-    return updatedDocument;
-  });
-};
@@ -1,4 +1,4 @@
-import type { Document, Field, Recipient } from '@prisma/client';
+import type { Envelope, Field, Recipient } from '@prisma/client';
 import { FieldType } from '@prisma/client';

 import { AppError, AppErrorCode } from '../../errors/app-error';
@@ -6,8 +6,8 @@ import type { TRecipientActionAuth } from '../../types/document-auth';
 import { isRecipientAuthorized } from './is-recipient-authorized';

 export type ValidateFieldAuthOptions = {
-  documentAuthOptions: Document['authOptions'];
-  recipient: Pick<Recipient, 'authOptions' | 'email' | 'documentId'>;
+  documentAuthOptions: Envelope['authOptions'];
+  recipient: Pick<Recipient, 'authOptions' | 'email' | 'envelopeId'>;
  field: Field;
  userId?: number;
  authOptions?: TRecipientActionAuth;
@@ -1,4 +1,4 @@
-import { ReadStatus, SendStatus } from '@prisma/client';
+import { EnvelopeType, ReadStatus, SendStatus } from '@prisma/client';
 import { WebhookTriggerEvents } from '@prisma/client';

 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
@@ -9,7 +9,7 @@ import { prisma } from '@documenso/prisma';
 import type { TDocumentAccessAuthTypes } from '../../types/document-auth';
 import {
  ZWebhookDocumentSchema,
-  mapDocumentToWebhookDocumentPayload,
+  mapEnvelopeToWebhookDocumentPayload,
 } from '../../types/webhook-payload';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';

@@ -27,19 +27,30 @@ export const viewedDocument = async ({
  const recipient = await prisma.recipient.findFirst({
    where: {
      token,
+      envelope: {
+        type: EnvelopeType.DOCUMENT,
+      },
+    },
+    include: {
+      envelope: {
+        include: {
+          documentMeta: true,
+          recipients: true,
+        },
+      },
    },
  });

-  if (!recipient || !recipient.documentId) {
+  if (!recipient) {
    return;
  }

-  const { documentId } = recipient;
+  const { envelope } = recipient;

  await prisma.documentAuditLog.create({
    data: createDocumentAuditLogData({
      type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_VIEWED,
-      documentId,
+      envelopeId: envelope.id,
      user: {
        name: recipient.name,
        email: recipient.email,
@@ -75,7 +86,7 @@ export const viewedDocument = async ({
    await tx.documentAuditLog.create({
      data: createDocumentAuditLogData({
        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_OPENED,
-        documentId,
+        envelopeId: envelope.id,
        user: {
          name: recipient.name,
          email: recipient.email,
@@ -92,24 +103,10 @@ export const viewedDocument = async ({
    });
  });

-  const document = await prisma.document.findFirst({
-    where: {
-      id: documentId,
-    },
-    include: {
-      documentMeta: true,
-      recipients: true,
-    },
-  });
-
-  if (!document) {
-    throw new Error('Document not found');
-  }
-
  await triggerWebhook({
    event: WebhookTriggerEvents.DOCUMENT_OPENED,
-    data: ZWebhookDocumentSchema.parse(mapDocumentToWebhookDocumentPayload(document)),
-    userId: document.userId,
-    teamId: document.teamId ?? undefined,
+    data: ZWebhookDocumentSchema.parse(mapEnvelopeToWebhookDocumentPayload(envelope)),
+    userId: envelope.userId,
+    teamId: envelope.teamId,
  });
 };