make addUserToRoom to receive user as object instead of both obj and string

Author: ricardogarim

apps/meteor/app/lib/server/functions/addUserToRoom.ts

@@ -21,7 +21,7 @@ import { notifyOnRoomChangedById, notifyOnSubscriptionChangedById } from '../lib
 
 export const addUserToRoom = async (
 	rid: string,
-	user: Pick<IUser, '_id' | 'username'> | string,
+	user: Pick<IUser, '_id' | 'username'>,
 	inviter?: Pick<IUser, '_id' | 'username'>,
 	{
 		skipSystemMessage,
@@ -42,7 +42,7 @@ export const addUserToRoom = async (
 		});
 	}
 
-	const userToBeAdded = typeof user === 'string' ? await Users.findOneByUsername(user.replace('@', '')) : await Users.findOneById(user._id);
+	const userToBeAdded = await Users.findOneById(user._id);
 	const roomDirectives = roomCoordinator.getRoomDirectives(room.t);
 
 	if (!userToBeAdded) {

apps/meteor/app/lib/server/methods/addUsersToRoom.ts

@@ -94,7 +94,7 @@ export const addUsersToRoomMethod = async (userId: string, data: { rid: string;
 
 			const subscription = await Subscriptions.findOneByRoomIdAndUserId(data.rid, newUser._id);
 			if (!subscription) {
-				await addUserToRoom(data.rid, newUser || username, user);
+				await addUserToRoom(data.rid, newUser);
 			} else {
 				if (!newUser.username) {
 					return;

apps/meteor/lib/callbacks/beforeAddUserToRoom.ts

@@ -1,7 +1,8 @@
-import type { IUser, IRoom } from '@rocket.chat/core-typings';
+import type { IUser, IRoom, AtLeast } from '@rocket.chat/core-typings';
 
 import { Callbacks } from './callbacksBase';
 
-export const beforeAddUserToRoom = Callbacks.create<(args: { user: IUser; inviter?: IUser }, room: IRoom) => void>('beforeAddUserToRoom');
+export const beforeAddUserToRoom =
+	Callbacks.create<(args: { user: AtLeast<IUser, '_id' | 'username'>; inviter?: IUser }, room: IRoom) => void>('beforeAddUserToRoom');
 export const beforeAddUsersToRoom =
 	Callbacks.create<(args: { usernames: string[]; inviter?: IUser }, room: IRoom) => void>('beforeAddUsersToRoom');