Merge branch 'main' into feat/webhook-implementation

packages/lib/server-only/user/create-user.ts

@@ -53,47 +53,50 @@ export const createUser = async ({ name, email, password, signature }: CreateUse
   await Promise.allSettled(
     acceptedTeamInvites.map(async (invite) =>
       prisma
-        .$transaction(async (tx) => {
-          await tx.teamMember.create({
-            data: {
-              teamId: invite.teamId,
-              userId: user.id,
-              role: invite.role,
-            },
-          });
-
-          await tx.teamMemberInvite.delete({
-            where: {
-              id: invite.id,
-            },
-          });
-
-          if (!IS_BILLING_ENABLED()) {
-            return;
-          }
-
-          const team = await tx.team.findFirstOrThrow({
-            where: {
-              id: invite.teamId,
-            },
-            include: {
-              members: {
-                select: {
-                  id: true,
-                },
+        .$transaction(
+          async (tx) => {
+            await tx.teamMember.create({
+              data: {
+                teamId: invite.teamId,
+                userId: user.id,
+                role: invite.role,
               },
-              subscription: true,
-            },
-          });
-
-          if (team.subscription) {
-            await updateSubscriptionItemQuantity({
-              priceId: team.subscription.priceId,
-              subscriptionId: team.subscription.planId,
-              quantity: team.members.length,
             });
-          }
-        })
+
+            await tx.teamMemberInvite.delete({
+              where: {
+                id: invite.id,
+              },
+            });
+
+            if (!IS_BILLING_ENABLED()) {
+              return;
+            }
+
+            const team = await tx.team.findFirstOrThrow({
+              where: {
+                id: invite.teamId,
+              },
+              include: {
+                members: {
+                  select: {
+                    id: true,
+                  },
+                },
+                subscription: true,
+              },
+            });
+
+            if (team.subscription) {
+              await updateSubscriptionItemQuantity({
+                priceId: team.subscription.priceId,
+                subscriptionId: team.subscription.planId,
+                quantity: team.members.length,
+              });
+            }
+          },
+          { timeout: 30_000 },
+        )
         .catch(async () => {
           await prisma.teamMemberInvite.update({
             where: {

packages/lib/server-only/user/delete-user.ts

@@ -1,4 +1,7 @@
 import { prisma } from '@documenso/prisma';
+import { DocumentStatus } from '@documenso/prisma/client';
+
+import { deletedAccountServiceAccount } from './service-accounts/deleted-account';
 
 export type DeleteUserOptions = {
   email: string;
@@ -17,6 +20,22 @@ export const deleteUser = async ({ email }: DeleteUserOptions) => {
     throw new Error(`User with email ${email} not found`);
   }
 
+  const serviceAccount = await deletedAccountServiceAccount();
+
+  // TODO: Send out cancellations for all pending docs
+  await prisma.document.updateMany({
+    where: {
+      userId: user.id,
+      status: {
+        in: [DocumentStatus.PENDING, DocumentStatus.COMPLETED],
+      },
+    },
+    data: {
+      userId: serviceAccount.id,
+      deletedAt: new Date(),
+    },
+  });
+
   return await prisma.user.delete({
     where: {
       id: user.id,

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

@@ -0,0 +1,17 @@
+import { prisma } from '@documenso/prisma';
+
+export const deletedAccountServiceAccount = async () => {
+  const serviceAccount = await prisma.user.findFirst({
+    where: {
+      email: 'deleted-account@documenso.com',
+    },
+  });
+
+  if (!serviceAccount) {
+    throw new Error(
+      'Deleted account service account not found, have you ran the appropriate migrations?',
+    );
+  }
+
+  return serviceAccount;
+};