From 7ded61f1e756abbc8dab6e2b976d53dc114a5d09 Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Wed, 11 Oct 2023 15:01:24 -0300
Subject: [PATCH] fix: File attachments have no content when exporting room
 messages as file (#30596)

---
 .changeset/lucky-vans-develop.md                      |  5 +++++
 apps/meteor/app/file-upload/server/config/AmazonS3.ts | 11 +++++++----
 .../app/file-upload/server/config/GoogleStorage.ts    | 11 +++++++----
 apps/meteor/app/file-upload/server/config/Webdav.ts   |  4 +++-
 apps/meteor/server/lib/dataExport/sendFile.ts         |  4 +++-
 5 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/lucky-vans-develop.md

diff --git a/.changeset/lucky-vans-develop.md b/.changeset/lucky-vans-develop.md
new file mode 100644
index 0000000000000..e57b7a1e68d54
--- /dev/null
+++ b/.changeset/lucky-vans-develop.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed issue with file attachments in rooms' messages export having no content
diff --git a/apps/meteor/app/file-upload/server/config/AmazonS3.ts b/apps/meteor/app/file-upload/server/config/AmazonS3.ts
index b97ff60d86d6a..567e5e5d71ebf 100644
--- a/apps/meteor/app/file-upload/server/config/AmazonS3.ts
+++ b/apps/meteor/app/file-upload/server/config/AmazonS3.ts
@@ -32,12 +32,15 @@ const get: FileUploadClass['get'] = async function (this: FileUploadClass, file,
 
 const copy: FileUploadClass['copy'] = async function (this: FileUploadClass, file, out) {
 	const fileUrl = await this.store.getRedirectURL(file);
-	if (fileUrl) {
-		const request = /^https:/.test(fileUrl) ? https : http;
-		request.get(fileUrl, (fileRes) => fileRes.pipe(out));
-	} else {
+	if (!fileUrl) {
 		out.end();
+		return;
 	}
+
+	const request = /^https:/.test(fileUrl) ? https : http;
+	return new Promise((resolve) => {
+		request.get(fileUrl, (fileRes) => fileRes.pipe(out).on('finish', () => resolve()));
+	});
 };
 
 const AmazonS3Uploads = new FileUploadClass({
diff --git a/apps/meteor/app/file-upload/server/config/GoogleStorage.ts b/apps/meteor/app/file-upload/server/config/GoogleStorage.ts
index 124bad4365a0d..41eb4350b8768 100644
--- a/apps/meteor/app/file-upload/server/config/GoogleStorage.ts
+++ b/apps/meteor/app/file-upload/server/config/GoogleStorage.ts
@@ -32,12 +32,15 @@ const get: FileUploadClass['get'] = async function (this: FileUploadClass, file,
 const copy: FileUploadClass['copy'] = async function (this: FileUploadClass, file, out) {
 	const fileUrl = await this.store.getRedirectURL(file, false);
 
-	if (fileUrl) {
-		const request = /^https:/.test(fileUrl) ? https : http;
-		request.get(fileUrl, (fileRes) => fileRes.pipe(out));
-	} else {
+	if (!fileUrl) {
 		out.end();
+		return;
 	}
+
+	const request = /^https:/.test(fileUrl) ? https : http;
+	return new Promise((resolve) => {
+		request.get(fileUrl, (fileRes) => fileRes.pipe(out).on('finish', () => resolve()));
+	});
 };
 
 const GoogleCloudStorageUploads = new FileUploadClass({
diff --git a/apps/meteor/app/file-upload/server/config/Webdav.ts b/apps/meteor/app/file-upload/server/config/Webdav.ts
index fb8c1ca82ca46..901c74e9c149e 100644
--- a/apps/meteor/app/file-upload/server/config/Webdav.ts
+++ b/apps/meteor/app/file-upload/server/config/Webdav.ts
@@ -19,7 +19,9 @@ const get: FileUploadClass['get'] = async function (this: FileUploadClass, file,
 };
 
 const copy: FileUploadClass['copy'] = async function (this: FileUploadClass, file, out) {
-	(await this.store.getReadStream(file._id, file)).pipe(out);
+	return new Promise(async (resolve) => {
+		(await this.store.getReadStream(file._id, file)).pipe(out).on('finish', () => resolve());
+	});
 };
 
 const WebdavUploads = new FileUploadClass({
diff --git a/apps/meteor/server/lib/dataExport/sendFile.ts b/apps/meteor/server/lib/dataExport/sendFile.ts
index c4f75bd48bffd..54c691127d9a1 100644
--- a/apps/meteor/server/lib/dataExport/sendFile.ts
+++ b/apps/meteor/server/lib/dataExport/sendFile.ts
@@ -64,9 +64,11 @@ export const sendFile = async (data: ExportFile, user: IUser): Promise<void> =>
 
 	await exportMessages();
 
+	const promises: Promise<void>[] = [];
 	for await (const attachmentData of fullFileList) {
-		await copyFileUpload(attachmentData, assetsPath);
+		promises.push(copyFileUpload(attachmentData, assetsPath));
 	}
+	await Promise.all(promises);
 
 	const exportFile = `${baseDir}-export.zip`;
 	await makeZipFile(exportPath, exportFile);