[IMPROVE] Adds link to download generated user data file

app/ui-account/client/accountPreferences.js

@@ -244,10 +244,15 @@ Template.accountPreferences.onCreated(function() {
 
 				if (results.exportOperation) {
 					if (results.exportOperation.status === 'completed') {
+						const text = results.url
+							? TAPi18n.__('UserDataDownload_CompletedRequestExistedWithLink_Text', { download_link: results.url })
+							: t('UserDataDownload_CompletedRequestExisted_Text');
+
 						modal.open({
 							title: t('UserDataDownload_Requested'),
-							text: t('UserDataDownload_CompletedRequestExisted_Text'),
+							text,
 							type: 'success',
+							html: true,
 						});
 
 						return true;

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -3084,6 +3084,7 @@
   "UserData_ProcessingFrequency": "Processing Frequency (Minutes)",
   "UserDataDownload": "User Data Download",
   "UserDataDownload_CompletedRequestExisted_Text": "Your data file was already generated. Check your email account for the download link.",
+  "UserDataDownload_CompletedRequestExistedWithLink_Text": "Your data file was already generated. Click <a href=\"__download_link__\" target=\"_blank\">here</a> to download it.",
   "UserDataDownload_EmailBody": "Your data file is now ready to download. Click <a href=\"__download_link__\">here</a> to download it.",
   "UserDataDownload_EmailSubject": "Your Data File is Ready to Download",
   "UserDataDownload_Requested": "Download File Requested",

server/methods/requestDataDownload.js

@@ -3,7 +3,7 @@ import path from 'path';
 
 import { Meteor } from 'meteor/meteor';
 
-import { ExportOperations } from '../../app/models';
+import { ExportOperations, UserDataFiles } from '../../app/models';
 import { settings } from '../../app/settings';
 
 let tempFolder = '/tmp/userData';
@@ -25,9 +25,21 @@ Meteor.methods({
 			yesterday.setUTCDate(yesterday.getUTCDate() - 1);
 
 			if (lastOperation.createdAt > yesterday) {
+				if (lastOperation.status === 'completed') {
+					const lastFile = UserDataFiles.findLastFileByUser(userId);
+					if (lastFile) {
+						return {
+							requested: false,
+							exportOperation: lastOperation,
+							url: lastFile.url,
+						};
+					}
+				}
+
 				return {
 					requested: false,
 					exportOperation: lastOperation,
+					url: null,
 				};
 			}
 		}
@@ -67,6 +79,7 @@ Meteor.methods({
 		return {
 			requested: true,
 			exportOperation,
+			url: null,
 		};
 	},
 });