Skip to content

The Open Source DocuSign Alternative.

mailing template and send sign request error handling

Timur Ercan2a1d08e3fdd3
diff --git a/apps/web/pages/api/documents/[id]/send.ts b/apps/web/pages/api/documents/[id]/send.ts
index 42d22a5df..3b84e15b9 100644
--- a/apps/web/pages/api/documents/[id]/send.ts
+++ b/apps/web/pages/api/documents/[id]/send.ts
@@ -42,17 +42,20 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
const recipients = prisma.recipient.findMany({
where: {
documentId: +documentId,
- sendStatus: SendStatus.NOT_SENT, // TODO REDO AFTER DEBUG
+ // sendStatus: SendStatus.NOT_SENT, // TODO REDO AFTER DEBUG
},
});
-
- // todo check if recipient has an account and show them in their inbox or something
(await recipients).forEach(async (recipient) => {
- await sendSigningRequest(recipient, document);
+ await sendSigningRequest(recipient, document)
+ .then(() => {
+ res.status(200).end();
+ })
+ .catch((err) => {
+ return res.status(502).end("Coud not send request for signing.");
+ });
});
- // todo way better error handling
- return res.status(200).end();
+ // todo check if recipient has an account and show them in their inbox or something
}
export default defaultHandler({
diff --git a/packages/lib/mail/index.ts b/packages/lib/mail/index.ts
index 0fe0d7963..5693dfb53 100644
--- a/packages/lib/mail/index.ts
+++ b/packages/lib/mail/index.ts
@@ -1,2 +1,3 @@
export { sendSigningRequest as sendSigningRequest } from "./sendSigningRequest";
export { sendSignedMail } from "./sendSignedMail";
+export { transactionEmailTemplate } from "./transactionEmailTemplate"
\ No newline at end of file
diff --git a/packages/lib/mail/sendMail.ts b/packages/lib/mail/sendMail.ts
index b7d27f2c2..7c32d1a45 100644
--- a/packages/lib/mail/sendMail.ts
+++ b/packages/lib/mail/sendMail.ts
@@ -1,24 +1,23 @@
import nodemailer from "nodemailer";
import nodemailerSendgrid from "nodemailer-sendgrid";
-export const sendMail = async (
- to: string,
- subject: string,
- htmlFormattedMessage: string
-) => {
+export const sendMail = async (to: string, subject: string, body: string) => {
if (!process.env.SENDGRID_API_KEY)
throw new Error("Sendgrid API Key not set.");
- const transport = nodemailer.createTransport(
+ const transport = await nodemailer.createTransport(
nodemailerSendgrid({
apiKey: process.env.SENDGRID_API_KEY || "",
})
);
-
- await transport.sendMail({
- from: process.env.MAIL_FROM,
- to: to,
- subject: subject,
- html: htmlFormattedMessage,
- });
+ await transport
+ .sendMail({
+ from: process.env.MAIL_FROM,
+ to: to,
+ subject: subject,
+ html: body,
+ })
+ .catch((err) => {
+ throw err;
+ });
};
diff --git a/packages/lib/mail/sendSignedMail.ts b/packages/lib/mail/sendSignedMail.ts
index 7fca9a38d..f6798e7b4 100644
--- a/packages/lib/mail/sendSignedMail.ts
+++ b/packages/lib/mail/sendSignedMail.ts
@@ -1,50 +1,20 @@
import { sendMail } from "./sendMail";
import { NEXT_PUBLIC_WEBAPP_URL } from "@documenso/lib/constants";
+import { transactionEmailTemplate } from "@documenso/lib/mail";
export const sendSignedMail = async (recipient: any, document: any) => {
// todo check if recipient has an account
await sendMail(
document.User.email,
`${recipient.email} signed "${document.title}"`,
- `
- <div style="background-color: #eaeaea; padding: 2%;">
- <div style="text-align:center; margin: auto; font-size: 14px; font-color: #353434; max-width: 500px; border-radius: 0.375rem; background: white; padding: 50px">
- <img src="${NEXT_PUBLIC_WEBAPP_URL}/logo_h.png" alt="Documenso Logo" style="width: 180px; display: block; margin: auto; margin-bottom: 14px;
-}">
- ${document.User.name || recipient.email} has signed your document ${
- document.title
- }.
- <p style="margin: 30px;">
- <a href="${NEXT_PUBLIC_WEBAPP_URL}/documents/${
- document.id
- }" style="background-color: #37f095; color: white; border-color: transparent; border-width: 1px; border-radius: 0.375rem; font-size: 18px; padding-left: 16px; padding-right: 16px; padding-top: 10px; padding-bottom: 10px; text-decoration: none; margin-top: 4px; margin-bottom: 4px;">
- View Document
- </a>
- </p>
- <hr size="1" style="height:1px;border:none;color:#e0e0e0;background-color:#e0e0e0">
- Click the button to view ${document.title}.<br>
- <small>If you have questions about this document, your should ask ${
- document.User.name
- }.</small>
- <hr size="1" style="height:1px;border:none;color:#e0e0e0;background-color:#e0e0e0">
- </div>
-
- <div style="text-align: left; line-height: 18px; color: #666666; margin: 24px">
- <div>
- <b>Do not forward.</b>
- <br>
- This email contains a link to a secure document. Keep it secret and do not forward this email.
- </div>
- <div style="margin-top: 12px">
- <b>Need help?</b>
- <br>
- Contact us at <a href="mailto:[email protected]">[email protected]</a>
- </div>
- <hr size="1" style="height: 1px; border: none; color: #D8D8D8; background-color: #D8D8D8">
- <div style="text-align: center">
- <small>Easy and beautiful document signing by Documenso.</small>
- </div>
- </div>
- `
+ transactionEmailTemplate(
+ `${document.User.name || recipient.email} has signed your document ${
+ document.title
+ }`,
+ document,
+ recipient,
+ `${NEXT_PUBLIC_WEBAPP_URL}/documents/${document.id}`,
+ `View Document`
+ )
);
};
diff --git a/packages/lib/mail/sendSigningRequest.ts b/packages/lib/mail/sendSigningRequest.ts
index 3a256f382..4ab257d79 100644
--- a/packages/lib/mail/sendSigningRequest.ts
+++ b/packages/lib/mail/sendSigningRequest.ts
@@ -2,47 +2,24 @@ import prisma from "@documenso/prisma";
import { sendMail } from "./sendMail";
import { SendStatus, DocumentStatus } from "@prisma/client";
import { NEXT_PUBLIC_WEBAPP_URL } from "../constants";
+import { transactionEmailTemplate } from "@documenso/lib/mail";
export const sendSigningRequest = async (recipient: any, document: any) => {
// todo errror handling
await sendMail(
document.User.email,
`Please sign ${document.title}`,
- `
- <div style="background-color: #eaeaea; padding: 2%;">
- <div style="text-align:center; margin: auto; font-size: 14px; font-color: #353434; max-width: 500px; border-radius: 0.375rem; background: white; padding: 50px">
- <img src="${NEXT_PUBLIC_WEBAPP_URL}/logo_h.png" alt="Documenso Logo" style="width: 180px; display: block; margin: auto; margin-bottom: 14px;">
- ${document.User.name} (${document.User.email}) has sent you a document to sign.
- <p style="margin: 30px;">
- <a href="${NEXT_PUBLIC_WEBAPP_URL}/documents/${document.id}/sign?token=${recipient.token}" style="background-color: #37f095; color: white; border-color: transparent; border-width: 1px; border-radius: 0.375rem; font-size: 18px; padding-left: 16px; padding-right: 16px; padding-top: 10px; padding-bottom: 10px; text-decoration: none; margin-top: 4px; margin-bottom: 4px;">
- Sign Document
- </a>
- </p>
- <hr size="1" style="height:1px;border:none;color:#e0e0e0;background-color:#e0e0e0">
- Click the button to view and sign ${document.title}.<br>
- <small>If you have questions about this document, your should ask ${document.User.name}.</small>
- <hr size="1" style="height:1px;border:none;color:#e0e0e0;background-color:#e0e0e0">
- </div>
-
- <div style="text-align: left; line-height: 18px; color: #666666; margin: 24px">
- <div>
- <b>Do not forward.</b>
- <br>
- This email contains a link to a secure document. Keep it secret and do not forward this email.
- </div>
- <div style="margin-top: 12px">
- <b>Need help?</b>
- <br>
- Contact us at <a href="mailto:[email protected]">[email protected]</a>
- </div>
- <hr size="1" style="height: 1px; border: none; color: #D8D8D8; background-color: #D8D8D8">
- <div style="text-align: center">
- <small>Easy and beautiful document signing by Documenso.</small>
- </div>
- </div>
- `
- );
-
+ transactionEmailTemplate(
+ `${document.User.name} (${document.User.email}) has sent you a document to sign. `,
+ document,
+ recipient,
+ `${NEXT_PUBLIC_WEBAPP_URL}/documents/${document.id}/sign?token=${recipient.token}`,
+ `Sign Document`
+ )
+ ).catch((err) => {
+ console.log("catch 1");
+ throw err;
+ });
await prisma.recipient.update({
where: {
id: recipient.id,
diff --git a/packages/lib/mail/transactionEmailTemplate.ts b/packages/lib/mail/transactionEmailTemplate.ts
new file mode 100644
index 000000000..d65a0f750
--- /dev/null
+++ b/packages/lib/mail/transactionEmailTemplate.ts
@@ -0,0 +1,51 @@
+import { NEXT_PUBLIC_WEBAPP_URL } from "../constants";
+import { Document as PrismaDocument } from "@prisma/client";
+
+export const transactionEmailTemplate = (
+ message: string,
+ document: any,
+ recipient: any,
+ ctaLink: string,
+ ctaLabel: string
+) => {
+ const html = `
+ <div style="background-color: #eaeaea; padding: 2%;">
+ <div style="text-align:center; margin: auto; font-size: 14px; font-color: #353434; max-width: 500px; border-radius: 0.375rem; background: white; padding: 50px">
+ <img src="${NEXT_PUBLIC_WEBAPP_URL}/logo_h.png" alt="Documenso Logo" style="width: 180px; display: block; margin: auto; margin-bottom: 14px;">
+ ${message}
+ <p style="margin: 30px;">
+ <a href="${ctaLink}" style="background-color: #37f095; color: white; border-color: transparent; border-width: 1px; border-radius: 0.375rem; font-size: 18px; padding-left: 16px; padding-right: 16px; padding-top: 10px; padding-bottom: 10px; text-decoration: none; margin-top: 4px; margin-bottom: 4px;">
+ ${ctaLabel}
+ </a>
+ </p>
+ <hr size="1" style="height:1px;border:none;color:#e0e0e0;background-color:#e0e0e0">
+ Click the button to view "${document.title}".<br>
+ <small>If you have questions about this document, you should ask ${document.User.name}.</small>
+ <hr size="1" style="height:1px;border:none;color:#e0e0e0;background-color:#e0e0e0">
+ </div>
+ `;
+
+ const footer = `
+ <div style="text-align: left; line-height: 18px; color: #666666; margin: 24px">
+ <div>
+ <b>Do not forward.</b>
+ <br>
+ This email contains a link to a secure document. Keep it secret and do not forward this email.
+ </div>
+ <div style="margin-top: 12px">
+ <b>Need help?</b>
+ <br>
+ Contact us at <a href="mailto:[email protected]">[email protected]</a>
+ </div>
+ <hr size="1" style="height: 1px; border: none; color: #D8D8D8; background-color: #D8D8D8">
+ <div style="text-align: center">
+ <small>Easy and beautiful document signing by Documenso.</small>
+ </div>
+ </div>
+ </div>
+ `;
+
+ return html + footer;
+};
+
+export default transactionEmailTemplate;