review

Author: ggazzo

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

@@ -50,7 +50,7 @@ export const fileTypes: Record<string, FileMessageType> = {
 
 /** helper to validate the username format */
 export function validateFederatedUsername(username: string): username is `@${string}:${string}` {
-	return /^@[a-zA-Z0-9_-]+:[a-zA-Z0-9_-]+$/.test(username);
+	return /^@[a-zA-Z0-9._=-]+:[a-zA-Z0-9.:_-]+$/.test(username);
 }
 
 /**
@@ -62,12 +62,11 @@ export function validateFederatedUsername(username: string): username is `@${str
 export async function createOrUpdateFederatedUser(options: {
 	username: `@${string}:${string}`;
 	name?: string;
-	status?: UserStatus;
 	origin: string;
-}): Promise<{ insertedId: any }> {
-	const { username, name = username, status = UserStatus.OFFLINE, origin } = options;
+}): Promise<string> {
+	const { username, name = username } = options;
 
-	return Users.updateOne(
+	const result = await Users.updateOne(
 		{
 			username,
 		},
@@ -76,7 +75,7 @@ export async function createOrUpdateFederatedUser(options: {
 				username,
 				name,
 				type: 'user' as const,
-				status,
+				status: UserStatus.OFFLINE,
 				active: true,
 				roles: ['user'],
 				requirePasswordChange: false,
@@ -86,14 +85,25 @@ export async function createOrUpdateFederatedUser(options: {
 					mui: username,
 					origin,
 				},
-				createdAt: new Date(),
 				_updatedAt: new Date(),
 			},
+			$setOnInsert: {
+				createdAt: new Date(),
+			},
 		},
 		{
 			upsert: true,
 		},
-	).then((result) => ({ insertedId: result.upsertedId }));
+	);
+
+	const userId = result.upsertedId || (await Users.findOneByUsername(username, { projection: { _id: 1 } }))?._id;
+	if (!userId) {
+		throw new Error(`Failed to create or update federated user: ${username}`);
+	}
+	if (typeof userId !== 'string') {
+		return userId.toString();
+	}
+	return userId;
 }
 
 export { generateEd25519RandomSecretKey } from '@rocket.chat/federation-sdk';

ee/packages/federation-matrix/src/api/_matrix/invite.ts

@@ -1,6 +1,5 @@
 import { Room } from '@rocket.chat/core-services';
 import type { IUser } from '@rocket.chat/core-typings';
-import { UserStatus } from '@rocket.chat/core-typings';
 import type {
 	HomeserverServices,
 	RoomService,
@@ -13,6 +12,8 @@ import { Router } from '@rocket.chat/http-router';
 import { Rooms, Users } from '@rocket.chat/models';
 import { ajv } from '@rocket.chat/rest-typings/dist/v1/Ajv';
 
+import { createOrUpdateFederatedUser } from '../../FederationMatrix';
+
 const EventBaseSchema = {
 	type: 'object',
 	properties: {
@@ -186,19 +187,12 @@ async function joinRoom({
 	// TODO implement on model
 	const senderUser = await Users.findOneByUsername(inviteEvent.sender, { projection: { _id: 1 } });
 
-	let senderUserId = senderUser?._id;
-
-	// create locally
-	if (!senderUser) {
-		const { createOrUpdateFederatedUser } = await import('../../FederationMatrix');
-		const createdUser = await createOrUpdateFederatedUser({
+	const senderUserId =
+		senderUser?._id ||
+		(await createOrUpdateFederatedUser({
 			username: inviteEvent.sender,
-			status: UserStatus.ONLINE,
 			origin: matrixRoom.origin,
-		});
-
-		senderUserId = createdUser.insertedId;
-	}
+		}));
 
 	if (!senderUserId) {
 		throw new Error('Sender user ID not found');