fix: replyTo and email from name

Author: dahal

src/jobs/auth-verification-email.ts

@@ -15,11 +15,8 @@ export const sendAuthVerificationEmail = async (
 ) => {
   const { email, token } = payload;
   const baseUrl = env.NEXT_PUBLIC_BASE_URL;
-
   const confirmLink = `${baseUrl}/verify-email/${token}`;
 
-  console.log("Sending email to ", email, "with link ", confirmLink);
-
   const html = await render(
     AccountVerificationEmail({
       verifyLink: confirmLink,

src/jobs/esign-confirmation-email.ts

@@ -8,6 +8,7 @@ export type ConfirmationEmailPayloadType = {
   fileUrl: string;
   documentName: string;
   senderName: string | null;
+  senderEmail: string | null;
   company: {
     name: string;
     logo?: string | null;
@@ -23,11 +24,13 @@ export const sendEsignConfirmationEmail = async (
       documentName: payload.documentName,
       recipient: payload.recipient,
       senderName: payload.senderName,
+      senderEmail: payload.senderEmail,
       company: payload.company,
     }),
   );
   await sendMail({
     to: payload.recipient.email,
+    ...(payload.senderEmail && { replyTo: payload.senderEmail }),
     subject: "Completed e-signed documents from all parties",
     html,
     attachments: [
@@ -36,6 +39,10 @@ export const sendEsignConfirmationEmail = async (
         path: payload.fileUrl,
       },
     ],
+
+    headers: {
+      "X-From-Name": payload.senderName || "Captable",
+    },
   });
 };
 

src/jobs/esign-email.ts

@@ -33,7 +33,7 @@ export type ExtendedEsignPayloadType = EsignEmailPayloadType &
   AdditionalPayloadType;
 
 export const sendEsignEmail = async (payload: ExtendedEsignPayloadType) => {
-  const { email, token, ...rest } = payload;
+  const { email, token, sender, ...rest } = payload;
   const baseUrl = env.NEXT_PUBLIC_BASE_URL;
   const html = await render(
     EsignEmail({
@@ -43,8 +43,12 @@ export const sendEsignEmail = async (payload: ExtendedEsignPayloadType) => {
   );
   await sendMail({
     to: email,
-    subject: "eSign Link",
+    ...(sender?.email && { replyTo: sender.email }),
+    subject: "eSign Document Request",
     html,
+    headers: {
+      "X-From-Name": sender?.name || "Captable",
+    },
   });
 };
 

src/jobs/share-data-room-email.ts

@@ -39,6 +39,10 @@ export const sendShareDataRoomEmail = async (
         link,
       }),
     ),
+
+    headers: {
+      "X-From-Name": senderName,
+    },
   });
 };
 

src/jobs/share-update-email.ts

@@ -39,6 +39,10 @@ export const sendShareUpdateEmail = async (payload: UpdateSharePayloadType) => {
         link,
       }),
     ),
+
+    headers: {
+      "X-From-Name": senderName,
+    },
   });
 };
 

src/server/mailer.ts

@@ -12,10 +12,21 @@ const getTransport = () => {
   });
 };
 
+type RecordType = Record<string, string | undefined>;
+
 export const sendMail = (options: Omit<SendMailOptions, "from">) => {
+  let from = `Captable <${env.EMAIL_FROM}>`;
+  const headers = (options.headers || {}) as RecordType;
+
+  const senderName = headers["X-From-Name"];
+
+  if (senderName) {
+    from = `${senderName} <${env.EMAIL_FROM}>`;
+  }
+
   const transport = getTransport();
   return transport.sendMail({
-    from: env.EMAIL_FROM,
+    from,
     ...options,
   });
 };

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

@@ -203,7 +203,8 @@ export const signTemplateProcedure = withoutAuth
           });
           const email = nextDelivery.email;
 
-          const uploaderName = template.uploader.user.name;
+          const uploader = template.uploader.user;
+          const uploaderName = uploader.name;
 
           await EsignAudit.create(
             {
@@ -230,7 +231,7 @@ export const signTemplateProcedure = withoutAuth
             documentName: template.name,
             recipient: nextDelivery,
             company: template.company,
-            sender: template.uploader.user,
+            sender: uploader,
           });
         }
       }