From 0eee57078101fc31cfb656f768187aa25413514e Mon Sep 17 00:00:00 2001
From: Catalin Pit <25515812+catalinpit@users.noreply.github.com>
Date: Tue, 23 Apr 2024 12:33:40 +0300
Subject: [PATCH 01/17] fix: complete document when all recipients are CC

---
 .../documents/[id]/edit-document.tsx          | 13 ++++++++++++-
 .../trpc/server/document-router/router.ts     | 19 +++++++++++++++++++
 .../trpc/server/document-router/schema.ts     |  6 ++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx
index 2e2f0c889..fbc700219 100644
--- a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx
+++ b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx
@@ -8,6 +8,7 @@ import {
   DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
   SKIP_QUERY_BATCH_META,
 } from '@documenso/lib/constants/trpc';
+import { DocumentStatus, RecipientRole } from '@documenso/prisma/client';
 import type { DocumentWithDetails } from '@documenso/prisma/types/document';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
@@ -68,6 +69,10 @@ export const EditDocumentForm = ({
 
   const { Recipient: recipients, Field: fields } = document;
 
+  const allRecipientsAreCC = recipients.every((recipient) => recipient.role === RecipientRole.CC);
+
+  const { mutateAsync: updateDocumentStatus } = trpc.document.updateDocument.useMutation();
+
   const { mutateAsync: setSettingsForDocument } = trpc.document.setSettingsForDocument.useMutation({
     ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
     onSuccess: (newData) => {
@@ -248,8 +253,14 @@ export const EditDocumentForm = ({
 
   const onAddSubjectFormSubmit = async (data: TAddSubjectFormSchema) => {
     const { subject, message } = data.meta;
-
     try {
+      if (allRecipientsAreCC) {
+        await updateDocumentStatus({
+          documentId: document.id,
+          data: { status: DocumentStatus.COMPLETED },
+        });
+      }
+
       await sendDocument({
         documentId: document.id,
         teamId: team?.id,
diff --git a/packages/trpc/server/document-router/router.ts b/packages/trpc/server/document-router/router.ts
index d12002674..fa9d95262 100644
--- a/packages/trpc/server/document-router/router.ts
+++ b/packages/trpc/server/document-router/router.ts
@@ -16,6 +16,7 @@ import { getDocumentWithDetailsById } from '@documenso/lib/server-only/document/
 import { resendDocument } from '@documenso/lib/server-only/document/resend-document';
 import { searchDocumentsWithKeyword } from '@documenso/lib/server-only/document/search-documents-with-keyword';
 import { sendDocument } from '@documenso/lib/server-only/document/send-document';
+import { updateDocument } from '@documenso/lib/server-only/document/update-document';
 import { updateDocumentSettings } from '@documenso/lib/server-only/document/update-document-settings';
 import { updateTitle } from '@documenso/lib/server-only/document/update-title';
 import { symmetricEncrypt } from '@documenso/lib/universal/crypto';
@@ -36,6 +37,7 @@ import {
   ZSetPasswordForDocumentMutationSchema,
   ZSetSettingsForDocumentMutationSchema,
   ZSetTitleForDocumentMutationSchema,
+  ZUpdateDocumentMutationSchema,
 } from './schema';
 
 export const documentRouter = router({
@@ -132,6 +134,23 @@ export const documentRouter = router({
       }
     }),
 
+  updateDocument: authenticatedProcedure
+    .input(ZUpdateDocumentMutationSchema)
+    .mutation(async ({ input, ctx }) => {
+      try {
+        const { documentId, data } = input;
+
+        await updateDocument({ documentId, data, userId: ctx.user.id });
+      } catch (err) {
+        console.error(err);
+
+        throw new TRPCError({
+          code: 'BAD_REQUEST',
+          message: 'We were unable to delete this document. Please try again later.',
+        });
+      }
+    }),
+
   deleteDocument: authenticatedProcedure
     .input(ZDeleteDocumentMutationSchema)
     .mutation(async ({ input, ctx }) => {
diff --git a/packages/trpc/server/document-router/schema.ts b/packages/trpc/server/document-router/schema.ts
index 483d32e50..4936aae37 100644
--- a/packages/trpc/server/document-router/schema.ts
+++ b/packages/trpc/server/document-router/schema.ts
@@ -48,6 +48,12 @@ export const ZCreateDocumentMutationSchema = z.object({
   teamId: z.number().optional(),
 });
 
+export const ZUpdateDocumentMutationSchema = z.object({
+  documentId: z.number().min(1),
+  teamId: z.number().optional(),
+  data: z.any(),
+});
+
 export type TCreateDocumentMutationSchema = z.infer<typeof ZCreateDocumentMutationSchema>;
 
 export const ZSetSettingsForDocumentMutationSchema = z.object({

From 4d5365bddcd94dacad4fd6c4df3e84652b6f9504 Mon Sep 17 00:00:00 2001
From: Catalin Pit <25515812+catalinpit@users.noreply.github.com>
Date: Tue, 23 Apr 2024 14:24:58 +0300
Subject: [PATCH 02/17] fix: complete document when all recipients are CC

---
 .../documents/[id]/edit-document.tsx          | 12 ------------
 .../server-only/document/send-document.tsx    |  6 +++++-
 .../trpc/server/document-router/router.ts     | 19 -------------------
 .../trpc/server/document-router/schema.ts     |  6 ------
 4 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx
index fbc700219..e175ae18a 100644
--- a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx
+++ b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx
@@ -8,7 +8,6 @@ import {
   DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
   SKIP_QUERY_BATCH_META,
 } from '@documenso/lib/constants/trpc';
-import { DocumentStatus, RecipientRole } from '@documenso/prisma/client';
 import type { DocumentWithDetails } from '@documenso/prisma/types/document';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
@@ -69,10 +68,6 @@ export const EditDocumentForm = ({
 
   const { Recipient: recipients, Field: fields } = document;
 
-  const allRecipientsAreCC = recipients.every((recipient) => recipient.role === RecipientRole.CC);
-
-  const { mutateAsync: updateDocumentStatus } = trpc.document.updateDocument.useMutation();
-
   const { mutateAsync: setSettingsForDocument } = trpc.document.setSettingsForDocument.useMutation({
     ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
     onSuccess: (newData) => {
@@ -254,13 +249,6 @@ export const EditDocumentForm = ({
   const onAddSubjectFormSubmit = async (data: TAddSubjectFormSchema) => {
     const { subject, message } = data.meta;
     try {
-      if (allRecipientsAreCC) {
-        await updateDocumentStatus({
-          documentId: document.id,
-          data: { status: DocumentStatus.COMPLETED },
-        });
-      }
-
       await sendDocument({
         documentId: document.id,
         teamId: team?.id,
diff --git a/packages/lib/server-only/document/send-document.tsx b/packages/lib/server-only/document/send-document.tsx
index 5bb7e2352..6b9ab8037 100644
--- a/packages/lib/server-only/document/send-document.tsx
+++ b/packages/lib/server-only/document/send-document.tsx
@@ -211,6 +211,10 @@ export const sendDocument = async ({
     }),
   );
 
+  const allRecipientsAreCC = document.Recipient.every(
+    (recipient) => recipient.role === RecipientRole.CC,
+  );
+
   const updatedDocument = await prisma.$transaction(async (tx) => {
     if (document.status === DocumentStatus.DRAFT) {
       await tx.documentAuditLog.create({
@@ -229,7 +233,7 @@ export const sendDocument = async ({
         id: documentId,
       },
       data: {
-        status: DocumentStatus.PENDING,
+        status: allRecipientsAreCC ? DocumentStatus.COMPLETED : DocumentStatus.PENDING,
       },
       include: {
         Recipient: true,
diff --git a/packages/trpc/server/document-router/router.ts b/packages/trpc/server/document-router/router.ts
index fa9d95262..d12002674 100644
--- a/packages/trpc/server/document-router/router.ts
+++ b/packages/trpc/server/document-router/router.ts
@@ -16,7 +16,6 @@ import { getDocumentWithDetailsById } from '@documenso/lib/server-only/document/
 import { resendDocument } from '@documenso/lib/server-only/document/resend-document';
 import { searchDocumentsWithKeyword } from '@documenso/lib/server-only/document/search-documents-with-keyword';
 import { sendDocument } from '@documenso/lib/server-only/document/send-document';
-import { updateDocument } from '@documenso/lib/server-only/document/update-document';
 import { updateDocumentSettings } from '@documenso/lib/server-only/document/update-document-settings';
 import { updateTitle } from '@documenso/lib/server-only/document/update-title';
 import { symmetricEncrypt } from '@documenso/lib/universal/crypto';
@@ -37,7 +36,6 @@ import {
   ZSetPasswordForDocumentMutationSchema,
   ZSetSettingsForDocumentMutationSchema,
   ZSetTitleForDocumentMutationSchema,
-  ZUpdateDocumentMutationSchema,
 } from './schema';
 
 export const documentRouter = router({
@@ -134,23 +132,6 @@ export const documentRouter = router({
       }
     }),
 
-  updateDocument: authenticatedProcedure
-    .input(ZUpdateDocumentMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      try {
-        const { documentId, data } = input;
-
-        await updateDocument({ documentId, data, userId: ctx.user.id });
-      } catch (err) {
-        console.error(err);
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message: 'We were unable to delete this document. Please try again later.',
-        });
-      }
-    }),
-
   deleteDocument: authenticatedProcedure
     .input(ZDeleteDocumentMutationSchema)
     .mutation(async ({ input, ctx }) => {
diff --git a/packages/trpc/server/document-router/schema.ts b/packages/trpc/server/document-router/schema.ts
index 4936aae37..483d32e50 100644
--- a/packages/trpc/server/document-router/schema.ts
+++ b/packages/trpc/server/document-router/schema.ts
@@ -48,12 +48,6 @@ export const ZCreateDocumentMutationSchema = z.object({
   teamId: z.number().optional(),
 });
 
-export const ZUpdateDocumentMutationSchema = z.object({
-  documentId: z.number().min(1),
-  teamId: z.number().optional(),
-  data: z.any(),
-});
-
 export type TCreateDocumentMutationSchema = z.infer<typeof ZCreateDocumentMutationSchema>;
 
 export const ZSetSettingsForDocumentMutationSchema = z.object({

From bb43547a459dc3ef3ae0d02ccf2607b674373f67 Mon Sep 17 00:00:00 2001
From: Catalin Pit <25515812+catalinpit@users.noreply.github.com>
Date: Wed, 24 Apr 2024 09:39:47 +0300
Subject: [PATCH 03/17] fix: complete document when all recipients are CC

---
 .../lib/server-only/document/send-document.tsx    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/lib/server-only/document/send-document.tsx b/packages/lib/server-only/document/send-document.tsx
index 6b9ab8037..8d92de3a3 100644
--- a/packages/lib/server-only/document/send-document.tsx
+++ b/packages/lib/server-only/document/send-document.tsx
@@ -4,6 +4,8 @@ import { mailer } from '@documenso/email/mailer';
 import { render } from '@documenso/email/render';
 import { DocumentInviteEmailTemplate } from '@documenso/email/templates/document-invite';
 import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email';
+import { sealDocument } from '@documenso/lib/server-only/document/seal-document';
+import { updateDocument } from '@documenso/lib/server-only/document/update-document';
 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';
@@ -215,6 +217,17 @@ export const sendDocument = async ({
     (recipient) => recipient.role === RecipientRole.CC,
   );
 
+  if (allRecipientsAreCC) {
+    const updatedDocument = await updateDocument({
+      documentId,
+      userId,
+      teamId,
+      data: { status: DocumentStatus.COMPLETED },
+    });
+
+    return await sealDocument({ documentId: updatedDocument.id, requestMetadata });
+  }
+
   const updatedDocument = await prisma.$transaction(async (tx) => {
     if (document.status === DocumentStatus.DRAFT) {
       await tx.documentAuditLog.create({
@@ -233,7 +246,7 @@ export const sendDocument = async ({
         id: documentId,
       },
       data: {
-        status: allRecipientsAreCC ? DocumentStatus.COMPLETED : DocumentStatus.PENDING,
+        status: DocumentStatus.PENDING,
       },
       include: {
         Recipient: true,

From d7959950e21684286caad13cbddacaa46b4d559e Mon Sep 17 00:00:00 2001
From: Catalin Pit <25515812+catalinpit@users.noreply.github.com>
Date: Wed, 24 Apr 2024 09:41:34 +0300
Subject: [PATCH 04/17] fix: edit-document line

---
 apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx
index e175ae18a..2e2f0c889 100644
--- a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx
+++ b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx
@@ -248,6 +248,7 @@ export const EditDocumentForm = ({
 
   const onAddSubjectFormSubmit = async (data: TAddSubjectFormSchema) => {
     const { subject, message } = data.meta;
+
     try {
       await sendDocument({
         documentId: document.id,

From 40808066069d189ad21ddaf06fdaf9fee612dd56 Mon Sep 17 00:00:00 2001
From: Lucas Smith <me@lucasjamessmith.me>
Date: Fri, 26 Apr 2024 02:17:56 +0000
Subject: [PATCH 05/17] fix: minor updates

---
 .../lib/server-only/document/send-document.tsx   | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/lib/server-only/document/send-document.tsx b/packages/lib/server-only/document/send-document.tsx
index 8d92de3a3..9f68ed29b 100644
--- a/packages/lib/server-only/document/send-document.tsx
+++ b/packages/lib/server-only/document/send-document.tsx
@@ -213,11 +213,11 @@ export const sendDocument = async ({
     }),
   );
 
-  const allRecipientsAreCC = document.Recipient.every(
+  const allRecipientsHaveNoActionToTake = document.Recipient.every(
     (recipient) => recipient.role === RecipientRole.CC,
   );
 
-  if (allRecipientsAreCC) {
+  if (allRecipientsHaveNoActionToTake) {
     const updatedDocument = await updateDocument({
       documentId,
       userId,
@@ -225,7 +225,17 @@ export const sendDocument = async ({
       data: { status: DocumentStatus.COMPLETED },
     });
 
-    return await sealDocument({ documentId: updatedDocument.id, requestMetadata });
+    await sealDocument({ documentId: updatedDocument.id, requestMetadata });
+
+    // Keep the return type the same for the `sendDocument` method
+    return await prisma.document.findFirstOrThrow({
+      where: {
+        id: documentId,
+      },
+      include: {
+        Recipient: true,
+      },
+    });
   }
 
   const updatedDocument = await prisma.$transaction(async (tx) => {

From 20edee7f1a2293344827f20deee372381aa25021 Mon Sep 17 00:00:00 2001
From: David Nguyen <davidngu28@gmail.com>
Date: Fri, 26 Apr 2024 16:01:09 +0700
Subject: [PATCH 06/17] fix: ssr feature flags (#1119)

## Description

Feature flags are broken on SSR due to this error

```
TypeError: fetch failed
    at Object.fetch (node:internal/deps/undici/undici:11731:11)
    at process.processTicksAndRejections (node:internal/process/task_queues:95:5) {
  cause: RequestContentLengthMismatchError: Request body length does not match content-length header
      at write (node:internal/deps/undici/undici:8590:41)
      at _resume (node:internal/deps/undici/undici:8563:33)
      at resume (node:internal/deps/undici/undici:8459:7)
      at [dispatch] (node:internal/deps/undici/undici:7704:11)
      at Client.Intercept (node:internal/deps/undici/undici:7377:20)
      at Client.dispatch (node:internal/deps/undici/undici:6023:44)
      at [dispatch] (node:internal/deps/undici/undici:6254:32)
      at Pool.dispatch (node:internal/deps/undici/undici:6023:44)
      at [dispatch] (node:internal/deps/undici/undici:9343:27)
      at Agent.Intercept (node:internal/deps/undici/undici:7377:20) {
    code: 'UND_ERR_REQ_CONTENT_LENGTH_MISMATCH'
  }
}
```

I've removed content-length header since it isn't mandatory to my
knowledge for get requests.

## Changes

- Add fallback local flags when individual flag request fails
- Add error logging
- Remove `content-length` from headers being passed to Posthog
---
 packages/lib/universal/get-feature-flag.ts | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/lib/universal/get-feature-flag.ts b/packages/lib/universal/get-feature-flag.ts
index f4650f691..92f186ab3 100644
--- a/packages/lib/universal/get-feature-flag.ts
+++ b/packages/lib/universal/get-feature-flag.ts
@@ -17,6 +17,7 @@ export const getFlag = async (
   options?: GetFlagOptions,
 ): Promise<TFeatureFlagValue> => {
   const requestHeaders = options?.requestHeaders ?? {};
+  delete requestHeaders['content-length'];
 
   if (!isFeatureFlagEnabled()) {
     return LOCAL_FEATURE_FLAGS[flag] ?? true;
@@ -25,7 +26,7 @@ export const getFlag = async (
   const url = new URL(`${APP_BASE_URL()}/api/feature-flag/get`);
   url.searchParams.set('flag', flag);
 
-  const response = await fetch(url, {
+  return await fetch(url, {
     headers: {
       ...requestHeaders,
     },
@@ -35,9 +36,10 @@ export const getFlag = async (
   })
     .then(async (res) => res.json())
     .then((res) => ZFeatureFlagValueSchema.parse(res))
-    .catch(() => false);
-
-  return response;
+    .catch((err) => {
+      console.error(err);
+      return LOCAL_FEATURE_FLAGS[flag] ?? false;
+    });
 };
 
 /**
@@ -50,6 +52,7 @@ export const getAllFlags = async (
   options?: GetFlagOptions,
 ): Promise<Record<string, TFeatureFlagValue>> => {
   const requestHeaders = options?.requestHeaders ?? {};
+  delete requestHeaders['content-length'];
 
   if (!isFeatureFlagEnabled()) {
     return LOCAL_FEATURE_FLAGS;
@@ -67,7 +70,10 @@ export const getAllFlags = async (
   })
     .then(async (res) => res.json())
     .then((res) => z.record(z.string(), ZFeatureFlagValueSchema).parse(res))
-    .catch(() => LOCAL_FEATURE_FLAGS);
+    .catch((err) => {
+      console.error(err);
+      return LOCAL_FEATURE_FLAGS;
+    });
 };
 
 /**
@@ -89,7 +95,10 @@ export const getAllAnonymousFlags = async (): Promise<Record<string, TFeatureFla
   })
     .then(async (res) => res.json())
     .then((res) => z.record(z.string(), ZFeatureFlagValueSchema).parse(res))
-    .catch(() => LOCAL_FEATURE_FLAGS);
+    .catch((err) => {
+      console.error(err);
+      return LOCAL_FEATURE_FLAGS;
+    });
 };
 
 interface GetFlagOptions {

From 364c49992776fff2d804a3e6f38294b72b94485b Mon Sep 17 00:00:00 2001
From: David Nguyen <davidngu28@gmail.com>
Date: Sat, 27 Apr 2024 15:21:46 +0700
Subject: [PATCH 07/17] fix: increase trpc max duration

---
 apps/web/src/pages/api/trpc/[trpc].ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/pages/api/trpc/[trpc].ts b/apps/web/src/pages/api/trpc/[trpc].ts
index c43291ea1..3db86c50d 100644
--- a/apps/web/src/pages/api/trpc/[trpc].ts
+++ b/apps/web/src/pages/api/trpc/[trpc].ts
@@ -3,7 +3,7 @@ import { createTrpcContext } from '@documenso/trpc/server/context';
 import { appRouter } from '@documenso/trpc/server/router';
 
 export const config = {
-  maxDuration: 60,
+  maxDuration: 90,
   api: {
     bodyParser: {
       sizeLimit: '50mb',

From 74b9bc786bcfed756d5f1f676c79ec919b2c34ee Mon Sep 17 00:00:00 2001
From: David Nguyen <davidngu28@gmail.com>
Date: Sat, 27 Apr 2024 18:29:52 +0700
Subject: [PATCH 08/17] fix: extend

---
 apps/web/src/pages/api/trpc/[trpc].ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/pages/api/trpc/[trpc].ts b/apps/web/src/pages/api/trpc/[trpc].ts
index 3db86c50d..ba79244b5 100644
--- a/apps/web/src/pages/api/trpc/[trpc].ts
+++ b/apps/web/src/pages/api/trpc/[trpc].ts
@@ -3,7 +3,7 @@ import { createTrpcContext } from '@documenso/trpc/server/context';
 import { appRouter } from '@documenso/trpc/server/router';
 
 export const config = {
-  maxDuration: 90,
+  maxDuration: 120,
   api: {
     bodyParser: {
       sizeLimit: '50mb',

From 345e42537acad672dc36ef4fafba012db23c38c3 Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Mon, 29 Apr 2024 12:42:22 +1000
Subject: [PATCH 09/17] fix: include all document meta when using the public
 api

---
 packages/api/v1/implementation.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/api/v1/implementation.ts b/packages/api/v1/implementation.ts
index 8ee0350bd..253803fc8 100644
--- a/packages/api/v1/implementation.ts
+++ b/packages/api/v1/implementation.ts
@@ -229,6 +229,13 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
         requestMetadata: extractNextApiRequestMetadata(args.req),
       });
 
+      await upsertDocumentMeta({
+        documentId: document.id,
+        userId: user.id,
+        ...body.meta,
+        requestMetadata: extractNextApiRequestMetadata(args.req),
+      });
+
       const recipients = await setRecipientsForDocument({
         userId: user.id,
         teamId: team?.id,
@@ -324,10 +331,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
       await upsertDocumentMeta({
         documentId: document.id,
         userId: user.id,
-        subject: body.meta.subject,
-        message: body.meta.message,
-        dateFormat: body.meta.dateFormat,
-        timezone: body.meta.timezone,
+        ...body.meta,
         requestMetadata: extractNextApiRequestMetadata(args.req),
       });
     }

From 97d334a1da63b8e0284d2697f914631fa64671eb Mon Sep 17 00:00:00 2001
From: David Nguyen <davidngu28@gmail.com>
Date: Mon, 29 Apr 2024 20:15:40 +0700
Subject: [PATCH 10/17] fix: force users to have a Stripe customer on sign in

---
 apps/web/src/pages/api/auth/[...nextauth].ts | 32 ++++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/apps/web/src/pages/api/auth/[...nextauth].ts b/apps/web/src/pages/api/auth/[...nextauth].ts
index 365b6ec40..5217f4f8b 100644
--- a/apps/web/src/pages/api/auth/[...nextauth].ts
+++ b/apps/web/src/pages/api/auth/[...nextauth].ts
@@ -2,6 +2,8 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 
 import NextAuth from 'next-auth';
 
+import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer';
+import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { NEXT_AUTH_OPTIONS } from '@documenso/lib/next-auth/auth-options';
 import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { prisma } from '@documenso/prisma';
@@ -18,15 +20,27 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {
       error: '/signin',
     },
     events: {
-      signIn: async ({ user }) => {
-        await prisma.userSecurityAuditLog.create({
-          data: {
-            userId: user.id,
-            ipAddress,
-            userAgent,
-            type: UserSecurityAuditLogType.SIGN_IN,
-          },
-        });
+      signIn: async ({ user: { id: userId } }) => {
+        const [user] = await Promise.all([
+          await prisma.user.findFirstOrThrow({
+            where: {
+              id: userId,
+            },
+          }),
+          await prisma.userSecurityAuditLog.create({
+            data: {
+              userId: userId,
+              ipAddress,
+              userAgent,
+              type: UserSecurityAuditLogType.SIGN_IN,
+            },
+          }),
+        ]);
+
+        // Create the Stripe customer and attach it to the user if it doesn't exist.
+        if (user.customerId === null && IS_BILLING_ENABLED()) {
+          await getStripeCustomerByUser(user);
+        }
       },
       signOut: async ({ token }) => {
         const userId = typeof token.id === 'string' ? parseInt(token.id) : token.id;

From 0e16a86e74702986fe4e3146a775db9293617795 Mon Sep 17 00:00:00 2001
From: Adithya Krishna <aadithya794@gmail.com>
Date: Tue, 30 Apr 2024 11:55:01 +0530
Subject: [PATCH 11/17] chore: updated dark mode text

---
 .../(unauthenticated)/articles/signature-disclosure/page.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/app/(unauthenticated)/articles/signature-disclosure/page.tsx b/apps/web/src/app/(unauthenticated)/articles/signature-disclosure/page.tsx
index 878332f35..c56f53702 100644
--- a/apps/web/src/app/(unauthenticated)/articles/signature-disclosure/page.tsx
+++ b/apps/web/src/app/(unauthenticated)/articles/signature-disclosure/page.tsx
@@ -5,7 +5,7 @@ import { Button } from '@documenso/ui/primitives/button';
 export default function SignatureDisclosure() {
   return (
     <div>
-      <article className="prose">
+      <article className="prose dark:prose-invert">
         <h1>Electronic Signature Disclosure</h1>
 
         <h2>Welcome</h2>

From 8622e688534ffc374aee85715625a12262a38c20 Mon Sep 17 00:00:00 2001
From: David Nguyen <davidngu28@gmail.com>
Date: Tue, 30 Apr 2024 15:50:22 +0700
Subject: [PATCH 12/17] fix: add logging

---
 apps/web/src/pages/api/auth/[...nextauth].ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/pages/api/auth/[...nextauth].ts b/apps/web/src/pages/api/auth/[...nextauth].ts
index 5217f4f8b..04f30ef45 100644
--- a/apps/web/src/pages/api/auth/[...nextauth].ts
+++ b/apps/web/src/pages/api/auth/[...nextauth].ts
@@ -39,7 +39,9 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {
 
         // Create the Stripe customer and attach it to the user if it doesn't exist.
         if (user.customerId === null && IS_BILLING_ENABLED()) {
-          await getStripeCustomerByUser(user);
+          await getStripeCustomerByUser(user).catch((err) => {
+            console.error(err);
+          });
         }
       },
       signOut: async ({ token }) => {

From cfec366c1af9db7e602f0d1e4e9f1df99d47a0b9 Mon Sep 17 00:00:00 2001
From: David Nguyen <davidngu28@gmail.com>
Date: Tue, 30 Apr 2024 15:54:24 +0700
Subject: [PATCH 13/17] fix: refactor

---
 apps/web/src/pages/api/auth/[...nextauth].ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/pages/api/auth/[...nextauth].ts b/apps/web/src/pages/api/auth/[...nextauth].ts
index 04f30ef45..31f6e9ea3 100644
--- a/apps/web/src/pages/api/auth/[...nextauth].ts
+++ b/apps/web/src/pages/api/auth/[...nextauth].ts
@@ -29,7 +29,7 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {
           }),
           await prisma.userSecurityAuditLog.create({
             data: {
-              userId: userId,
+              userId,
               ipAddress,
               userAgent,
               type: UserSecurityAuditLogType.SIGN_IN,

From 6974a76ed48611fd9d202148283006c0e6f45d81 Mon Sep 17 00:00:00 2001
From: Adithya Krishna <aadithya794@gmail.com>
Date: Tue, 30 Apr 2024 18:47:49 +0530
Subject: [PATCH 14/17] chore: fix button styling

---
 .../template-flow/add-template-placeholder-recipients.tsx        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx b/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
index e415f1aac..d285fbe44 100644
--- a/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
+++ b/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
@@ -282,6 +282,7 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
           <Button
             type="button"
             className="dark:bg-muted dark:hover:bg-muted/80 bg-black/5 hover:bg-black/10"
+            variant="secondary"
             disabled={
               isSubmitting || getValues('signers').some((signer) => signer.email === user?.email)
             }

From dbd452be97bcb27da9cc6666079109926d13b548 Mon Sep 17 00:00:00 2001
From: David Nguyen <davidngu28@gmail.com>
Date: Tue, 30 Apr 2024 20:53:18 +0700
Subject: [PATCH 15/17] fix: delete pending documents (#1118)

## Description

Currently deleting a pending document where you are a recipient off will
delete the document, but will also throw an error.

This is due to the recipient being updated after the document deleted,
which is only supposed to happen for completed documents.
---
 .../server-only/document/delete-document.ts   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/lib/server-only/document/delete-document.ts b/packages/lib/server-only/document/delete-document.ts
index a097d76e9..bf4f8aa06 100644
--- a/packages/lib/server-only/document/delete-document.ts
+++ b/packages/lib/server-only/document/delete-document.ts
@@ -75,18 +75,20 @@ export const deleteDocument = async ({
   }
 
   // Continue to hide the document from the user if they are a recipient.
+  // Dirty way of doing this but it's faster than refetching the document.
   if (userRecipient?.documentDeletedAt === null) {
-    await prisma.recipient.update({
-      where: {
-        documentId_email: {
-          documentId: document.id,
-          email: user.email,
+    await prisma.recipient
+      .update({
+        where: {
+          id: userRecipient.id,
         },
-      },
-      data: {
-        documentDeletedAt: new Date().toISOString(),
-      },
-    });
+        data: {
+          documentDeletedAt: new Date().toISOString(),
+        },
+      })
+      .catch(() => {
+        // Do nothing.
+      });
   }
 
   // Return partial document for API v1 response.

From d3528f74f058c49d9705aca6556f9d0d56c6607f Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Wed, 1 May 2024 14:18:01 +1000
Subject: [PATCH 16/17] fix: improve sealing process

Improves the sealing process by being strict on how
long certificate generation can take, opting to fail
generation and continue sealing.

Also changes the ordering of sealing so an error in the
process won't also cause a document to be "COMPLETED"
since it hasn't been cryptographically sealed yet.

The downside to this change is that documents that fail
during sealing will require manual intervention as a signer
or owner won't be able to *complete* the document.
---
 .../document/complete-document-with-token.ts  | 17 ++++++----
 .../lib/server-only/document/seal-document.ts | 34 +++++++++++++------
 .../htmltopdf/get-certificate-pdf.ts          |  1 +
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/packages/lib/server-only/document/complete-document-with-token.ts b/packages/lib/server-only/document/complete-document-with-token.ts
index d16b83ea1..053b2f1c2 100644
--- a/packages/lib/server-only/document/complete-document-with-token.ts
+++ b/packages/lib/server-only/document/complete-document-with-token.ts
@@ -137,7 +137,7 @@ export const completeDocumentWithToken = async ({
     await sendPendingEmail({ documentId, recipientId: recipient.id });
   }
 
-  const documents = await prisma.document.updateMany({
+  const haveAllRecipientsSigned = await prisma.document.findFirst({
     where: {
       id: document.id,
       Recipient: {
@@ -146,16 +146,21 @@ export const completeDocumentWithToken = async ({
         },
       },
     },
+  });
+
+  if (haveAllRecipientsSigned) {
+    await sealDocument({ documentId: document.id, requestMetadata });
+  }
+
+  await prisma.document.update({
+    where: {
+      id: document.id,
+    },
     data: {
-      status: DocumentStatus.COMPLETED,
       completedAt: new Date(),
     },
   });
 
-  if (documents.count > 0) {
-    await sealDocument({ documentId: document.id, requestMetadata });
-  }
-
   const updatedDocument = await getDocument({ token, documentId });
 
   await triggerWebhook({
diff --git a/packages/lib/server-only/document/seal-document.ts b/packages/lib/server-only/document/seal-document.ts
index 3e366dc81..cbfb1dd98 100644
--- a/packages/lib/server-only/document/seal-document.ts
+++ b/packages/lib/server-only/document/seal-document.ts
@@ -40,6 +40,11 @@ export const sealDocument = async ({
   const document = await prisma.document.findFirstOrThrow({
     where: {
       id: documentId,
+      Recipient: {
+        every: {
+          signingStatus: SigningStatus.SIGNED,
+        },
+      },
     },
     include: {
       documentData: true,
@@ -53,10 +58,6 @@ export const sealDocument = async ({
     throw new Error(`Document ${document.id} has no document data`);
   }
 
-  if (document.status !== DocumentStatus.COMPLETED) {
-    throw new Error(`Document ${document.id} has not been completed`);
-  }
-
   const recipients = await prisma.recipient.findMany({
     where: {
       documentId: document.id,
@@ -92,9 +93,9 @@ export const sealDocument = async ({
   // !: Need to write the fields onto the document as a hard copy
   const pdfData = await getFile(documentData);
 
-  const certificate = await getCertificatePdf({ documentId }).then(async (doc) =>
-    PDFDocument.load(doc),
-  );
+  const certificate = await getCertificatePdf({ documentId })
+    .then(async (doc) => PDFDocument.load(doc))
+    .catch(() => null);
 
   const doc = await PDFDocument.load(pdfData);
 
@@ -103,11 +104,13 @@ export const sealDocument = async ({
   doc.getForm().flatten();
   flattenAnnotations(doc);
 
-  const certificatePages = await doc.copyPages(certificate, certificate.getPageIndices());
+  if (certificate) {
+    const certificatePages = await doc.copyPages(certificate, certificate.getPageIndices());
 
-  certificatePages.forEach((page) => {
-    doc.addPage(page);
-  });
+    certificatePages.forEach((page) => {
+      doc.addPage(page);
+    });
+  }
 
   for (const field of fields) {
     await insertFieldInPDF(doc, field);
@@ -138,6 +141,15 @@ export const sealDocument = async ({
   }
 
   await prisma.$transaction(async (tx) => {
+    await tx.document.update({
+      where: {
+        id: document.id,
+      },
+      data: {
+        status: DocumentStatus.COMPLETED,
+      },
+    });
+
     await tx.documentData.update({
       where: {
         id: documentData.id,
diff --git a/packages/lib/server-only/htmltopdf/get-certificate-pdf.ts b/packages/lib/server-only/htmltopdf/get-certificate-pdf.ts
index dee40d41a..1b6150fb9 100644
--- a/packages/lib/server-only/htmltopdf/get-certificate-pdf.ts
+++ b/packages/lib/server-only/htmltopdf/get-certificate-pdf.ts
@@ -35,6 +35,7 @@ export const getCertificatePdf = async ({ documentId }: GetCertificatePdfOptions
 
   await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/__htmltopdf/certificate?d=${encryptedId}`, {
     waitUntil: 'networkidle',
+    timeout: 10_000,
   });
 
   const result = await page.pdf({

From 78dc57a6eb6ded773c0b7e94d3eab2fbdc8b6121 Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Wed, 1 May 2024 16:16:04 +1000
Subject: [PATCH 17/17] fix: improvements from review

---
 .../server-only/document/complete-document-with-token.ts | 9 ---------
 packages/lib/server-only/document/seal-document.ts       | 1 +
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/lib/server-only/document/complete-document-with-token.ts b/packages/lib/server-only/document/complete-document-with-token.ts
index 053b2f1c2..29d17cc50 100644
--- a/packages/lib/server-only/document/complete-document-with-token.ts
+++ b/packages/lib/server-only/document/complete-document-with-token.ts
@@ -152,15 +152,6 @@ export const completeDocumentWithToken = async ({
     await sealDocument({ documentId: document.id, requestMetadata });
   }
 
-  await prisma.document.update({
-    where: {
-      id: document.id,
-    },
-    data: {
-      completedAt: new Date(),
-    },
-  });
-
   const updatedDocument = await getDocument({ token, documentId });
 
   await triggerWebhook({
diff --git a/packages/lib/server-only/document/seal-document.ts b/packages/lib/server-only/document/seal-document.ts
index cbfb1dd98..564dfc049 100644
--- a/packages/lib/server-only/document/seal-document.ts
+++ b/packages/lib/server-only/document/seal-document.ts
@@ -147,6 +147,7 @@ export const sealDocument = async ({
       },
       data: {
         status: DocumentStatus.COMPLETED,
+        completedAt: new Date(),
       },
     });