added findOne call to retrieve the user, and remove verification whic…

…h didn't allow false values to be saved
RocketChat · Feb 20, 2018 · 19a8ad6 · 19a8ad6
1 parent 5871eb8
commit 19a8ad6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/packages/rocketchat-api/server/v1/users.js b/packages/rocketchat-api/server/v1/users.js
@@ -273,7 +273,7 @@ RocketChat.API.v1.addRoute('users.createToken', { authRequired: true }, {
 
 RocketChat.API.v1.addRoute('users.getPreferences', { authRequired: true }, {
 	get() {
-		const user = this.userId;
+		const user = RocketChat.models.Users.findOneById(this.userId);
 		if (user.settings) {
 			const preferences = user.settings.preferences;
 			preferences['language'] = user.language;

diff --git a/packages/rocketchat-lib/server/functions/saveUser.js b/packages/rocketchat-lib/server/functions/saveUser.js
@@ -165,12 +165,7 @@ RocketChat.saveUser = function(userId, userData) {
 		}
 
 		if (userData.settings) {
-			updateUser.$set.settings = { preferences: {} };
-			for (const key in userData.settings.preferences) {
-				if (userData.settings.preferences[key]) {
-					updateUser.$set.settings.preferences[key] = userData.settings.preferences[key];
-				}
-			}
+			updateUser.$set.settings = { preferences: userData.settings.preferences };
 		}
 
 		if (typeof userData.requirePasswordChange !== 'undefined') {