Do not always update the role’s description and mandatory2fa

RocketChat · May 4, 2020 · d630bbe · d630bbe
1 parent d5a6b9f
commit d630bbe
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/app/models/server/models/Roles.js b/app/models/server/models/Roles.js
@@ -30,17 +30,21 @@ export class Roles extends Base {
 	}
 
 	createOrUpdate(name, scope = 'Users', description = '', protectedRole = true, mandatory2fa = false) {
-		const updateData = {
+		const queryData = {
 			name,
 			scope,
-			description,
 			protected: protectedRole,
+		};
+
+		const updateData = {
+			...queryData,
+			description,
 			mandatory2fa,
 		};
 
 		const exists = this.findOne({
 			_id: name,
-			...updateData,
+			...queryData,
 		}, { fields: { _id: 1 } });
 
 		if (exists) {