roles

RocketChat · Sep 6, 2023 · d1da919 · d1da919
1 parent 8ef0b38
commit d1da919
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/apps/meteor/app/lib/server/functions/saveUser.js b/apps/meteor/app/lib/server/functions/saveUser.js
@@ -279,6 +279,7 @@ const saveNewUser = async function (userData, sendPassword) {
 		password: userData.password,
 		joinDefaultChannels: userData.joinDefaultChannels,
 		isGuest,
+		globalRoles: roles,
 	};
 	if (userData.email) {
 		createUser.email = userData.email;
@@ -288,7 +289,6 @@ const saveNewUser = async function (userData, sendPassword) {
 
 	const updateUser = {
 		$set: {
-			roles,
 			...(typeof userData.name !== 'undefined' && { name: userData.name }),
 			settings: userData.settings || {},
 		},

diff --git a/apps/meteor/lib/callbacks.ts b/apps/meteor/lib/callbacks.ts
@@ -20,6 +20,7 @@ import type {
 	InquiryWithAgentInfo,
 	ILivechatTagRecord,
 	TransferData,
+	AtLeast,
 } from '@rocket.chat/core-typings';
 import type { FilterOperators } from 'mongodb';
 
@@ -124,7 +125,7 @@ type ChainedCallbackSignatures = {
 	'livechat.onLoadConfigApi': (config: { room: IOmnichannelRoom }) => Record<string, unknown>;
 
 	'beforeSaveMessage': (message: IMessage, room?: IRoom) => IMessage;
-	'afterCreateUser': (user: IUser) => IUser;
+	'afterCreateUser': (user: AtLeast<IUser, '_id' | 'username' | 'roles'>) => IUser;
 	'afterDeleteRoom': (rid: IRoom['_id']) => IRoom['_id'];
 	'livechat:afterOnHold': (room: Pick<IOmnichannelRoom, '_id'>) => Pick<IOmnichannelRoom, '_id'>;
 	'livechat:afterOnHoldChatResumed': (room: Pick<IOmnichannelRoom, '_id'>) => Pick<IOmnichannelRoom, '_id'>;