roles

RocketChat · Sep 6, 2023 · 2cf82c6 · 2cf82c6
1 parent d1da919
commit 2cf82c6
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/apps/meteor/app/authentication/server/startup/index.js b/apps/meteor/app/authentication/server/startup/index.js
@@ -263,10 +263,14 @@ Accounts.onCreateUser(function (...args) {
 
 const { insertUserDoc } = Accounts;
 const insertUserDocAsync = async function (options, user) {
-	const globalRoles = [];
+	let globalRoles = new Set();
+
+	if (Match.test(options.globalRoles, [String]) && options.globalRoles.length > 0) {
+		options.globalRoles.map((role) => globalRoles.add(role));
+	}
 
 	if (Match.test(user.globalRoles, [String]) && user.globalRoles.length > 0) {
-		globalRoles.push(...user.globalRoles);
+		user.globalRoles.map((role) => globalRoles.add(role));
 	}
 
 	delete user.globalRoles;
@@ -275,10 +279,12 @@ const insertUserDocAsync = async function (options, user) {
 		const defaultAuthServiceRoles = parseCSV(settings.get('Accounts_Registration_AuthenticationServices_Default_Roles') || '');
 
 		if (defaultAuthServiceRoles.length > 0) {
-			globalRoles.push(...defaultAuthServiceRoles);
+			defaultAuthServiceRoles.map((role) => globalRoles.add(role));
 		}
 	}
 
+	globalRoles = [...globalRoles];
+
 	const roles = getNewUserRoles(globalRoles);
 
 	if (!user.type) {