From a4f1a138d07f6f84ca8021b25b4eb3af3a1beb10 Mon Sep 17 00:00:00 2001 From: Catalin Pit <25515812+catalinpit@users.noreply.github.com> Date: Mon, 17 Feb 2025 15:11:16 +0200 Subject: [PATCH] chore: redo changes --- .../preferences/document-preferences.tsx | 2 + .../trpc/server/document-router/router.ts | 75 +------------------ 2 files changed, 3 insertions(+), 74 deletions(-) diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/settings/preferences/document-preferences.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/settings/preferences/document-preferences.tsx index 839bcdc51..90ba9dc3d 100644 --- a/apps/web/src/app/(teams)/t/[teamUrl]/settings/preferences/document-preferences.tsx +++ b/apps/web/src/app/(teams)/t/[teamUrl]/settings/preferences/document-preferences.tsx @@ -88,6 +88,7 @@ export const TeamDocumentPreferencesForm = ({ includeSenderDetails, includeSigningCertificate, typedSignatureEnabled, + includeAuditTrailLog, } = data; await updateTeamDocumentPreferences({ @@ -98,6 +99,7 @@ export const TeamDocumentPreferencesForm = ({ includeSenderDetails, typedSignatureEnabled, includeSigningCertificate, + includeAuditTrailLog, }, }); diff --git a/packages/trpc/server/document-router/router.ts b/packages/trpc/server/document-router/router.ts index ada909fce..53fc9a8f6 100644 --- a/packages/trpc/server/document-router/router.ts +++ b/packages/trpc/server/document-router/router.ts @@ -1,6 +1,5 @@ import { TRPCError } from '@trpc/server'; import { DateTime } from 'luxon'; -import { PDFDocument } from 'pdf-lib'; import { getServerLimits } from '@documenso/ee/server-only/limits/server'; import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app'; @@ -24,7 +23,6 @@ import { searchDocumentsWithKeyword } from '@documenso/lib/server-only/document/ import { sendDocument } from '@documenso/lib/server-only/document/send-document'; import { updateDocument } from '@documenso/lib/server-only/document/update-document'; import { symmetricEncrypt } from '@documenso/lib/universal/crypto'; -import { getFile } from '@documenso/lib/universal/upload/get-file'; import { getPresignPostUrl } from '@documenso/lib/universal/upload/server-actions'; import { DocumentDataType, DocumentStatus } from '@documenso/prisma/client'; @@ -69,82 +67,11 @@ export const documentRouter = router({ const { teamId } = ctx; const { documentId, includeCertificate, includeAuditLog } = input; - const documentWithData = await getDocumentById({ + return await getDocumentById({ userId: ctx.user.id, teamId, documentId, }); - - if (includeCertificate && includeAuditLog) { - return documentWithData; - } else if (includeCertificate) { - const pdfData = await getFile(documentWithData.documentData); - const pdfDoc = await PDFDocument.load(pdfData); - - const totalPages = pdfDoc.getPageCount(); - - if (!includeAuditLog) { - pdfDoc.removePage(totalPages - 1); - } - - const pdfBytes = await pdfDoc.save(); - const pdfBuffer = Buffer.from(pdfBytes).toString('base64'); - - return { - ...documentWithData, - documentData: { - ...documentWithData.documentData, - data: pdfBuffer, - initialData: documentWithData.documentData.data, - type: DocumentDataType.BYTES_64, - }, - }; - } else if (includeAuditLog) { - const pdfData = await getFile(documentWithData.documentData); - const pdfDoc = await PDFDocument.load(pdfData); - - const totalPages = pdfDoc.getPageCount(); - - if (!includeCertificate) { - pdfDoc.removePage(totalPages - 2); - } - - const pdfBytes = await pdfDoc.save(); - const pdfBuffer = Buffer.from(pdfBytes).toString('base64'); - - return { - ...documentWithData, - documentData: { - ...documentWithData.documentData, - data: pdfBuffer, - initialData: documentWithData.documentData.data, - type: DocumentDataType.BYTES_64, - }, - }; - } else if (!includeCertificate && !includeAuditLog) { - const pdfData = await getFile(documentWithData.documentData); - const pdfDoc = await PDFDocument.load(pdfData); - - const totalPages = pdfDoc.getPageCount(); - - pdfDoc.removePage(totalPages - 1); - pdfDoc.removePage(totalPages - 2); - - const pdfBytes = await pdfDoc.save(); - const pdfBuffer = Buffer.from(pdfBytes).toString('base64'); - - return { - ...documentWithData, - documentData: { - ...documentWithData.documentData, - data: pdfBuffer, - initialData: documentWithData.documentData.data, - type: DocumentDataType.BYTES_64, - }, - }; - } else { - return documentWithData; - } }), /**