From 760ab4be210f75faadecb9419c8dd1d2e45de57a Mon Sep 17 00:00:00 2001
From: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Tue, 21 May 2024 08:33:38 -0300
Subject: [PATCH] fix: CAS user merge not working (#32444)

---
 .changeset/cuddly-owls-join.md                    | 5 +++++
 apps/meteor/server/lib/cas/findExistingCASUser.ts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/cuddly-owls-join.md

diff --git a/.changeset/cuddly-owls-join.md b/.changeset/cuddly-owls-join.md
new file mode 100644
index 00000000000..0ace3d145d3
--- /dev/null
+++ b/.changeset/cuddly-owls-join.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed an issue that prevented CAS users from being merged with existing user data on login
diff --git a/apps/meteor/server/lib/cas/findExistingCASUser.ts b/apps/meteor/server/lib/cas/findExistingCASUser.ts
index 60b52965ee6..2c65ab77546 100644
--- a/apps/meteor/server/lib/cas/findExistingCASUser.ts
+++ b/apps/meteor/server/lib/cas/findExistingCASUser.ts
@@ -18,7 +18,7 @@ export const findExistingCASUser = async (username: string): Promise<IUser | und
 	// It'll also allow non-CAS users to switch to CAS based login
 	// #TODO: Remove regex based search
 	const regex = new RegExp(`^${username}$`, 'i');
-	const user = await Users.findOne({ regex });
+	const user = await Users.findOne({ username: regex });
 	if (user) {
 		// Update the user's external_id to reflect this new username.
 		await Users.updateOne({ _id: user._id }, { $set: { 'services.cas.external_id': username } });