Merge branch 'main' into signing-volume

packages/lib/server-only/document/find-documents.ts

@@ -25,6 +25,7 @@ export type FindDocumentsOptions = {
   };
   period?: PeriodSelectorValue;
   senderIds?: number[];
+  search?: string;
 };
 
 export const findDocuments = async ({
@@ -37,6 +38,7 @@ export const findDocuments = async ({
   orderBy,
   period,
   senderIds,
+  search,
 }: FindDocumentsOptions) => {
   const { user, team } = await prisma.$transaction(async (tx) => {
     const user = await tx.user.findFirstOrThrow({
@@ -92,6 +94,14 @@ export const findDocuments = async ({
     })
     .otherwise(() => undefined);
 
+  const searchFilter: Prisma.DocumentWhereInput = {
+    OR: [
+      { title: { contains: search, mode: 'insensitive' } },
+      { Recipient: { some: { name: { contains: search, mode: 'insensitive' } } } },
+      { Recipient: { some: { email: { contains: search, mode: 'insensitive' } } } },
+    ],
+  };
+
   const visibilityFilters = [
     match(teamMemberRole)
       .with(TeamMemberRole.ADMIN, () => ({
@@ -188,7 +198,7 @@ export const findDocuments = async ({
   }
 
   const whereClause: Prisma.DocumentWhereInput = {
-    AND: [{ ...termFilters }, { ...filters }, { ...deletedFilter }],
+    AND: [{ ...termFilters }, { ...filters }, { ...deletedFilter }, { ...searchFilter }],
   };
 
   if (period) {

packages/lib/server-only/document/get-stats.ts

@@ -15,9 +15,10 @@ export type GetStatsInput = {
   user: User;
   team?: Omit<GetTeamCountsOption, 'createdAt'>;
   period?: PeriodSelectorValue;
+  search?: string;
 };
 
-export const getStats = async ({ user, period, ...options }: GetStatsInput) => {
+export const getStats = async ({ user, period, search, ...options }: GetStatsInput) => {
   let createdAt: Prisma.DocumentWhereInput['createdAt'];
 
   if (period) {
@@ -31,8 +32,14 @@ export const getStats = async ({ user, period, ...options }: GetStatsInput) => {
   }
 
   const [ownerCounts, notSignedCounts, hasSignedCounts] = await (options.team
-    ? getTeamCounts({ ...options.team, createdAt, currentUserEmail: user.email, userId: user.id })
-    : getCounts({ user, createdAt }));
+    ? getTeamCounts({
+        ...options.team,
+        createdAt,
+        currentUserEmail: user.email,
+        userId: user.id,
+        search,
+      })
+    : getCounts({ user, createdAt, search }));
 
   const stats: Record<ExtendedDocumentStatus, number> = {
     [ExtendedDocumentStatus.DRAFT]: 0,
@@ -72,9 +79,18 @@ export const getStats = async ({ user, period, ...options }: GetStatsInput) => {
 type GetCountsOption = {
   user: User;
   createdAt: Prisma.DocumentWhereInput['createdAt'];
+  search?: string;
 };
 
-const getCounts = async ({ user, createdAt }: GetCountsOption) => {
+const getCounts = async ({ user, createdAt, search }: GetCountsOption) => {
+  const searchFilter: Prisma.DocumentWhereInput = {
+    OR: [
+      { title: { contains: search, mode: 'insensitive' } },
+      { Recipient: { some: { name: { contains: search, mode: 'insensitive' } } } },
+      { Recipient: { some: { email: { contains: search, mode: 'insensitive' } } } },
+    ],
+  };
+
   return Promise.all([
     // Owner counts.
     prisma.document.groupBy({
@@ -87,6 +103,7 @@ const getCounts = async ({ user, createdAt }: GetCountsOption) => {
         createdAt,
         teamId: null,
         deletedAt: null,
+        AND: [searchFilter],
       },
     }),
     // Not signed counts.
@@ -105,6 +122,7 @@ const getCounts = async ({ user, createdAt }: GetCountsOption) => {
           },
         },
         createdAt,
+        AND: [searchFilter],
       },
     }),
     // Has signed counts.
@@ -142,6 +160,7 @@ const getCounts = async ({ user, createdAt }: GetCountsOption) => {
             },
           },
         ],
+        AND: [searchFilter],
       },
     }),
   ]);
@@ -155,6 +174,7 @@ type GetTeamCountsOption = {
   userId: number;
   createdAt: Prisma.DocumentWhereInput['createdAt'];
   currentTeamMemberRole?: TeamMemberRole;
+  search?: string;
 };
 
 const getTeamCounts = async (options: GetTeamCountsOption) => {
@@ -169,6 +189,14 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
         }
       : undefined;
 
+  const searchFilter: Prisma.DocumentWhereInput = {
+    OR: [
+      { title: { contains: options.search, mode: 'insensitive' } },
+      { Recipient: { some: { name: { contains: options.search, mode: 'insensitive' } } } },
+      { Recipient: { some: { email: { contains: options.search, mode: 'insensitive' } } } },
+    ],
+  };
+
   let ownerCountsWhereInput: Prisma.DocumentWhereInput = {
     userId: userIdWhereClause,
     createdAt,
@@ -220,6 +248,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
         },
       },
     ],
+    ...searchFilter,
   };
 
   if (teamEmail) {

packages/lib/server-only/document/update-document-settings.ts

@@ -93,11 +93,14 @@ export const updateDocumentSettings = async ({
     }
   }
 
-  const isTitleSame = data.title === document.title;
-  const isExternalIdSame = data.externalId === document.externalId;
-  const isGlobalAccessSame = documentGlobalAccessAuth === newGlobalAccessAuth;
-  const isGlobalActionSame = documentGlobalActionAuth === newGlobalActionAuth;
-  const isDocumentVisibilitySame = data.visibility === document.visibility;
+  const isTitleSame = data.title === undefined || data.title === document.title;
+  const isExternalIdSame = data.externalId === undefined || data.externalId === document.externalId;
+  const isGlobalAccessSame =
+    documentGlobalAccessAuth === undefined || documentGlobalAccessAuth === newGlobalAccessAuth;
+  const isGlobalActionSame =
+    documentGlobalActionAuth === undefined || documentGlobalActionAuth === newGlobalActionAuth;
+  const isDocumentVisibilitySame =
+    data.visibility === undefined || data.visibility === document.visibility;
 
   const auditLogs: CreateDocumentAuditLogDataResponse[] = [];
 
@@ -200,7 +203,7 @@ export const updateDocumentSettings = async ({
       },
       data: {
         title: data.title,
-        externalId: data.externalId || null,
+        externalId: data.externalId,
         visibility: data.visibility as DocumentVisibility,
         authOptions,
       },

packages/lib/server-only/field/set-fields-for-document.ts

@@ -1,3 +1,5 @@
+import { isDeepEqual } from 'remeda';
+
 import { validateCheckboxField } from '@documenso/lib/advanced-fields-validation/validate-checkbox';
 import { validateDropdownField } from '@documenso/lib/advanced-fields-validation/validate-dropdown';
 import { validateNumberField } from '@documenso/lib/advanced-fields-validation/validate-number';
@@ -20,22 +22,15 @@ import {
 } from '@documenso/lib/utils/document-audit-logs';
 import { prisma } from '@documenso/prisma';
 import type { Field } from '@documenso/prisma/client';
-import { FieldType, SendStatus, SigningStatus } from '@documenso/prisma/client';
+import { FieldType } from '@documenso/prisma/client';
+
+import { AppError, AppErrorCode } from '../../errors/app-error';
+import { canRecipientFieldsBeModified } from '../../utils/recipients';
 
 export interface SetFieldsForDocumentOptions {
   userId: number;
   documentId: number;
-  fields: {
-    id?: number | null;
-    type: FieldType;
-    signerEmail: string;
-    pageNumber: number;
-    pageX: number;
-    pageY: number;
-    pageWidth: number;
-    pageHeight: number;
-    fieldMeta?: FieldMeta;
-  }[];
+  fields: FieldData[];
   requestMetadata?: RequestMetadata;
 }
 
@@ -63,6 +58,9 @@ export const setFieldsForDocument = async ({
         },
       ],
     },
+    include: {
+      Recipient: true,
+    },
   });
 
   const user = await prisma.user.findFirstOrThrow({
@@ -97,21 +95,36 @@ export const setFieldsForDocument = async ({
     (existingField) => !fields.find((field) => field.id === existingField.id),
   );
 
-  const linkedFields = fields
-    .map((field) => {
-      const existing = existingFields.find((existingField) => existingField.id === field.id);
+  const linkedFields = fields.map((field) => {
+    const existing = existingFields.find((existingField) => existingField.id === field.id);
 
-      return {
-        ...field,
-        _persisted: existing,
-      };
-    })
-    .filter((field) => {
-      return (
-        field._persisted?.Recipient?.sendStatus !== SendStatus.SENT &&
-        field._persisted?.Recipient?.signingStatus !== SigningStatus.SIGNED
+    const recipient = document.Recipient.find(
+      (recipient) => recipient.email.toLowerCase() === field.signerEmail.toLowerCase(),
+    );
+
+    // Each field MUST have a recipient associated with it.
+    if (!recipient) {
+      throw new AppError(AppErrorCode.INVALID_REQUEST, `Recipient not found for field ${field.id}`);
+    }
+
+    // Check whether the existing field can be modified.
+    if (
+      existing &&
+      hasFieldBeenChanged(existing, field) &&
+      !canRecipientFieldsBeModified(recipient, existingFields)
+    ) {
+      throw new AppError(
+        AppErrorCode.INVALID_REQUEST,
+        'Cannot modify a field where the recipient has already interacted with the document',
       );
-    });
+    }
+
+    return {
+      ...field,
+      _persisted: existing,
+      _recipient: recipient,
+    };
+  });
 
   const persistedFields = await prisma.$transaction(async (tx) => {
     return await Promise.all(
@@ -322,3 +335,33 @@ export const setFieldsForDocument = async ({
 
   return [...filteredFields, ...persistedFields];
 };
+
+/**
+ * If you change this you MUST update the `hasFieldBeenChanged` function.
+ */
+type FieldData = {
+  id?: number | null;
+  type: FieldType;
+  signerEmail: string;
+  pageNumber: number;
+  pageX: number;
+  pageY: number;
+  pageWidth: number;
+  pageHeight: number;
+  fieldMeta?: FieldMeta;
+};
+
+const hasFieldBeenChanged = (field: Field, newFieldData: FieldData) => {
+  const currentFieldMeta = field.fieldMeta || null;
+  const newFieldMeta = newFieldData.fieldMeta || null;
+
+  return (
+    field.type !== newFieldData.type ||
+    field.page !== newFieldData.pageNumber ||
+    field.positionX.toNumber() !== newFieldData.pageX ||
+    field.positionY.toNumber() !== newFieldData.pageY ||
+    field.width.toNumber() !== newFieldData.pageWidth ||
+    field.height.toNumber() !== newFieldData.pageHeight ||
+    !isDeepEqual(currentFieldMeta, newFieldMeta)
+  );
+};

packages/lib/server-only/i18n/switch-i18n-language.ts

@@ -4,5 +4,8 @@ import { cookies } from 'next/headers';
 
 // eslint-disable-next-line @typescript-eslint/require-await
 export const switchI18NLanguage = async (lang: string) => {
-  cookies().set('language', lang);
+  // Two year expiry.
+  const maxAge = 60 * 60 * 24 * 365 * 2;
+
+  cookies().set('language', lang, { maxAge });
 };

packages/lib/server-only/pdf/insert-field-in-pdf.ts

@@ -1,6 +1,7 @@
 // https://github.com/Hopding/pdf-lib/issues/20#issuecomment-412852821
 import fontkit from '@pdf-lib/fontkit';
-import { PDFDocument, RotationTypes, degrees, radiansToDegrees } from 'pdf-lib';
+import type { PDFDocument } from 'pdf-lib';
+import { RotationTypes, degrees, radiansToDegrees } from 'pdf-lib';
 import { P, match } from 'ts-pattern';
 
 import {
@@ -13,7 +14,16 @@ import { FieldType } from '@documenso/prisma/client';
 import { isSignatureFieldType } from '@documenso/prisma/guards/is-signature-field';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 
-import { ZCheckboxFieldMeta, ZRadioFieldMeta } from '../../types/field-meta';
+import {
+  ZCheckboxFieldMeta,
+  ZDateFieldMeta,
+  ZEmailFieldMeta,
+  ZInitialsFieldMeta,
+  ZNameFieldMeta,
+  ZNumberFieldMeta,
+  ZRadioFieldMeta,
+  ZTextFieldMeta,
+} from '../../types/field-meta';
 
 export const insertFieldInPDF = async (pdf: PDFDocument, field: FieldWithSignature) => {
   const fontCaveat = await fetch(process.env.FONT_CAVEAT_URI).then(async (res) =>
@@ -32,7 +42,6 @@ export const insertFieldInPDF = async (pdf: PDFDocument, field: FieldWithSignatu
 
   const minFontSize = isSignatureField ? MIN_HANDWRITING_FONT_SIZE : MIN_STANDARD_FONT_SIZE;
   const maxFontSize = isSignatureField ? DEFAULT_HANDWRITING_FONT_SIZE : DEFAULT_STANDARD_FONT_SIZE;
-  let fontSize = maxFontSize;
 
   const page = pages.at(field.page - 1);
 
@@ -207,16 +216,33 @@ export const insertFieldInPDF = async (pdf: PDFDocument, field: FieldWithSignatu
       }
     })
     .otherwise((field) => {
+      const fieldMetaParsers = {
+        [FieldType.TEXT]: ZTextFieldMeta,
+        [FieldType.NUMBER]: ZNumberFieldMeta,
+        [FieldType.DATE]: ZDateFieldMeta,
+        [FieldType.EMAIL]: ZEmailFieldMeta,
+        [FieldType.NAME]: ZNameFieldMeta,
+        [FieldType.INITIALS]: ZInitialsFieldMeta,
+      } as const;
+
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      const Parser = fieldMetaParsers[field.type as keyof typeof fieldMetaParsers];
+      const meta = Parser ? Parser.safeParse(field.fieldMeta) : null;
+
+      const customFontSize = meta?.success && meta.data.fontSize ? meta.data.fontSize : null;
       const longestLineInTextForWidth = field.customText
         .split('\n')
         .sort((a, b) => b.length - a.length)[0];
 
+      let fontSize = customFontSize || maxFontSize;
       let textWidth = font.widthOfTextAtSize(longestLineInTextForWidth, fontSize);
       const textHeight = font.heightAtSize(fontSize);
 
-      const scalingFactor = Math.min(fieldWidth / textWidth, fieldHeight / textHeight, 1);
+      if (!customFontSize) {
+        const scalingFactor = Math.min(fieldWidth / textWidth, fieldHeight / textHeight, 1);
+        fontSize = Math.max(Math.min(fontSize * scalingFactor, maxFontSize), minFontSize);
+      }
 
-      fontSize = Math.max(Math.min(fontSize * scalingFactor, maxFontSize), minFontSize);
       textWidth = font.widthOfTextAtSize(longestLineInTextForWidth, fontSize);
 
       let textX = fieldX + (fieldWidth - textWidth) / 2;
@@ -250,17 +276,6 @@ export const insertFieldInPDF = async (pdf: PDFDocument, field: FieldWithSignatu
   return pdf;
 };
 
-export const insertFieldInPDFBytes = async (
-  pdf: ArrayBuffer | Uint8Array | string,
-  field: FieldWithSignature,
-) => {
-  const pdfDoc = await PDFDocument.load(pdf);
-
-  await insertFieldInPDF(pdfDoc, field);
-
-  return await pdfDoc.save();
-};
-
 const adjustPositionForRotation = (
   pageWidth: number,
   pageHeight: number,

packages/lib/server-only/pdf/insert-text-in-pdf.ts

@@ -10,6 +10,7 @@ export async function insertTextInPDF(
   positionY: number,
   page = 0,
   useHandwritingFont = true,
+  customFontSize?: number,
 ): Promise<string> {
   // Fetch the font file from the public URL.
   const fontResponse = await fetch(CAVEAT_FONT_PATH());
@@ -24,7 +25,7 @@ export async function insertTextInPDF(
   const pages = pdfDoc.getPages();
   const pdfPage = pages[page];
 
-  const textSize = useHandwritingFont ? 50 : 15;
+  const textSize = customFontSize || (useHandwritingFont ? 50 : 15);
   const textWidth = font.widthOfTextAtSize(text, textSize);
   const textHeight = font.heightAtSize(textSize);
   const fieldSize = { width: 250, height: 64 };

packages/lib/server-only/recipient/set-recipients-for-document.ts

@@ -1,4 +1,9 @@
+import { createElement } from 'react';
+
 import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
+import { mailer } from '@documenso/email/mailer';
+import { render } from '@documenso/email/render';
+import RecipientRemovedFromDocumentTemplate from '@documenso/email/templates/recipient-removed-from-document';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
 import {
   type TRecipientActionAuthTypes,
@@ -16,20 +21,16 @@ import type { Recipient } from '@documenso/prisma/client';
 import { RecipientRole } from '@documenso/prisma/client';
 import { SendStatus, SigningStatus } from '@documenso/prisma/client';
 
+import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
+import { FROM_ADDRESS, FROM_NAME } from '../../constants/email';
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { canRecipientBeModified } from '../../utils/recipients';
 
 export interface SetRecipientsForDocumentOptions {
   userId: number;
   teamId?: number;
   documentId: number;
-  recipients: {
-    id?: number | null;
-    email: string;
-    name: string;
-    role: RecipientRole;
-    signingOrder?: number | null;
-    actionAuth?: TRecipientActionAuthTypes | null;
-  }[];
+  recipients: RecipientData[];
   requestMetadata?: RequestMetadata;
 }
 
@@ -59,6 +60,9 @@ export const setRecipientsForDocument = async ({
             teamId: null,
           }),
     },
+    include: {
+      Field: true,
+    },
   });
 
   const user = await prisma.user.findFirstOrThrow({
@@ -116,25 +120,28 @@ export const setRecipientsForDocument = async ({
       ),
   );
 
-  const linkedRecipients = normalizedRecipients
-    .map((recipient) => {
-      const existing = existingRecipients.find(
-        (existingRecipient) =>
-          existingRecipient.id === recipient.id || existingRecipient.email === recipient.email,
-      );
+  const linkedRecipients = normalizedRecipients.map((recipient) => {
+    const existing = existingRecipients.find(
+      (existingRecipient) =>
+        existingRecipient.id === recipient.id || existingRecipient.email === recipient.email,
+    );
 
-      return {
-        ...recipient,
-        _persisted: existing,
-      };
-    })
-    .filter((recipient) => {
-      return (
-        recipient._persisted?.role === RecipientRole.CC ||
-        (recipient._persisted?.sendStatus !== SendStatus.SENT &&
-          recipient._persisted?.signingStatus !== SigningStatus.SIGNED)
+    if (
+      existing &&
+      hasRecipientBeenChanged(existing, recipient) &&
+      !canRecipientBeModified(existing, document.Field)
+    ) {
+      throw new AppError(
+        AppErrorCode.INVALID_REQUEST,
+        'Cannot modify a recipient who has already interacted with the document',
       );
-    });
+    }
+
+    return {
+      ...recipient,
+      _persisted: existing,
+    };
+  });
 
   const persistedRecipients = await prisma.$transaction(async (tx) => {
     return await Promise.all(
@@ -268,6 +275,37 @@ export const setRecipientsForDocument = async ({
         ),
       });
     });
+
+    // Send emails to deleted recipients.
+    await Promise.all(
+      removedRecipients.map(async (recipient) => {
+        if (recipient.sendStatus !== SendStatus.SENT) {
+          return;
+        }
+
+        const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';
+
+        const template = createElement(RecipientRemovedFromDocumentTemplate, {
+          documentName: document.title,
+          inviterName: user.name || undefined,
+          assetBaseUrl,
+        });
+
+        await mailer.sendMail({
+          to: {
+            address: recipient.email,
+            name: recipient.name,
+          },
+          from: {
+            name: FROM_NAME,
+            address: FROM_ADDRESS,
+          },
+          subject: 'You have been removed from a document',
+          html: render(template),
+          text: render(template, { plainText: true }),
+        });
+      }),
+    );
   }
 
   // Filter out recipients that have been removed or have been updated.
@@ -284,3 +322,27 @@ export const setRecipientsForDocument = async ({
 
   return [...filteredRecipients, ...persistedRecipients];
 };
+
+/**
+ * If you change this you MUST update the `hasRecipientBeenChanged` function.
+ */
+type RecipientData = {
+  id?: number | null;
+  email: string;
+  name: string;
+  role: RecipientRole;
+  signingOrder?: number | null;
+  actionAuth?: TRecipientActionAuthTypes | null;
+};
+
+const hasRecipientBeenChanged = (recipient: Recipient, newRecipientData: RecipientData) => {
+  const authOptions = ZRecipientAuthOptionsSchema.parse(recipient.authOptions);
+
+  return (
+    recipient.email !== newRecipientData.email ||
+    recipient.name !== newRecipientData.name ||
+    recipient.role !== newRecipientData.role ||
+    recipient.signingOrder !== newRecipientData.signingOrder ||
+    authOptions.actionAuth !== newRecipientData.actionAuth
+  );
+};

packages/lib/server-only/template/create-document-from-template.ts

@@ -1,8 +1,9 @@
 import { nanoid } from '@documenso/lib/universal/id';
 import { prisma } from '@documenso/prisma';
-import type { DocumentSigningOrder, Field } from '@documenso/prisma/client';
 import {
+  DocumentSigningOrder,
   DocumentSource,
+  type Field,
   type Recipient,
   RecipientRole,
   SendStatus,
@@ -153,7 +154,7 @@ export const createDocumentFromTemplate = async ({
     const document = await tx.document.create({
       data: {
         source: DocumentSource.TEMPLATE,
-        externalId,
+        externalId: externalId || template.externalId,
         templateId: template.id,
         userId,
         teamId: template.teamId,
@@ -172,7 +173,9 @@ export const createDocumentFromTemplate = async ({
             dateFormat: override?.dateFormat || template.templateMeta?.dateFormat,
             redirectUrl: override?.redirectUrl || template.templateMeta?.redirectUrl,
             signingOrder:
-              override?.signingOrder || template.templateMeta?.signingOrder || undefined,
+              override?.signingOrder ||
+              template.templateMeta?.signingOrder ||
+              DocumentSigningOrder.PARALLEL,
           },
         },
         Recipient: {

packages/lib/server-only/template/update-template-settings.ts

@@ -100,7 +100,7 @@ export const updateTemplateSettings = async ({
     },
     data: {
       title: data.title,
-      externalId: data.externalId || null,
+      externalId: data.externalId,
       type: data.type,
       publicDescription: data.publicDescription,
       publicTitle: data.publicTitle,