Merge branch 'main' into feat/delete-archive

2025-11-16 09:41:35 +10:00 · 2024-08-21 11:44:05 +10:00
parent 16527f01e7 66fdc1d659
commit 6bf62e0ecb
124 changed files with 2129 additions and 772 deletions
--- a/packages/lib/server-only/document/complete-document-with-token.ts
+++ b/packages/lib/server-only/document/complete-document-with-token.ts
@ -1,5 +1,3 @@
-'use server';
-
 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
 import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
@ -7,9 +5,9 @@ import { prisma } from '@documenso/prisma';
 import { DocumentStatus, SigningStatus } from '@documenso/prisma/client';
 import { WebhookTriggerEvents } from '@documenso/prisma/client';

+import { jobs } from '../../jobs/client';
 import type { TRecipientActionAuth } from '../../types/document-auth';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
-import { sealDocument } from './seal-document';
 import { sendPendingEmail } from './send-pending-email';

 export type CompleteDocumentWithTokenOptions = {
@ -45,8 +43,6 @@ export const completeDocumentWithToken = async ({
  documentId,
  requestMetadata,
 }: CompleteDocumentWithTokenOptions) => {
-  'use server';
-
  const document = await getDocument({ token, documentId });

  if (document.status !== DocumentStatus.PENDING) {
@ -149,7 +145,13 @@ export const completeDocumentWithToken = async ({
  });

  if (haveAllRecipientsSigned) {
-    await sealDocument({ documentId: document.id, requestMetadata });
+    await jobs.triggerJob({
+      name: 'internal.seal-document',
+      payload: {
+        documentId: document.id,
+        requestMetadata,
+      },
+    });
  }

  const updatedDocument = await getDocument({ token, documentId });
--- a/packages/lib/server-only/document/resend-document.tsx
+++ b/packages/lib/server-only/document/resend-document.tsx
@ -58,10 +58,17 @@ export const resendDocument = async ({
        },
      },
      documentMeta: true,
+      team: {
+        select: {
+          teamEmail: true,
+          name: true,
+        },
+      },
    },
  });

  const customEmail = document?.documentMeta;
+  const isTeamDocument = document?.team !== null;

  if (!document) {
    throw new Error('Document not found');
@ -90,9 +97,21 @@ export const resendDocument = async ({
      const { email, name } = recipient;
      const selfSigner = email === user.email;

-      const selfSignerCustomEmail = `You have initiated the document ${`"${document.title}"`} that requires you to ${RECIPIENT_ROLES_DESCRIPTION[
-        recipient.role
-      ].actionVerb.toLowerCase()} it.`;
+      const { actionVerb } = RECIPIENT_ROLES_DESCRIPTION[recipient.role];
+      const recipientActionVerb = actionVerb.toLowerCase();
+
+      let emailMessage = customEmail?.message || '';
+      let emailSubject = `Reminder: Please ${recipientActionVerb} this document`;
+
+      if (selfSigner) {
+        emailMessage = `You have initiated the document ${`"${document.title}"`} that requires you to ${recipientActionVerb} it.`;
+        emailSubject = `Reminder: Please ${recipientActionVerb} your document`;
+      }
+
+      if (isTeamDocument && document.team) {
+        emailSubject = `Reminder: ${document.team.name} invited you to ${recipientActionVerb} a document`;
+        emailMessage = `${user.name} on behalf of ${document.team.name} has invited you to ${recipientActionVerb} the document "${document.title}".`;
+      }

      const customEmailTemplate = {
        'signer.name': name,
@ -106,23 +125,16 @@ export const resendDocument = async ({
      const template = createElement(DocumentInviteEmailTemplate, {
        documentName: document.title,
        inviterName: user.name || undefined,
-        inviterEmail: user.email,
+        inviterEmail: isTeamDocument ? document.team?.teamEmail?.email || user.email : user.email,
        assetBaseUrl,
        signDocumentLink,
-        customBody: renderCustomEmailTemplate(
-          selfSigner && !customEmail?.message ? selfSignerCustomEmail : customEmail?.message || '',
-          customEmailTemplate,
-        ),
+        customBody: renderCustomEmailTemplate(emailMessage, customEmailTemplate),
        role: recipient.role,
        selfSigner,
+        isTeamInvite: isTeamDocument,
+        teamName: document.team?.name,
      });

-      const { actionVerb } = RECIPIENT_ROLES_DESCRIPTION[recipient.role];
-
-      const emailSubject = selfSigner
-        ? `Reminder: Please ${actionVerb.toLowerCase()} your document`
-        : `Reminder: Please ${actionVerb.toLowerCase()} this document`;
-
      await prisma.$transaction(
        async (tx) => {
          await mailer.sendMail({
--- a/packages/lib/server-only/document/seal-document.ts
+++ b/packages/lib/server-only/document/seal-document.ts
@ -1,5 +1,3 @@
-'use server';
-
 import { nanoid } from 'nanoid';
 import path from 'node:path';
 import { PDFDocument } from 'pdf-lib';
@ -36,8 +34,6 @@ export const sealDocument = async ({
  isResealing = false,
  requestMetadata,
 }: SealDocumentOptions) => {
-  'use server';
-
  const document = await prisma.document.findFirstOrThrow({
    where: {
      id: documentId,
--- a/packages/lib/server-only/document/send-document.tsx
+++ b/packages/lib/server-only/document/send-document.tsx
@ -1,4 +1,3 @@
-import { sealDocument } from '@documenso/lib/server-only/document/seal-document';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
 import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
@ -7,7 +6,7 @@ import { prisma } from '@documenso/prisma';
 import { DocumentStatus, RecipientRole, SendStatus, SigningStatus } from '@documenso/prisma/client';
 import { WebhookTriggerEvents } from '@documenso/prisma/client';

-import { jobsClient } from '../../jobs/client';
+import { jobs } from '../../jobs/client';
 import { getFile } from '../../universal/upload/get-file';
 import { insertFormValuesInPdf } from '../pdf/insert-form-values-in-pdf';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
@ -141,7 +140,7 @@ export const sendDocument = async ({
          return;
        }

-        await jobsClient.triggerJob({
+        await jobs.triggerJob({
          name: 'send.signing.requested.email',
          payload: {
            userId,
@ -160,7 +159,13 @@ export const sendDocument = async ({
  );

  if (allRecipientsHaveNoActionToTake) {
-    await sealDocument({ documentId, requestMetadata });
+    await jobs.triggerJob({
+      name: 'internal.seal-document',
+      payload: {
+        documentId,
+        requestMetadata,
+      },
+    });

    // Keep the return type the same for the `sendDocument` method
    return await prisma.document.findFirstOrThrow({
--- a/packages/lib/server-only/field/sign-field-with-token.ts
+++ b/packages/lib/server-only/field/sign-field-with-token.ts
@ -231,10 +231,17 @@ export const signFieldWithToken = async ({
              type,
              data: signatureImageAsBase64 || typedSignature || '',
            }))
-            .with(FieldType.DATE, FieldType.EMAIL, FieldType.NAME, FieldType.TEXT, (type) => ({
-              type,
-              data: updatedField.customText,
-            }))
+            .with(
+              FieldType.DATE,
+              FieldType.EMAIL,
+              FieldType.NAME,
+              FieldType.TEXT,
+              FieldType.INITIALS,
+              (type) => ({
+                type,
+                data: updatedField.customText,
+              }),
+            )
            .with(
              FieldType.NUMBER,
              FieldType.RADIO,
--- a/packages/lib/server-only/htmltopdf/get-certificate-pdf.ts
+++ b/packages/lib/server-only/htmltopdf/get-certificate-pdf.ts
@ -1,6 +1,5 @@
 import { DateTime } from 'luxon';
 import type { Browser } from 'playwright';
-import { chromium } from 'playwright';

 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { encryptSecondaryData } from '../crypto/encrypt';
@ -10,6 +9,8 @@ export type GetCertificatePdfOptions = {
 };

 export const getCertificatePdf = async ({ documentId }: GetCertificatePdfOptions) => {
+  const { chromium } = await import('playwright');
+
  const encryptedId = encryptSecondaryData({
    data: documentId.toString(),
    expiresAt: DateTime.now().plus({ minutes: 5 }).toJSDate().valueOf(),
--- a/packages/lib/server-only/pdf/insert-field-in-pdf.ts
+++ b/packages/lib/server-only/pdf/insert-field-in-pdf.ts
@ -133,9 +133,14 @@ export const insertFieldInPDF = async (pdf: PDFDocument, field: FieldWithSignatu
        throw new Error('Invalid checkbox field meta');
      }

+      const values = meta.data.values?.map((item) => ({
+        ...item,
+        value: item.value.length > 0 ? item.value : `empty-value-${item.id}`,
+      }));
+
      const selected = field.customText.split(',');

-      for (const [index, item] of (meta.data.values ?? []).entries()) {
+      for (const [index, item] of (values ?? []).entries()) {
        const offsetY = index * 16;

        const checkbox = pdf.getForm().createCheckBox(`checkbox.${field.secondaryId}.${index}`);
@ -169,9 +174,14 @@ export const insertFieldInPDF = async (pdf: PDFDocument, field: FieldWithSignatu
        throw new Error('Invalid radio field meta');
      }

+      const values = meta?.data.values?.map((item) => ({
+        ...item,
+        value: item.value.length > 0 ? item.value : `empty-value-${item.id}`,
+      }));
+
      const selected = field.customText.split(',');

-      for (const [index, item] of (meta.data.values ?? []).entries()) {
+      for (const [index, item] of (values ?? []).entries()) {
        const offsetY = index * 16;

        const radio = pdf.getForm().createRadioGroup(`radio.${field.secondaryId}.${index}`);
--- a/packages/lib/server-only/template/create-document-from-direct-template.ts
+++ b/packages/lib/server-only/template/create-document-from-direct-template.ts
@ -44,6 +44,7 @@ export type CreateDocumentFromDirectTemplateOptions = {
  directRecipientName?: string;
  directRecipientEmail: string;
  directTemplateToken: string;
+  directTemplateExternalId?: string;
  signedFieldValues: TSignFieldWithTokenMutationSchema[];
  templateUpdatedAt: Date;
  requestMetadata: RequestMetadata;
@ -63,6 +64,7 @@ export const createDocumentFromDirectTemplate = async ({
  directRecipientName: initialDirectRecipientName,
  directRecipientEmail,
  directTemplateToken,
+  directTemplateExternalId,
  signedFieldValues,
  templateUpdatedAt,
  requestMetadata,
@ -227,6 +229,7 @@ export const createDocumentFromDirectTemplate = async ({
        title: template.title,
        createdAt: initialRequestTime,
        status: DocumentStatus.PENDING,
+        externalId: directTemplateExternalId,
        documentDataId: documentData.id,
        authOptions: createDocumentAuthOptions({
          globalAccessAuth: templateAuthOptions.globalAccessAuth,
@ -465,6 +468,7 @@ export const createDocumentFromDirectTemplate = async ({
              .with(
                FieldType.DATE,
                FieldType.EMAIL,
+                FieldType.INITIALS,
                FieldType.NAME,
                FieldType.TEXT,
                FieldType.NUMBER,