regression(federation): fix not able to accept mixed DM invite

Author: sampaiodiego

apps/meteor/server/services/room/service.ts

@@ -36,7 +36,7 @@ import { removeRoomOwner } from '../../methods/removeRoomOwner';
 export class RoomService extends ServiceClassInternal implements IRoomService {
 	protected name = 'room';
 
-	async updateDirectMessageRoomName(room: IRoom): Promise<boolean> {
+	async updateDirectMessageRoomName(room: IRoom, ignoreStatusFromSubs?: string[]): Promise<boolean> {
 		const subs = await Subscriptions.findByRoomId(room._id, { projection: { u: 1, status: 1 } }).toArray();
 
 		const uids = subs.map((sub) => sub.u._id);
@@ -47,7 +47,7 @@ export class RoomService extends ServiceClassInternal implements IRoomService {
 
 		for await (const sub of subs) {
 			// don't update the name if the user is invited but hasn't accepted yet
-			if (sub.status === 'INVITED') {
+			if (!ignoreStatusFromSubs?.includes(sub._id) && sub.status === 'INVITED') {
 				continue;
 			}
 			await Subscriptions.updateOne({ _id: sub._id }, { $set: roomNames[sub.u._id] });

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

@@ -291,13 +291,9 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
 						continue;
 					}
 
-					if (!isUserNativeFederated(member)) {
-						continue;
-					}
-
 					try {
 						await federationSDK.inviteUserToRoom(
-							userIdSchema.parse(member.username),
+							isUserNativeFederated(member) ? userIdSchema.parse(member.username) : `@${member.username}:${this.serverName}`,
 							roomIdSchema.parse(matrixRoomResult.room_id),
 							userIdSchema.parse(actualMatrixUserId),
 						);
@@ -919,8 +915,6 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
 
 		if (action === 'accept') {
 			await federationSDK.acceptInvite(room.federation.mrid, matrixUserId);
-
-			await Room.performAcceptRoomInvite(room, subscription, user);
 		}
 
 		if (action === 'reject') {

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

@@ -215,7 +215,7 @@ async function handleJoin({
 
 	// update room name for DMs
 	if (room.t === 'd') {
-		await Room.updateDirectMessageRoomName(room);
+		await Room.updateDirectMessageRoomName(room, [subscription._id]);
 	}
 
 	if (!subscription.status) {

ee/packages/federation-matrix/tests/end-to-end/dms.spec.ts

@@ -1097,7 +1097,7 @@ const waitForRoomEvent = async (
 					});
 				});
 
-				it.failing('should accept the invitation by the Rocket.Chat user', async () => {
+				it('should accept the invitation by the Rocket.Chat user', async () => {
 					const response = await acceptRoomInvite(rcRoom._id, rcUserConfig2);
 					expect(response.success).toBe(true);
 				});
@@ -1435,7 +1435,7 @@ const waitForRoomEvent = async (
 							});
 						});
 
-						it.failing('should create a federated DM between rcUser1 and rcUser2 and the Synapse user', async () => {
+						it('should create a federated DM between rcUser1 and rcUser2 and the Synapse user', async () => {
 							const fedDmResponse = await rcUser1.config.request
 								.post(api('dm.create'))
 								.set(rcUser1.config.credentials)
@@ -1486,7 +1486,6 @@ const waitForRoomEvent = async (
 								{ delayMs: 100 },
 							);
 
-							// TODO accept not working
 							const response = await acceptRoomInvite(rcRoom._id, rcUser2.config);
 							expect(response.success).toBe(true);
 						});

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

@@ -69,5 +69,5 @@ export interface IRoomService {
 		status?: 'INVITED';
 		roles?: ISubscription['roles'];
 	}): Promise<string | undefined>;
-	updateDirectMessageRoomName(room: IRoom): Promise<boolean>;
+	updateDirectMessageRoomName(room: IRoom, ignoreStatusFromSubs?: string[]): Promise<boolean>;
 }