Obbey to settings properties (#19020)

RocketChat · Sep 25, 2020 · cb7c05a · cb7c05a
1 parent 6091df3
commit cb7c05a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/app/authorization/server/streamer/permissions/emitter.js b/app/authorization/server/streamer/permissions/emitter.js
@@ -32,7 +32,10 @@ Permissions.on('change', ({ clientAction, id, data, diff }) => {
 		// if the permission changes, the effect on the visible settings depends on the role affected.
 		// The selected-settings-based consumers have to react accordingly and either add or remove the
 		// setting from the user's collection
-		const setting = Settings.findOneById(data.settingId);
+		const setting = Settings.findOneNotHiddenById(data.settingId);
+		if (!setting) {
+			return;
+		}
 		Notifications.notifyLoggedInThisInstance(
 			'private-settings-changed',
 			'updated',

diff --git a/server/publications/settings/emitter.js b/server/publications/settings/emitter.js
@@ -17,6 +17,10 @@ Settings.on('change', ({ clientAction, id, data, diff }) => {
 				properties: setting.properties,
 			};
 
+			if (setting.hidden) {
+				return;
+			}
+
 			if (setting.public === true) {
 				Notifications.notifyAllInThisInstance('public-settings-changed', clientAction, value);
 			}