Skip to content

fix: LDAP users not merging by email during sync #41279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dionisio-bot merged 1 commit into from
Jul 11, 2026
Merged

fix: LDAP users not merging by email during sync #41279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/ldap-merge-email-lookup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/models': patch
'@rocket.chat/meteor': patch
---

Fixes LDAP sync failing to merge an existing user matched by email, which caused a `Username already exists` error when the user's username differed from the directory.
2 changes: 1 addition & 1 deletion packages/models/src/models/Users.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2438,7 +2438,7 @@ export class UsersRaw extends BaseRaw<IUser, DefaultFields<IUser>> implements IU

findOneWithoutLDAPByEmailAddress(emailAddress: string, options?: FindOptions<IUser>) {
const query = {
'email.address': emailAddress.trim().toLowerCase(),
'emails.address': emailAddress.trim().toLowerCase(),
'services.ldap': {
$exists: false,
},
Expand Down
Loading