rename isFederatedUsername to sanitizeUsername

Author: ricardogarim

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

@@ -18,6 +18,15 @@ declare module '@rocket.chat/ddp-client' {
 	}
 }
 
+export const sanitizeUsername = (username: string) => {
+	const isFederatedUsername = username.includes('@') && username.includes(':');
+	if (isFederatedUsername) {
+		return username;
+	}
+	
+	return username.replace(/(^@)|( @)/, '');
+};
+
 export const addUsersToRoomMethod = async (userId: string, data: { rid: string; users: string[] }, user?: IUser): Promise<boolean> => {
 	if (!userId) {
 		throw new Meteor.Error('error-invalid-user', 'Invalid user', {
@@ -79,7 +88,7 @@ export const addUsersToRoomMethod = async (userId: string, data: { rid: string;
 
 	await Promise.all(
 		data.users.map(async (username) => {
-			const newUser = await Users.findOneByUsernameIgnoringCase(username);
+			const newUser = await Users.findOneByUsernameIgnoringCase(sanitizeUsername(username));
 			if (!newUser) {
 				throw new Meteor.Error('error-user-not-found', 'User not found', {
 					method: 'addUsersToRoom',

apps/meteor/app/slashcommands-invite/server/server.ts

@@ -4,14 +4,10 @@ import { Subscriptions, Users } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
 import { i18n } from '../../../server/lib/i18n';
-import { addUsersToRoomMethod } from '../../lib/server/methods/addUsersToRoom';
+import { addUsersToRoomMethod, sanitizeUsername } from '../../lib/server/methods/addUsersToRoom';
 import { settings } from '../../settings/server';
 import { slashCommands } from '../../utils/server/slashCommand';
 
-const isFederatedUsername = (username: string) => {
-	return username.includes('@') && username.includes(':');
-};
-
 /*
  * Invite is a named function that will replace /invite commands
  * @param {Object} message - The message object
@@ -21,7 +17,7 @@ slashCommands.add({
 	callback: async ({ params, message, userId }: SlashCommandCallbackParams<'invite'>): Promise<void> => {
 		const usernames = params
 			.split(/[\s,]/)
-			.map((username) => (isFederatedUsername(username) ? username : username.replace(/(^@)|( @)/, '')))
+			.map((username) => sanitizeUsername(username))
 			.filter((a) => a !== '');
 		if (usernames.length === 0) {
 			return;