Merge pull request #9850 from RocketChat/allow-unlimited-file-size_fi…

…x-slack-importer [FIX] Importers no longer working due to the FileUpload changes
RocketChat · Feb 26, 2018 · 4cdb12d · 4cdb12d
2 parents a7f05b1 + 1f68b76
commit 4cdb12d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/packages/rocketchat-file-upload/globalFileRestrictions.js b/packages/rocketchat-file-upload/globalFileRestrictions.js
@@ -15,7 +15,7 @@ const slingShotConfig = {
 
 		const maxFileSize = RocketChat.settings.get('FileUpload_MaxFileSize');
 
-		if (maxFileSize && maxFileSize < file.size) {
+		if (maxFileSize >= -1 && maxFileSize < file.size) {
 			throw new Meteor.Error(TAPi18n.__('File_exceeds_allowed_size_of_bytes', { size: filesize(maxFileSize) }));
 		}
 

diff --git a/packages/rocketchat-file-upload/lib/FileUpload.js b/packages/rocketchat-file-upload/lib/FileUpload.js
@@ -30,14 +30,15 @@ FileUpload = {
 			throw new Meteor.Error('error-direct-message-file-upload-not-allowed', reason);
 		}
 
-		if (file.size > maxFileSize) {
+		// -1 maxFileSize means there is no limit
+		if (maxFileSize >= -1 && file.size > maxFileSize) {
 			const reason = TAPi18n.__('File_exceeds_allowed_size_of_bytes', {
 				size: filesize(maxFileSize)
 			}, user.language);
 			throw new Meteor.Error('error-file-too-large', reason);
 		}
 
-		if (parseInt(maxFileSize) > 0) {
+		if (maxFileSize > 0) {
 			if (file.size > maxFileSize) {
 				const reason = TAPi18n.__('File_exceeds_allowed_size_of_bytes', {
 					size: filesize(maxFileSize)
@@ -56,5 +57,9 @@ FileUpload = {
 };
 
 RocketChat.settings.get('FileUpload_MaxFileSize', function(key, value) {
-	maxFileSize = value;
+	try {
+		maxFileSize = parseInt(value);
+	} catch (e) {
+		maxFileSize = RocketChat.models.Settings.findOneById('FileUpload_MaxFileSize').packageValue;
+	}
 });
diff --git a/packages/rocketchat-importer/server/classes/ImporterBase.js b/packages/rocketchat-importer/server/classes/ImporterBase.js
@@ -191,7 +191,7 @@ export class Base {
 				RocketChat.models.Settings.updateValueById('Accounts_AllowUsernameChange', true);
 
 				this.oldSettings.FileUpload_MaxFileSize = RocketChat.models.Settings.findOneById('FileUpload_MaxFileSize').value;
-				RocketChat.models.Settings.updateValueById('FileUpload_MaxFileSize', 0);
+				RocketChat.models.Settings.updateValueById('FileUpload_MaxFileSize', -1);
 				break;
 			case ProgressStep.DONE:
 			case ProgressStep.ERROR: