refactor: remove federation invite specifics from subscription

Author: ricardogarim

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

@@ -29,16 +29,12 @@ export const addUserToRoom = async (
 		createAsHidden = false,
 		status,
 		inviterUsername,
-		federation,
 	}: {
 		skipSystemMessage?: boolean;
 		skipAlertSound?: boolean;
 		createAsHidden?: boolean;
 		status?: SubscriptionStatus;
 		inviterUsername?: string;
-		federation?: {
-			inviteEventId?: string;
-		};
 	} = {},
 ): Promise<boolean | undefined> => {
 	const now = new Date();
@@ -109,7 +105,6 @@ export const addUserToRoom = async (
 		groupMentions: 0,
 		...(status && { status }),
 		...(inviterUsername && { inviterUsername }),
-		...(federation && { federation }),
 		...autoTranslateConfig,
 		...getDefaultSubscriptionPref(userToBeAdded as IUser),
 	});

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

@@ -107,16 +107,13 @@ export const addUsersToRoomMethod = async (userId: string, data: { rid: string;
 
 			const subscription = await Subscriptions.findOneByRoomIdAndUserId(data.rid, newUser._id);
 			if (!subscription) {
-				let inviteOptions: { status?: SubscriptionStatus; inviterUsername?: string; federation?: { inviteEventId?: string } } = {};
+				let inviteOptions: { status?: SubscriptionStatus; inviterUsername?: string } = {};
 
 				if (isRoomNativeFederated(room) && user && newUser.username) {
-					const inviteResult = await FederationMatrix.inviteUsersToRoom(room, [newUser.username], user);
+					await FederationMatrix.inviteUsersToRoom(room, [newUser.username], user);
 					inviteOptions = {
 						status: 'INVITED',
 						inviterUsername: user.username,
-						federation: {
-							inviteEventId: inviteResult[0].event_id,
-						},
 					};
 				}
 

apps/meteor/lib/publishFields.ts

@@ -44,7 +44,6 @@ export const subscriptionFields = {
 	tunreadUser: 1,
 	status: 1,
 	inviterUsername: 1,
-	federation: 1,
 
 	// Omnichannel fields
 	department: 1,

apps/meteor/server/modules/watchers/watchers.module.ts

@@ -139,7 +139,6 @@ export function initWatchers(watcher: DatabaseWatcher, broadcast: BroadcastCallb
 							| 'tunreadUser'
 							| 'status'
 							| 'inviterUsername'
-							| 'federation'
 
 							// Omnichannel fields
 							| 'department'

ee/packages/federation-matrix/src/FederationMatrix.ts

@@ -920,13 +920,15 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
 				'u._id': userId,
 				'status': 'INVITED',
 			},
-			{ projection: { _id: 1, rid: 1, federation: 1 } },
+			{ projection: { _id: 1, rid: 1 } },
 		);
 		if (!subscription) {
 			throw new Error('Subscription not found');
 		}
-		if (!subscription.federation?.inviteEventId) {
-			throw new Error('Invite event ID not found');
+
+		const room = await Rooms.findOneById(subscription.rid);
+		if (!room || !isRoomNativeFederated(room)) {
+			throw new Error('Room not found or not federated');
 		}
 
 		const user = await Users.findOneById(userId);
@@ -942,10 +944,10 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
 		const matrixUserId = isUserNativeFederated(user) ? user.federation.mui : `@${user.username}:${this.serverName}`;
 
 		if (action === 'accept') {
-			await federationSDK.acceptInvite(subscription.federation?.inviteEventId, matrixUserId);
+			await federationSDK.acceptInvite(room.federation.mrid, matrixUserId);
 		}
 		if (action === 'reject') {
-			await federationSDK.rejectInvite(subscription.federation?.inviteEventId, matrixUserId);
+			await federationSDK.rejectInvite(room.federation.mrid, matrixUserId);
 		}
 	}
 }

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

@@ -1,17 +1,14 @@
 import { Room } from '@rocket.chat/core-services';
 import type { Emitter } from '@rocket.chat/emitter';
-import type { HomeserverEventSignatures, UserID, RoomID, PduForType, EventID } from '@rocket.chat/federation-sdk';
+import type { HomeserverEventSignatures, UserID, RoomID, PduForType } from '@rocket.chat/federation-sdk';
 import { Logger } from '@rocket.chat/logger';
 import { Rooms, Subscriptions } from '@rocket.chat/models';
 
 import { getOrCreateFederatedRoom, getOrCreateFederatedUser } from './helpers';
 
 const logger = new Logger('federation-matrix:member');
 
-export async function handleInvite(
-	event: HomeserverEventSignatures['homeserver.matrix.membership']['event'],
-	eventId: EventID,
-): Promise<void> {
+export async function handleInvite(event: HomeserverEventSignatures['homeserver.matrix.membership']['event']): Promise<void> {
 	const { room_id: roomId, sender: senderId, state_key: userId, content } = event;
 
 	const inviterUser = await getOrCreateFederatedUser(senderId as UserID);
@@ -69,7 +66,6 @@ export async function handleInvite(
 	await Room.addUserToRoom(room._id, inviteeUser, inviterUser, {
 		status: 'INVITED',
 		inviterUsername: inviterUser.username,
-		federation: { inviteEventId: eventId },
 	});
 }
 
@@ -117,11 +113,11 @@ async function handleLeave(event: HomeserverEventSignatures['homeserver.matrix.m
 }
 
 export function member(emitter: Emitter<HomeserverEventSignatures>) {
-	emitter.on('homeserver.matrix.membership', async ({ event, event_id: eventId }) => {
+	emitter.on('homeserver.matrix.membership', async ({ event }) => {
 		try {
 			switch (event.content.membership) {
 				case 'invite':
-					await handleInvite(event, eventId);
+					await handleInvite(event);
 					break;
 
 				case 'join':

packages/core-services/src/types/IRoomService.ts

@@ -41,9 +41,6 @@ export interface IRoomService {
 			createAsHidden?: boolean;
 			status?: SubscriptionStatus;
 			inviterUsername?: string;
-			federation?: {
-				inviteEventId?: string;
-			};
 		},
 	): Promise<boolean | undefined>;
 	removeUserFromRoom(roomId: string, user: IUser, options?: { byUser: Pick<IUser, '_id' | 'username'> }): Promise<void>;
@@ -53,9 +50,6 @@ export interface IRoomService {
 		user: Pick<IUser, '_id' | 'username'>,
 		options?: {
 			skipSystemMessage?: boolean;
-			federation?: {
-				inviteEventId?: string;
-			};
 		},
 	): Promise<boolean>;
 	getValidRoomName(displayName: string, roomId?: string, options?: { allowDuplicates?: boolean }): Promise<string>;

packages/core-typings/src/ISubscription.ts

@@ -76,9 +76,6 @@ export interface ISubscription extends IRocketChatRecord {
 
 	status?: SubscriptionStatus;
 	inviterUsername?: string;
-	federation?: {
-		inviteEventId?: string;
-	};
 }
 
 export interface IOmnichannelSubscription extends ISubscription {