fix: merge conflicts

packages/lib/server-only/document-meta/upsert-document-meta.ts

@@ -18,6 +18,7 @@ export type CreateDocumentMetaOptions = {
   dateFormat?: string;
   redirectUrl?: string;
   signingOrder?: DocumentSigningOrder;
+  typedSignatureEnabled?: boolean;
   userId: number;
   requestMetadata: RequestMetadata;
 };
@@ -32,6 +33,7 @@ export const upsertDocumentMeta = async ({
   userId,
   redirectUrl,
   signingOrder,
+  typedSignatureEnabled,
   requestMetadata,
 }: CreateDocumentMetaOptions) => {
   const user = await prisma.user.findFirstOrThrow({
@@ -82,6 +84,7 @@ export const upsertDocumentMeta = async ({
         documentId,
         redirectUrl,
         signingOrder,
+        typedSignatureEnabled,
       },
       update: {
         subject,
@@ -91,6 +94,7 @@ export const upsertDocumentMeta = async ({
         timezone,
         redirectUrl,
         signingOrder,
+        typedSignatureEnabled,
       },
     });
 

packages/lib/server-only/public-api/create-api-token.ts

@@ -51,7 +51,7 @@ export const createApiToken = async ({
       name: tokenName,
       token: hashedToken,
       expires: expiresIn ? DateTime.now().plus(timeConstantsRecords[expiresIn]).toJSDate() : null,
-      userId: teamId ? null : userId,
+      userId,
       teamId,
     },
   });

packages/lib/server-only/public-api/delete-api-token-by-id.ts

@@ -25,8 +25,7 @@ export const deleteTokenById = async ({ id, userId, teamId }: DeleteTokenByIdOpt
   return await prisma.apiToken.delete({
     where: {
       id,
-      userId: teamId ? null : userId,
-      teamId,
+      teamId: teamId ?? null,
     },
   });
 };

packages/lib/server-only/public-api/get-all-user-tokens.ts

@@ -8,6 +8,7 @@ export const getUserTokens = async ({ userId }: GetUserTokensOptions) => {
   return await prisma.apiToken.findMany({
     where: {
       userId,
+      teamId: null,
     },
     select: {
       id: true,

packages/lib/server-only/public-api/get-api-token-by-token.ts

@@ -23,7 +23,8 @@ export const getApiTokenByToken = async ({ token }: { token: string }) => {
     throw new Error('Expired token');
   }
 
-  if (apiToken.team) {
+  // Handle a silly choice from many moons ago
+  if (apiToken.team && !apiToken.user) {
     apiToken.user = await prisma.user.findFirst({
       where: {
         id: apiToken.team.ownerUserId,
@@ -33,9 +34,13 @@ export const getApiTokenByToken = async ({ token }: { token: string }) => {
 
   const { user } = apiToken;
 
+  // This will never happen but we need to narrow types
   if (!user) {
     throw new Error('Invalid token');
   }
 
-  return { ...apiToken, user };
+  return {
+    ...apiToken,
+    user,
+  };
 };

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

@@ -17,6 +17,7 @@ import {
   RecipientRole,
   SendStatus,
   SigningStatus,
+  WebhookTriggerEvents,
 } from '@documenso/prisma/client';
 import type { TSignFieldWithTokenMutationSchema } from '@documenso/trpc/server/field-router/schema';
 
@@ -39,6 +40,7 @@ import {
 import { formatDocumentsPath } from '../../utils/teams';
 import { sendDocument } from '../document/send-document';
 import { validateFieldAuth } from '../document/validate-field-auth';
+import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
 
 export type CreateDocumentFromDirectTemplateOptions = {
   directRecipientName?: string;
@@ -553,6 +555,23 @@ export const createDocumentFromDirectTemplate = async ({
       teamId: template.teamId || undefined,
       requestMetadata,
     });
+
+    const updatedDocument = await prisma.document.findFirstOrThrow({
+      where: {
+        id: documentId,
+      },
+      include: {
+        documentData: true,
+        Recipient: true,
+      },
+    });
+
+    await triggerWebhook({
+      event: WebhookTriggerEvents.DOCUMENT_SIGNED,
+      data: updatedDocument,
+      userId: updatedDocument.userId,
+      teamId: updatedDocument.teamId ?? undefined,
+    });
   } catch (err) {
     console.error('[CREATE_DOCUMENT_FROM_DIRECT_TEMPLATE]:', err);
 

packages/lib/server-only/template/find-templates.ts

@@ -51,6 +51,11 @@ export const findTemplates = async ({
         },
         Field: true,
         Recipient: true,
+        templateMeta: {
+          select: {
+            signingOrder: true,
+          },
+        },
         directLink: {
           select: {
             token: true,