fix: typesafety issues with sender vs uploaderName

Author: dahal

src/jobs/esign-email.ts

@@ -38,6 +38,7 @@ export const sendEsignEmail = async (payload: ExtendedEsignPayloadType) => {
   const html = await render(
     EsignEmail({
       signingLink: `${baseUrl}/esign/${token}`,
+      sender,
       ...rest,
     }),
   );

src/jobs/esign-pdf.ts

@@ -30,8 +30,8 @@ export type EsignPdfPayloadType = {
   bucketKey: string;
   templateName: string;
   companyId: string;
-  uploaderName: string;
   recipients: { email: string; name?: string | null }[];
+  sender: { email: string; name?: string | null };
 };
 
 export class EsignPdfJob extends BaseJob<EsignPdfPayloadType> {
@@ -47,7 +47,7 @@ export class EsignPdfJob extends BaseJob<EsignPdfPayloadType> {
       templateName,
       requestIp,
       userAgent,
-      uploaderName,
+      sender,
       templateId,
       recipients,
       company,
@@ -73,7 +73,7 @@ export class EsignPdfJob extends BaseJob<EsignPdfPayloadType> {
         requestIp,
         templateId,
         templateName,
-        uploaderName,
+        uploaderName: sender.name || "Captable",
         userAgent,
       });
     });
@@ -87,7 +87,8 @@ export class EsignPdfJob extends BaseJob<EsignPdfPayloadType> {
           documentName: templateName,
           recipient,
           company,
-          senderName: uploaderName,
+          senderName: sender.name || "Captable",
+          senderEmail: sender.email as string,
         },
       }));
 

src/trpc/routers/document-router/procedures/create-document.ts

@@ -1,7 +1,7 @@
 import { generatePublicId } from "@/common/id";
 import { Audit } from "@/server/audit";
 import { checkMembership } from "@/server/auth";
-import { type TPrismaOrTransaction } from "@/server/db";
+import type { TPrismaOrTransaction } from "@/server/db";
 import { withAuth, type withAuthTrpcContextType } from "@/trpc/api/trpc";
 import {
   type TypeZodCreateDocumentMutationSchema,

src/trpc/routers/template-router/procedures/sign-template.ts

@@ -28,6 +28,7 @@ export const signTemplateProcedure = withoutAuth
       const bucketKey = template.bucket.key;
       const companyId = template.companyId;
       const templateName = template.name;
+      const sender = template.uploader.user;
 
       const totalGroups = new Set(
         template.fields.map((item) => item.recipientId),
@@ -106,7 +107,9 @@ export const signTemplateProcedure = withoutAuth
             },
           });
 
-          const data = values.reduce<Record<string, string>>((prev, curr) => {
+          const data: Record<string, string> = values.reduce<
+            Record<string, string>
+          >((prev, curr) => {
             prev[curr.id] = curr.prefilledValue ?? "";
 
             return prev;
@@ -133,7 +136,6 @@ export const signTemplateProcedure = withoutAuth
             companyId,
             templateName,
             fields: template.fields,
-            uploaderName: "Captable, Inc.",
             data,
             templateId: template.id,
             db: tx,
@@ -144,6 +146,8 @@ export const signTemplateProcedure = withoutAuth
               email: item.email,
               name: item.name,
             })),
+            sender,
+            uploaderName: sender.name || "Captable",
           });
         }
       } else {
@@ -168,19 +172,20 @@ export const signTemplateProcedure = withoutAuth
           companyId,
           templateName,
           fields: template.fields,
-          uploaderName: recipient.name ?? "unknown signer",
           data: input.data,
           templateId: template.id,
           db: tx,
           requestIp,
           userAgent,
+          sender,
           recipients: [
             {
               email: recipient.email,
               name: recipient.name,
             },
           ],
           company: template.company,
+          uploaderName: sender.name || "Captable",
         });
       }
 
@@ -203,9 +208,6 @@ export const signTemplateProcedure = withoutAuth
           });
           const email = nextDelivery.email;
 
-          const uploader = template.uploader.user;
-          const uploaderName = uploader.name;
-
           await EsignAudit.create(
             {
               action: "document.email.sent",
@@ -215,7 +217,7 @@ export const signTemplateProcedure = withoutAuth
               ip: ctx.requestIp,
               location: "",
               userAgent: ctx.userAgent,
-              summary: `${uploaderName ? uploaderName : ""} sent "${
+              summary: `${sender.name ? sender.name : ""} sent "${
                 template.name
               }" to ${
                 recipient.name ? recipient.name : ""
@@ -227,11 +229,11 @@ export const signTemplateProcedure = withoutAuth
           await new EsignNotificationEmailJob().emit({
             email,
             token,
+            sender,
             message: template.message,
             documentName: template.name,
             recipient: nextDelivery,
             company: template.company,
-            sender: uploader,
           });
         }
       }
@@ -249,6 +251,7 @@ interface TSignPdfOptions
     name: string;
     logo?: string | null;
   };
+  sender: { name: string | null; email: string | null };
   recipients: { name: string | null; email: string }[];
 }
 
@@ -261,7 +264,7 @@ async function signPdf({
   templateName,
   data,
   fields,
-  uploaderName,
+  sender,
   templateId,
   recipients,
   company,
@@ -278,9 +281,9 @@ async function signPdf({
       requestIp,
       templateId,
       templateName,
-      uploaderName,
       userAgent,
       recipients,
+      sender: sender as { email: string; name: string },
       company,
     },
     { singletonKey: `esign-${templateId}`, useSingletonQueue: true },