Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-13 16:23:06 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: putPdfFile to always include file extension

Browse Source
This commit is contained in:
Mythie
2024-12-02 22:06:53 +11:00
parent 4326e27a2a
commit f27d0f342c
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/lib/jobs/definitions/internal/seal-document.ts
View File

@ -128,7 +128,7 @@ export const SEAL_DOCUMENT_JOB_DEFINITION = {
const pdfData = await getFile(documentData); const pdfData = await getFile(documentData);
const certificateData = const certificateData =
document.team?.teamGlobalSettings?.includeSigningCertificate ?? true (document.team?.teamGlobalSettings?.includeSigningCertificate ?? true)
? await getCertificatePdf({ ? await getCertificatePdf({
documentId, documentId,
language: document.documentMeta?.language, language: document.documentMeta?.language,
@ -167,10 +167,10 @@ export const SEAL_DOCUMENT_JOB_DEFINITION = {
const pdfBytes = await pdfDoc.save(); const pdfBytes = await pdfDoc.save();
const pdfBuffer = await signPdf({ pdf: Buffer.from(pdfBytes) }); const pdfBuffer = await signPdf({ pdf: Buffer.from(pdfBytes) });
const { name, ext } = path.parse(document.title); const { name } = path.parse(document.title);
const documentData = await putPdfFile({ const documentData = await putPdfFile({
name: `${name}_signed${ext}`, name: `${name}_signed.pdf`,
type: 'application/pdf', type: 'application/pdf',
arrayBuffer: async () => Promise.resolve(pdfBuffer), arrayBuffer: async () => Promise.resolve(pdfBuffer),
}); });

6
packages/lib/server-only/document/seal-document.ts
View File

@ -101,7 +101,7 @@ export const sealDocument = async ({
const pdfData = await getFile(documentData); const pdfData = await getFile(documentData);
const certificateData = const certificateData =
document.team?.teamGlobalSettings?.includeSigningCertificate ?? true (document.team?.teamGlobalSettings?.includeSigningCertificate ?? true)
? await getCertificatePdf({ ? await getCertificatePdf({
documentId, documentId,
language: document.documentMeta?.language, language: document.documentMeta?.language,
@ -136,10 +136,10 @@ export const sealDocument = async ({
const pdfBuffer = await signPdf({ pdf: Buffer.from(pdfBytes) }); const pdfBuffer = await signPdf({ pdf: Buffer.from(pdfBytes) });
const { name, ext } = path.parse(document.title); const { name } = path.parse(document.title);
const { data: newData } = await putPdfFile({ const { data: newData } = await putPdfFile({
name: `${name}_signed${ext}`, name: `${name}_signed.pdf`,
type: 'application/pdf', type: 'application/pdf',
arrayBuffer: async () => Promise.resolve(pdfBuffer), arrayBuffer: async () => Promise.resolve(pdfBuffer),
}); });

8
packages/lib/server-only/document/send-document.tsx
View File

@ -114,8 +114,14 @@ export const sendDocument = async ({
formValues: document.formValues as Record<string, string | number | boolean>, formValues: document.formValues as Record<string, string | number | boolean>,
}); });
let fileName = document.title;
if (!document.title.endsWith('.pdf')) {
fileName = `${document.title}.pdf`;
}
const newDocumentData = await putPdfFile({ const newDocumentData = await putPdfFile({
name: document.title, name: fileName,
type: 'application/pdf', type: 'application/pdf',
arrayBuffer: async () => Promise.resolve(prefilled), arrayBuffer: async () => Promise.resolve(prefilled),
}); });

4
packages/lib/universal/upload/put-file.ts
View File

@ -33,6 +33,10 @@ export const putPdfFile = async (file: File) => {
}); });
} }
if (!file.name.endsWith('.pdf')) {
file.name = `${file.name}.pdf`;
}
const { type, data } = await putFile(file); const { type, data } = await putFile(file);
return await createDocumentData({ type, data }); return await createDocumentData({ type, data });