chore: remove federationMatrix calls from CE code

Author: ricardogarim

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

@@ -1,4 +1,4 @@
-import { api, FederationMatrix } from '@rocket.chat/core-services';
+import { api } from '@rocket.chat/core-services';
 import type { IUser, SubscriptionStatus } from '@rocket.chat/core-typings';
 import { isRoomNativeFederated } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
@@ -107,30 +107,26 @@ export const addUsersToRoomMethod = async (userId: string, data: { rid: string;
 
 			const subscription = await Subscriptions.findOneByRoomIdAndUserId(data.rid, newUser._id);
 			if (!subscription) {
-				// no clear and easy way to avoid federation logic here, since we must trigger an invite
-				// and set the status to INVITED when dealing with federated users
 				let inviteOptions: { status?: SubscriptionStatus; inviterUsername?: string } = {};
 				if (isRoomNativeFederated(room) && user && newUser.username) {
-					await FederationMatrix.inviteUsersToRoom(room, [newUser.username], user);
 					inviteOptions = {
 						status: 'INVITED',
 						inviterUsername: user.username,
 					};
 				}
 
 				return addUserToRoom(data.rid, newUser, user, inviteOptions);
-			} else {
-				if (!newUser.username) {
-					return;
-				}
-				void api.broadcast('notify.ephemeralMessage', userId, data.rid, {
-					msg: i18n.t('Username_is_already_in_here', {
-						postProcess: 'sprintf',
-						sprintf: [newUser.username],
-						lng: user?.language,
-					}),
-				});
 			}
+			if (!newUser.username) {
+				return;
+			}
+			void api.broadcast('notify.ephemeralMessage', userId, data.rid, {
+				msg: i18n.t('Username_is_already_in_here', {
+					postProcess: 'sprintf',
+					sprintf: [newUser.username],
+					lng: user?.language,
+				}),
+			});
 		}),
 	);
 

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

@@ -1,11 +1,11 @@
-import { FederationMatrix } from '@rocket.chat/core-services';
+import { FederationMatrix, Authorization, MeteorError } from '@rocket.chat/core-services';
 import { isEditedMessage, type IMessage, type IRoom, type IUser } from '@rocket.chat/core-typings';
 import { Rooms } from '@rocket.chat/models';
 
 import { callbacks } from '../../../../lib/callbacks';
 import { afterLeaveRoomCallback } from '../../../../lib/callbacks/afterLeaveRoomCallback';
 import { afterRemoveFromRoomCallback } from '../../../../lib/callbacks/afterRemoveFromRoomCallback';
-import { beforeAddUsersToRoom } from '../../../../lib/callbacks/beforeAddUserToRoom';
+import { beforeAddUsersToRoom, beforeAddUserToRoom } from '../../../../lib/callbacks/beforeAddUserToRoom';
 import { beforeChangeRoomRole } from '../../../../lib/callbacks/beforeChangeRoomRole';
 import { FederationActions } from '../../../../server/services/room/hooks/BeforeFederationActions';
 
@@ -76,6 +76,23 @@ beforeAddUsersToRoom.add(async ({ usernames }, room) => {
 	}
 });
 
+beforeAddUserToRoom.add(
+	async ({ user, inviter }, room) => {
+		if (!user.username || !inviter) {
+			return;
+		}
+
+		if (FederationActions.shouldPerformFederationAction(room)) {
+			if (!(await Authorization.hasPermission(user._id, 'access-federation'))) {
+				throw new MeteorError('error-not-authorized-federation', 'Not authorized to access federation');
+			}
+			await FederationMatrix.inviteUsersToRoom(room, [user.username], inviter);
+		}
+	},
+	callbacks.priority.MEDIUM,
+	'native-federation-on-before-add-users-to-room',
+);
+
 callbacks.add(
 	'afterSetReaction',
 	async (message: IMessage, params): Promise<void> => {

ee/packages/federation-matrix/src/events/member.ts

@@ -133,6 +133,11 @@ async function handleInvite({
 		throw new Error(`Room not found or could not be created: ${roomId}`);
 	}
 
+	const subscription = await Subscriptions.findOneByRoomIdAndUserId(room._id, inviteeUser._id);
+	if (subscription) {
+		return;
+	}
+
 	await Room.addUserToRoom(room._id, inviteeUser, inviterUser, {
 		status: 'INVITED',
 		inviterUsername: inviterUser.username,