Skip to content

fix: LDAP Sync sending repeated deactivation emails to inactive users #36235

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
kodiakhq merged 6 commits into from
Jun 24, 2025
+12 −4
Merged

fix: LDAP Sync sending repeated deactivation emails to inactive users #36235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
198ad9a
fix: LDAP Sync sending repeated deactivation emails to inactive users
pierre-lehnen-rc Jun 17, 2025
9350313
Merge branch 'develop' into fix/ldap-repeat-deactivation-emails
pierre-lehnen-rc Jun 18, 2025
6df239f
Merge branch 'develop' into fix/ldap-repeat-deactivation-emails
kodiakhq[bot] Jun 20, 2025
06c8fea
Merge branch 'develop' into fix/ldap-repeat-deactivation-emails
kodiakhq[bot] Jun 20, 2025
3c9492f
Merge branch 'develop' into fix/ldap-repeat-deactivation-emails
kodiakhq[bot] Jun 20, 2025
a622fae
Merge branch 'develop' into fix/ldap-repeat-deactivation-emails
kodiakhq[bot] Jun 24, 2025
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
7 changes: 7 additions & 0 deletions .changeset/violet-donuts-warn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@rocket.chat/model-typings': patch
'@rocket.chat/models': patch
'@rocket.chat/meteor': patch
---

Fixes the issue of deactivation emails being sent to users that were removed from AD even if they were not active in the workspace
4 changes: 2 additions & 2 deletions apps/meteor/ee/server/lib/ldap/Manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,14 +620,14 @@ export class LDAPEEManager extends LDAPManager {
if (ldapUser) {
const userData = this.mapUserData(ldapUser, user.username);
converter.addObjectToMemory(userData, { dn: ldapUser.dn, username: this.getLdapUsername(ldapUser) });
} else if (disableMissingUsers) {
} else if (disableMissingUsers && user.active) {
await setUserActiveStatus(user._id, false, true);
}
}
}

private static async disableMissingUsers(foundUsers: IUser['_id'][]): Promise<void> {
const userIds = (await Users.findLDAPUsersExceptIds(foundUsers, { projection: { _id: 1 } }).toArray()).map(({ _id }) => _id);
const userIds = (await Users.findActiveLDAPUsersExceptIds(foundUsers, { projection: { _id: 1 } }).toArray()).map(({ _id }) => _id);

await Promise.allSettled(userIds.map((id) => setUserActiveStatus(id, false, true)));
}
Expand Down
2 changes: 1 addition & 1 deletion packages/model-typings/src/models/IUsersModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export interface IUsersModel extends IBaseModel<IUser> {

findLDAPUsers<T extends Document = IUser>(options?: FindOptions<IUser>): FindCursor<T>;

findLDAPUsersExceptIds<T extends Document = IUser>(userIds: IUser['_id'][], options?: FindOptions<IUser>): FindCursor<T>;
findActiveLDAPUsersExceptIds<T extends Document = IUser>(userIds: IUser['_id'][], options?: FindOptions<IUser>): FindCursor<T>;

findConnectedLDAPUsers<T extends Document = IUser>(options?: FindOptions<IUser>): FindCursor<T>;

Expand Down
3 changes: 2 additions & 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 @@ -504,9 +504,10 @@ export class UsersRaw extends BaseRaw<IUser, DefaultFields<IUser>> implements IU
return this.find<T>(query, options);
}

findLDAPUsersExceptIds<T extends Document = IUser>(userIds: IUser['_id'][], options: FindOptions<IUser> = {}) {
findActiveLDAPUsersExceptIds<T extends Document = IUser>(userIds: IUser['_id'][], options: FindOptions<IUser> = {}) {
const query = {
ldap: true,
active: true,
_id: {
$nin: userIds,
},
Expand Down
Loading