Skip to content

The Open Source DocuSign Alternative.

Merge branch 'main' into feat/add-runtime-env

Lucas Smith8ebef831acf3
diff --cc packages/lib/server-only/document/resend-document.tsx
index 98d7cb137,1acc684b9..0dbda803e
--- a/packages/lib/server-only/document/resend-document.tsx
+++ b/packages/lib/server-only/document/resend-document.tsx
@@@ -9,11 -16,8 +16,10 @@@ import { prisma } from '@documenso/pris
import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
import type { Prisma } from '@documenso/prisma/client';
- import { RECIPIENT_ROLES_DESCRIPTION } from '../../constants/recipient-roles';
import { getDocumentWhereInput } from './get-document-by-id';
+import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
+
export type ResendDocumentOptions = {
documentId: number;
userId: number;
diff --cc packages/lib/server-only/document/send-completed-email.ts
index c7134d164,3ab62833c..ad8207303
--- a/packages/lib/server-only/document/send-completed-email.ts
+++ b/packages/lib/server-only/document/send-completed-email.ts
@@@ -5,8 -5,10 +5,11 @@@ import { render } from '@documenso/emai
import { DocumentCompletedEmailTemplate } from '@documenso/email/templates/document-completed';
import { prisma } from '@documenso/prisma';
+import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
+ import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
+ import type { RequestMetadata } from '../../universal/extract-request-metadata';
import { getFile } from '../../universal/upload/get-file';
+ import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
export interface SendDocumentOptions {
documentId: number;
@@@ -42,27 -45,46 +46,46 @@@ export const sendCompletedEmail = asyn
const template = createElement(DocumentCompletedEmailTemplate, {
documentName: document.title,
assetBaseUrl,
- downloadLink: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/sign/${token}/complete`,
+ downloadLink: `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${token}/complete`,
});
- await mailer.sendMail({
- to: {
- address: email,
- name,
- },
- from: {
- name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso',
- address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || '[email protected]',
- },
- subject: 'Signing Complete!',
- html: render(template),
- text: render(template, { plainText: true }),
- attachments: [
- {
- filename: document.title,
- content: Buffer.from(buffer),
+ await prisma.$transaction(async (tx) => {
+ await mailer.sendMail({
+ to: {
+ address: email,
+ name,
},
- ],
+ from: {
+ name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso',
+ address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || '[email protected]',
+ },
+ subject: 'Signing Complete!',
+ html: render(template),
+ text: render(template, { plainText: true }),
+ attachments: [
+ {
+ filename: document.title,
+ content: Buffer.from(buffer),
+ },
+ ],
+ });
+
+ await tx.documentAuditLog.create({
+ data: createDocumentAuditLogData({
+ type: DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT,
+ documentId: document.id,
+ user: null,
+ requestMetadata,
+ data: {
+ emailType: 'DOCUMENT_COMPLETED',
+ recipientEmail: recipient.email,
+ recipientName: recipient.name,
+ recipientId: recipient.id,
+ recipientRole: recipient.role,
+ isResending: false,
+ },
+ }),
+ });
});
}),
);