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,
@@ -93,7 +92,16 @@ export async function createOrUpdateFederatedUser(options: {
 		{
 			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';