regression(federation): Old federation users (#37102)

Co-authored-by: Diego Sampaio <chinello@gmail.com>

Author: ggazzo

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

@@ -71,9 +71,7 @@ export async function createDirectRoom(
 
 	await callbacks.run('beforeCreateDirectRoom', membersUsernames, roomExtraData);
 
-	const roomMembers: IUser[] = await Users.findUsersByUsernames(membersUsernames, {
-		projection: { _id: 1, name: 1, username: 1, settings: 1, customFields: 1 },
-	}).toArray();
+	const roomMembers = await Users.findUsersByUsernames(membersUsernames).toArray();
 	// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 	const sortedMembers = roomMembers.sort((u1, u2) => (u1.name! || u1.username!).localeCompare(u2.name! || u2.username!));
 

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

@@ -1,12 +1,10 @@
 import { api } from '@rocket.chat/core-services';
 import type { IUser } from '@rocket.chat/core-typings';
-import { isRoomFederated } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Subscriptions, Users, Rooms } from '@rocket.chat/models';
 import { Match } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
-import { callbacks } from '../../../../lib/callbacks';
 import { i18n } from '../../../../server/lib/i18n';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { addUserToRoom } from '../functions/addUserToRoom';
@@ -79,12 +77,6 @@ export const addUsersToRoomMethod = async (userId: string, data: { rid: string;
 		});
 	}
 
-	// Validate each user, then add to room
-	if (isRoomFederated(room)) {
-		await callbacks.run('federation.onAddUsersToRoom', { invitees: data.users, inviter: user }, room);
-		return true;
-	}
-
 	await Promise.all(
 		data.users.map(async (username) => {
 			const newUser = await Users.findOneByUsernameIgnoringCase(username);

apps/meteor/ee/server/hooks/federation/index.ts

@@ -70,21 +70,6 @@ callbacks.add(
 	'native-federation-after-delete-message',
 );
 
-callbacks.add(
-	'federation.onAddUsersToRoom',
-	async ({ invitees, inviter }, room) => {
-		if (FederationActions.shouldPerformFederationAction(room)) {
-			await FederationMatrix.inviteUsersToRoom(
-				room,
-				invitees.map((invitee) => (typeof invitee === 'string' ? invitee : invitee.username)).filter((v) => v != null),
-				inviter,
-			);
-		}
-	},
-	callbacks.priority.MEDIUM,
-	'native-federation-on-add-users-to-room ',
-);
-
 beforeAddUserToRoom.add(
 	async ({ user, inviter }, room) => {
 		if (!user.username || !inviter) {

apps/meteor/lib/callbacks.ts

@@ -11,7 +11,6 @@ import type {
 	VideoConference,
 	OEmbedMeta,
 	OEmbedUrlContent,
-	Username,
 	IOmnichannelRoom,
 	ILivechatTag,
 	ILivechatTagRecord,
@@ -85,7 +84,6 @@ interface EventLikeCallbackSignatures {
 		message: IMessage,
 		params: { user: IUser; reaction: string; shouldReact: boolean; oldMessage: IMessage; room: IRoom },
 	) => void;
-	'federation.onAddUsersToRoom': (params: { invitees: IUser[] | Username[]; inviter: IUser }, room: IRoom) => void;
 	'onJoinVideoConference': (callId: VideoConference['_id'], userId?: IUser['_id']) => Promise<void>;
 	'usernameSet': () => void;
 	'beforeJoinRoom': (user: IUser, room: IRoom) => void;

apps/meteor/server/methods/addRoomModerator.ts

@@ -24,7 +24,7 @@ export const addRoomModerator = async (fromUserId: IUser['_id'], rid: IRoom['_id
 	check(rid, String);
 	check(userId, String);
 
-	const room = await Rooms.findOneById(rid, { projection: { t: 1, federated: 1 } });
+	const room = await Rooms.findOneById(rid, { projection: { t: 1, federated: 1, federation: 1 } });
 	if (!room) {
 		throw new Meteor.Error('error-invalid-room', 'Invalid room', {
 			method: 'addRoomModerator',

apps/meteor/server/methods/addRoomOwner.ts

@@ -24,7 +24,7 @@ export const addRoomOwner = async (fromUserId: IUser['_id'], rid: IRoom['_id'],
 	check(rid, String);
 	check(userId, String);
 
-	const room = await Rooms.findOneById(rid, { projection: { t: 1, federated: 1 } });
+	const room = await Rooms.findOneById(rid, { projection: { t: 1, federated: 1, federation: 1 } });
 	if (!room) {
 		throw new Meteor.Error('error-invalid-room', 'Invalid room', {
 			method: 'addRoomOwner',

apps/meteor/server/methods/removeRoomModerator.ts

@@ -23,7 +23,7 @@ export const removeRoomModerator = async (fromUserId: IUser['_id'], rid: IRoom['
 	check(rid, String);
 	check(userId, String);
 
-	const room = await Rooms.findOneById(rid, { projection: { t: 1, federated: 1 } });
+	const room = await Rooms.findOneById(rid, { projection: { t: 1, federated: 1, federation: 1 } });
 	if (!room) {
 		throw new Meteor.Error('error-invalid-room', 'Invalid room', {
 			method: 'removeRoomModerator',

apps/meteor/server/methods/removeRoomOwner.ts

@@ -22,7 +22,7 @@ export const removeRoomOwner = async (fromUserId: string, rid: string, userId: s
 	check(rid, String);
 	check(userId, String);
 
-	const room = await Rooms.findOneById(rid, { projection: { t: 1, federated: 1 } });
+	const room = await Rooms.findOneById(rid, { projection: { t: 1, federated: 1, federation: 1 } });
 	if (!room) {
 		throw new Meteor.Error('error-invalid-room', 'Invalid room', {
 			method: 'removeRoomOwner',

apps/meteor/tests/end-to-end/api/livechat/14-units.ts

@@ -635,8 +635,8 @@ import { IS_EE } from '../../../e2e/config/constants';
 			expect(updatedUnit).to.have.property('numDepartments', 1);
 
 			const fullDepartment = await getDepartmentById(department._id);
-			expect(fullDepartment).to.have.property('parentId').that.is.null;
-			expect(fullDepartment).to.have.property('ancestors').that.is.null;
+			expect(fullDepartment).to.not.have.property('parentId');
+			expect(fullDepartment).to.not.have.property('ancestors');
 		});
 
 		it('should fail adding a department into an existing unit that a monitor does not supervise', async () => {
@@ -658,8 +658,8 @@ import { IS_EE } from '../../../e2e/config/constants';
 			expect(updatedUnit).to.have.property('numDepartments', 1);
 
 			const fullDepartment = await getDepartmentById(department._id);
-			expect(fullDepartment).to.have.property('parentId').that.is.null;
-			expect(fullDepartment).to.have.property('ancestors').that.is.null;
+			expect(fullDepartment).to.not.have.property('parentId');
+			expect(fullDepartment).to.not.have.property('ancestors');
 		});
 
 		it('should succesfully add a department into an existing unit that a monitor supervises', async () => {
@@ -732,8 +732,8 @@ import { IS_EE } from '../../../e2e/config/constants';
 
 			const fullDepartment = await getDepartmentById(department._id);
 			expect(fullDepartment).to.have.property('name', updatedName);
-			expect(fullDepartment).to.have.property('parentId').that.is.null;
-			expect(fullDepartment).to.have.property('ancestors').that.is.null;
+			expect(fullDepartment).to.not.have.property('parentId');
+			expect(fullDepartment).to.not.have.property('ancestors');
 		});
 	});
 
@@ -872,8 +872,8 @@ import { IS_EE } from '../../../e2e/config/constants';
 			expect(updatedUnit).to.have.property('numDepartments', 1);
 
 			const fullDepartment = await getDepartmentById(testDepartmentId);
-			expect(fullDepartment).to.have.property('parentId').that.is.null;
-			expect(fullDepartment).to.have.property('ancestors').that.is.null;
+			expect(fullDepartment).to.not.have.property('parentId');
+			expect(fullDepartment).to.not.have.property('ancestors');
 		});
 
 		it('should succesfully add an existing department to a unit as an admin', async () => {
@@ -904,8 +904,8 @@ import { IS_EE } from '../../../e2e/config/constants';
 			expect(updatedUnit).to.have.property('numDepartments', 1);
 
 			const fullDepartment = await getDepartmentById(testDepartmentId);
-			expect(fullDepartment).to.have.property('parentId').that.is.null;
-			expect(fullDepartment).to.have.property('ancestors').that.is.null;
+			expect(fullDepartment).to.not.have.property('parentId');
+			expect(fullDepartment).to.not.have.property('ancestors');
 		});
 
 		it('should succesfully add an existing department to a unit that a monitor supervises', async () => {