skip new user role setting for updates to role via admin panel

RocketChat · Sep 7, 2023 · 8f6c798 · 8f6c798
1 parent 32e0068
commit 8f6c798
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/apps/meteor/app/authentication/server/startup/index.js b/apps/meteor/app/authentication/server/startup/index.js
@@ -285,7 +285,7 @@ const insertUserDocAsync = async function (options, user) {
 
 	globalRoles = [...globalRoles];
 
-	const roles = getNewUserRoles(globalRoles);
+	const roles = options.skipNewUserRolesSetting ? globalRoles : getNewUserRoles(globalRoles);
 
 	if (!user.type) {
 		user.type = 'user';

diff --git a/apps/meteor/app/lib/server/functions/saveUser.js b/apps/meteor/app/lib/server/functions/saveUser.js
@@ -280,6 +280,7 @@ const saveNewUser = async function (userData, sendPassword) {
 		joinDefaultChannels: userData.joinDefaultChannels,
 		isGuest,
 		globalRoles: roles,
+		skipNewUserRolesSetting: true,
 	};
 	if (userData.email) {
 		createUser.email = userData.email;