Merge branch 'main' into feat/unlink-documents-deleted-org

apps/remix/app/routes/api+/webhook.trigger.ts

@@ -1,4 +1,3 @@
-// Todo: [Webhooks] delete file after deployment.
 import { handlerTriggerWebhooks } from '@documenso/lib/server-only/webhooks/trigger/handler';
 
 import type { Route } from './+types/webhook.trigger';

packages/lib/jobs/definitions/internal/execute-webhook.handler.ts

@@ -22,51 +22,53 @@ export const run = async ({
 
   const { webhookUrl: url, secret } = webhook;
 
-  const payloadData = {
+  await io.runTask('execute-webhook', async () => {
-    event,
+    const payloadData = {
-    payload: data,
-    createdAt: new Date().toISOString(),
-    webhookEndpoint: url,
-  };
-
-  const response = await fetch(url, {
-    method: 'POST',
-    body: JSON.stringify(payloadData),
-    headers: {
-      'Content-Type': 'application/json',
-      'X-Documenso-Secret': secret ?? '',
-    },
-  });
-
-  const body = await response.text();
-
-  let responseBody: Prisma.InputJsonValue | Prisma.JsonNullValueInput = Prisma.JsonNull;
-
-  try {
-    responseBody = JSON.parse(body);
-  } catch (err) {
-    responseBody = body;
-  }
-
-  await prisma.webhookCall.create({
-    data: {
-      url,
       event,
-      status: response.ok ? WebhookCallStatus.SUCCESS : WebhookCallStatus.FAILED,
+      payload: data,
-      requestBody: payloadData as Prisma.InputJsonValue,
+      createdAt: new Date().toISOString(),
-      responseCode: response.status,
+      webhookEndpoint: url,
-      responseBody,
+    };
-      responseHeaders: Object.fromEntries(response.headers.entries()),
+
-      webhookId: webhook.id,
+    const response = await fetch(url, {
-    },
+      method: 'POST',
+      body: JSON.stringify(payloadData),
+      headers: {
+        'Content-Type': 'application/json',
+        'X-Documenso-Secret': secret ?? '',
+      },
+    });
+
+    const body = await response.text();
+
+    let responseBody: Prisma.InputJsonValue | Prisma.JsonNullValueInput = Prisma.JsonNull;
+
+    try {
+      responseBody = JSON.parse(body);
+    } catch (err) {
+      responseBody = body;
+    }
+
+    await prisma.webhookCall.create({
+      data: {
+        url,
+        event,
+        status: response.ok ? WebhookCallStatus.SUCCESS : WebhookCallStatus.FAILED,
+        requestBody: payloadData as Prisma.InputJsonValue,
+        responseCode: response.status,
+        responseBody,
+        responseHeaders: Object.fromEntries(response.headers.entries()),
+        webhookId: webhook.id,
+      },
+    });
+
+    if (!response.ok) {
+      throw new Error(`Webhook execution failed with status ${response.status}`);
+    }
+
+    return {
+      success: response.ok,
+      status: response.status,
+    };
   });
-
-  if (!response.ok) {
-    throw new Error(`Webhook execution failed with status ${response.status}`);
-  }
-
-  return {
-    success: response.ok,
-    status: response.status,
-  };
 };

packages/lib/server-only/document/handle-document-ownership-on-deletion.ts

@@ -0,0 +1,84 @@
+import { deletedAccountServiceAccount } from '@documenso/lib/server-only/user/service-accounts/deleted-account';
+import { prisma } from '@documenso/prisma';
+import { DocumentStatus } from '@documenso/prisma/client';
+
+type HandleDocumentOwnershipOnDeletionOptions = {
+  documentIds: number[];
+  organisationOwnerId: number;
+};
+
+export const handleDocumentOwnershipOnDeletion = async ({
+  documentIds,
+  organisationOwnerId,
+}: HandleDocumentOwnershipOnDeletionOptions) => {
+  if (documentIds.length === 0) {
+    return;
+  }
+
+  const serviceAccount = await deletedAccountServiceAccount();
+  const serviceAccountTeam = serviceAccount.ownedOrganisations[0].teams[0];
+
+  await prisma.document.deleteMany({
+    where: {
+      id: {
+        in: documentIds,
+      },
+      status: DocumentStatus.DRAFT,
+    },
+  });
+
+  const organisationOwner = await prisma.user.findUnique({
+    where: {
+      id: organisationOwnerId,
+    },
+    select: {
+      id: true,
+      ownedOrganisations: {
+        select: {
+          id: true,
+          teams: {
+            select: {
+              id: true,
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (organisationOwner && organisationOwner.ownedOrganisations.length > 0) {
+    const ownerPersonalTeam = organisationOwner.ownedOrganisations[0].teams[0];
+
+    await prisma.document.updateMany({
+      where: {
+        id: {
+          in: documentIds,
+        },
+        status: {
+          in: [DocumentStatus.PENDING, DocumentStatus.REJECTED, DocumentStatus.COMPLETED],
+        },
+      },
+      data: {
+        userId: organisationOwner.id,
+        teamId: ownerPersonalTeam.id,
+        deletedAt: new Date(),
+      },
+    });
+  } else {
+    await prisma.document.updateMany({
+      where: {
+        id: {
+          in: documentIds,
+        },
+        status: {
+          in: [DocumentStatus.PENDING, DocumentStatus.REJECTED, DocumentStatus.COMPLETED],
+        },
+      },
+      data: {
+        userId: serviceAccount.id,
+        teamId: serviceAccountTeam.id,
+        deletedAt: new Date(),
+      },
+    });
+  }
+};

packages/lib/server-only/user/service-accounts/deleted-account.ts

@@ -5,6 +5,20 @@ export const deletedAccountServiceAccount = async () => {
     where: {
       email: 'deleted-account@documenso.com',
     },
+    select: {
+      id: true,
+      email: true,
+      ownedOrganisations: {
+        select: {
+          id: true,
+          teams: {
+            select: {
+              id: true,
+            },
+          },
+        },
+      },
+    },
   });
 
   if (!serviceAccount) {

packages/lib/server-only/webhooks/trigger/handler.ts

@@ -13,7 +13,6 @@ export type HandlerTriggerWebhooksResponse =
       error: string;
     };
 
-// Todo: [Webhooks] delete after deployment.
 export const handlerTriggerWebhooks = async (req: Request) => {
   const signature = req.headers.get('x-webhook-signature');
 

packages/lib/server-only/webhooks/trigger/trigger-webhook.ts

@@ -1,6 +1,7 @@
 import type { WebhookTriggerEvents } from '@prisma/client';
 
-import { jobs } from '../../../jobs/client';
+import { NEXT_PRIVATE_INTERNAL_WEBAPP_URL } from '../../../constants/app';
+import { sign } from '../../crypto/sign';
 import { getAllWebhooksByEventTrigger } from '../get-all-webhooks-by-event-trigger';
 
 export type TriggerWebhookOptions = {
@@ -12,26 +13,35 @@ export type TriggerWebhookOptions = {
 
 export const triggerWebhook = async ({ event, data, userId, teamId }: TriggerWebhookOptions) => {
   try {
+    const body = {
+      event,
+      data,
+      userId,
+      teamId,
+    };
+
     const registeredWebhooks = await getAllWebhooksByEventTrigger({ event, userId, teamId });
 
     if (registeredWebhooks.length === 0) {
       return;
     }
 
-    await Promise.allSettled(
+    const signature = sign(body);
-      registeredWebhooks.map(async (webhook) => {
+
-        await jobs.triggerJob({
+    await Promise.race([
-          name: 'internal.execute-webhook',
+      fetch(`${NEXT_PRIVATE_INTERNAL_WEBAPP_URL()}/api/webhook/trigger`, {
-          payload: {
+        method: 'POST',
-            event,
+        headers: {
-            webhookId: webhook.id,
+          'content-type': 'application/json',
-            data,
+          'x-webhook-signature': signature,
-          },
+        },
-        });
+        body: JSON.stringify(body),
       }),
-    );
+      new Promise((_, reject) => {
+        setTimeout(() => reject(new Error('Request timeout')), 500);
+      }),
+    ]).catch(() => null);
   } catch (err) {
-    console.error(err);
     throw new Error(`Failed to trigger webhook`);
   }
 };

packages/trpc/server/organisation-router/delete-organisation.ts

@@ -3,6 +3,7 @@ import {
   ORGANISATION_USER_ACCOUNT_TYPE,
 } from '@documenso/lib/constants/organisations';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { handleDocumentOwnershipOnDeletion } from '@documenso/lib/server-only/document/handle-document-ownership-on-deletion';
 import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
 import { prisma } from '@documenso/prisma';
 
@@ -32,6 +33,24 @@ export const deleteOrganisationRoute = authenticatedProcedure
         userId: user.id,
         roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['DELETE_ORGANISATION'],
       }),
+      select: {
+        id: true,
+        owner: {
+          select: {
+            id: true,
+          },
+        },
+        teams: {
+          select: {
+            id: true,
+            documents: {
+              select: {
+                id: true,
+              },
+            },
+          },
+        },
+      },
     });
 
     if (!organisation) {
@@ -40,6 +59,15 @@ export const deleteOrganisationRoute = authenticatedProcedure
       });
     }
 
+    const documentIds = organisation.teams.flatMap((team) => team.documents.map((doc) => doc.id));
+
+    if (documentIds && documentIds.length > 0) {
+      await handleDocumentOwnershipOnDeletion({
+        documentIds,
+        organisationOwnerId: organisation.owner.id,
+      });
+    }
+
     await prisma.$transaction(async (tx) => {
       await tx.account.deleteMany({
         where: {

packages/trpc/server/team-router/delete-team.ts

@@ -1,4 +1,8 @@
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { handleDocumentOwnershipOnDeletion } from '@documenso/lib/server-only/document/handle-document-ownership-on-deletion';
 import { deleteTeam } from '@documenso/lib/server-only/team/delete-team';
+import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
 
 import { authenticatedProcedure } from '../trpc';
 import { ZDeleteTeamRequestSchema, ZDeleteTeamResponseSchema } from './delete-team.types';
@@ -11,12 +15,53 @@ export const deleteTeamRoute = authenticatedProcedure
     const { teamId } = input;
     const { user } = ctx;
 
+    const team = await prisma.team.findUnique({
+      where: {
+        id: teamId,
+      },
+    });
+
+    const organisation = await prisma.organisation.findFirst({
+      where: buildOrganisationWhereQuery({
+        organisationId: team?.organisationId,
+        userId: user.id,
+        roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['DELETE_ORGANISATION'],
+      }),
+      select: {
+        id: true,
+        owner: {
+          select: {
+            id: true,
+          },
+        },
+        teams: {
+          select: {
+            id: true,
+            documents: {
+              select: {
+                id: true,
+              },
+            },
+          },
+        },
+      },
+    });
+
     ctx.logger.info({
       input: {
         teamId,
       },
     });
 
+    const documentIds = organisation?.teams.flatMap((team) => team.documents.map((doc) => doc.id));
+
+    if (documentIds && documentIds.length > 0 && organisation) {
+      await handleDocumentOwnershipOnDeletion({
+        documentIds,
+        organisationOwnerId: organisation.owner.id,
+      });
+    }
+
     await deleteTeam({
       userId: user.id,
       teamId,