chore: reverted merge

packages/lib/server-only/document/get-document-by-token.ts

@@ -147,7 +147,7 @@ export const getDocumentAndRecipientByToken = async ({
     },
   });
 
-  const [recipient] = result.Recipient;
+  const recipient = result.Recipient[0];
 
   // Sanity check, should not be possible.
   if (!recipient) {

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

@@ -110,21 +110,24 @@ export const createField = async ({
   }
 
   const result = match(type)
-    .with('RADIO', () => ZRadioFieldMeta.safeParse(fieldMeta))
-    .with('CHECKBOX', () => ZCheckboxFieldMeta.safeParse(fieldMeta))
-    .with('DROPDOWN', () => ZDropdownFieldMeta.safeParse(fieldMeta))
-    .with('NUMBER', () => ZNumberFieldMeta.safeParse(fieldMeta))
-    .with('TEXT', () => ZTextFieldMeta.safeParse(fieldMeta))
-    .with('SIGNATURE', 'INITIALS', 'DATE', 'EMAIL', 'NAME', () => ({
-      success: true,
-      data: {},
-    }))
-    .with('FREE_SIGNATURE', () => ({
-      success: false,
-      error: 'FREE_SIGNATURE is not supported',
-      data: {},
-    }))
-    .exhaustive();
+    .with('RADIO', () => {
+      return ZRadioFieldMeta.safeParse(fieldMeta);
+    })
+    .with('CHECKBOX', () => {
+      return ZCheckboxFieldMeta.safeParse(fieldMeta);
+    })
+    .with('DROPDOWN', () => {
+      return ZDropdownFieldMeta.safeParse(fieldMeta);
+    })
+    .with('NUMBER', () => {
+      return ZNumberFieldMeta.safeParse(fieldMeta);
+    })
+    .with('TEXT', () => {
+      return ZTextFieldMeta.safeParse(fieldMeta);
+    })
+    .otherwise(() => {
+      return { success: false, data: {} };
+    });
 
   if (!result.success) {
     throw new Error('Field meta parsing failed');
@@ -142,7 +145,7 @@ export const createField = async ({
       height: pageHeight,
       customText: '',
       inserted: false,
-      fieldMeta: result.data,
+      fieldMeta: advancedField ? result.data : undefined,
     },
     include: {
       Recipient: true,

packages/lib/server-only/field/update-field.ts

@@ -37,10 +37,6 @@ export const updateField = async ({
   requestMetadata,
   fieldMeta,
 }: UpdateFieldOptions) => {
-  if (type === 'FREE_SIGNATURE') {
-    throw new Error('Cannot update a FREE_SIGNATURE field');
-  }
-
   const oldField = await prisma.field.findFirstOrThrow({
     where: {
       id: fieldId,
@@ -65,11 +61,6 @@ export const updateField = async ({
     },
   });
 
-  const newFieldMeta = {
-    ...(oldField.fieldMeta as FieldMeta),
-    ...fieldMeta,
-  };
-
   const field = prisma.$transaction(async (tx) => {
     const updatedField = await tx.field.update({
       where: {
@@ -83,39 +74,13 @@ export const updateField = async ({
         positionY: pageY,
         width: pageWidth,
         height: pageHeight,
-        fieldMeta: newFieldMeta,
+        fieldMeta,
       },
       include: {
         Recipient: true,
       },
     });
 
-    const user = await prisma.user.findFirstOrThrow({
-      where: {
-        id: userId,
-      },
-      select: {
-        id: true,
-        name: true,
-        email: true,
-      },
-    });
-
-    let team: Team | null = null;
-
-    if (teamId) {
-      team = await prisma.team.findFirst({
-        where: {
-          id: teamId,
-          members: {
-            some: {
-              userId,
-            },
-          },
-        },
-      });
-    }
-
     await tx.documentAuditLog.create({
       data: createDocumentAuditLogData({
         type: DOCUMENT_AUDIT_LOG_TYPE.FIELD_UPDATED,
@@ -139,5 +104,31 @@ export const updateField = async ({
     return updatedField;
   });
 
+  const user = await prisma.user.findFirstOrThrow({
+    where: {
+      id: userId,
+    },
+    select: {
+      id: true,
+      name: true,
+      email: true,
+    },
+  });
+
+  let team: Team | null = null;
+
+  if (teamId) {
+    team = await prisma.team.findFirst({
+      where: {
+        id: teamId,
+        members: {
+          some: {
+            userId,
+          },
+        },
+      },
+    });
+  }
+
   return field;
 };

packages/lib/server-only/subscription/get-active-subscriptions-by-user-id.ts

@@ -1,21 +0,0 @@
-'use server';
-
-import { prisma } from '@documenso/prisma';
-import { SubscriptionStatus } from '@documenso/prisma/client';
-
-export type GetActiveSubscriptionsByUserIdOptions = {
-  userId: number;
-};
-
-export const getActiveSubscriptionsByUserId = async ({
-  userId,
-}: GetActiveSubscriptionsByUserIdOptions) => {
-  return await prisma.subscription.findMany({
-    where: {
-      userId,
-      status: {
-        not: SubscriptionStatus.INACTIVE,
-      },
-    },
-  });
-};

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

@@ -210,7 +210,7 @@ export const createDocumentFromDirectTemplate = async ({
 
   const initialRequestTime = new Date();
 
-  const { documentId, recipientId, token } = await prisma.$transaction(async (tx) => {
+  const { documentId, directRecipientToken } = await prisma.$transaction(async (tx) => {
     const documentData = await tx.documentData.create({
       data: {
         type: template.templateDocumentData.type,
@@ -539,9 +539,8 @@ export const createDocumentFromDirectTemplate = async ({
     });
 
     return {
-      token: createdDirectRecipient.token,
       documentId: document.id,
-      recipientId: createdDirectRecipient.id,
+      directRecipientToken: createdDirectRecipient.token,
     };
   });
 
@@ -560,9 +559,5 @@ export const createDocumentFromDirectTemplate = async ({
     // Log and reseal as required until we configure middleware.
   }
 
-  return {
-    token,
-    documentId,
-    recipientId,
-  };
+  return directRecipientToken;
 };