Regression: Files were been deleted when deleting users as last membe…

…rs of private rooms (#17111)
RocketChat · Mar 31, 2020 · ca85376 · ca85376
1 parent 4a1dedc
commit ca85376
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/file-upload/server/lib/FileUpload.js b/app/file-upload/server/lib/FileUpload.js
@@ -405,6 +405,9 @@ export const FileUpload = {
 	},
 
 	removeFilesByRoomId(rid) {
+		if (typeof rid !== 'string' || rid.trim().length === 0) {
+			return;
+		}
 		Messages.find({
 			rid,
 			'file._id': {

diff --git a/app/lib/server/functions/deleteUser.js b/app/lib/server/functions/deleteUser.js
@@ -101,7 +101,7 @@ export const deleteUser = function(userId) {
 
 			// Remove non-channel rooms with only 1 user (the one being deleted)
 			return roomData.t !== 'c' && roomData.subscribers === 1;
-		}).map(({ _id }) => _id);
+		}).map(({ rid }) => rid);
 
 		Rooms.find1On1ByUserId(user._id, { fields: { _id: 1 } }).forEach(({ _id }) => roomIds.push(_id));