From bcac6d749d6dcc1f8d5caa56754bfeae9c8c46c8 Mon Sep 17 00:00:00 2001
From: Pierre Lehnen <pierre.lehnen@rocket.chat>
Date: Wed, 23 Oct 2019 14:19:11 -0300
Subject: [PATCH] Fixed issue with userData on old export operations

---
 app/user-data-download/server/cronProcessDownloads.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/user-data-download/server/cronProcessDownloads.js b/app/user-data-download/server/cronProcessDownloads.js
index 29742b758850..8e2cf7a03724 100644
--- a/app/user-data-download/server/cronProcessDownloads.js
+++ b/app/user-data-download/server/cronProcessDownloads.js
@@ -136,7 +136,7 @@ const hideUserName = function(username, exportOperation) {
 	}
 
 	if (!exportOperation.userNameTable[username]) {
-		if (username === exportOperation.userData.username) {
+		if (exportOperation.userData && username === exportOperation.userData.username) {
 			exportOperation.userNameTable[username] = username;
 		} else {
 			exportOperation.userNameTable[username] = `User_${ (Object.keys(exportOperation.userNameTable).length + 1) }`;
@@ -474,6 +474,10 @@ const generateUserFile = function(exportOperation) {
 };
 
 const generateUserAvatarFile = function(exportOperation) {
+	if (!exportOperation.userData) {
+		return;
+	}
+
 	const file = Avatars.findOneByName(exportOperation.userData.username);
 	if (!file) {
 		return;