Add verification to make sure the user exists in REST insert object h…

…elper (#11008) Add verification to make sure the user exists in REST insert object helper
RocketChat · Jun 20, 2018 · f33c6b5 · f33c6b5
1 parent c53fa4d
commit f33c6b5
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/packages/rocketchat-api/server/helpers/insertUserObject.js b/packages/rocketchat-api/server/helpers/insertUserObject.js
@@ -1,11 +1,14 @@
 RocketChat.API.helperMethods.set('insertUserObject', function _addUserToObject({ object, userId }) {
-	const { username, name } = RocketChat.models.Users.findOneById(userId);
+	const user = RocketChat.models.Users.findOneById(userId);
+	object.user = { };
+	if (user) {
+		object.user = {
+			_id: userId,
+			username: user.username,
+			name: user.name
+		};
+	}
 
-	object.user = {
-		_id: userId,
-		username,
-		name
-	};
 
 	return object;
 });