Skip to content

[FIX] Users' roles and type being reset to default on LDAP DataSync #23378

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
sampaiodiego merged 5 commits into from
Oct 6, 2021
Merged

[FIX] Users' roles and type being reset to default on LDAP DataSync #23378

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e5447b
Remove roles field from user data sync update
matheusbsilva137 Oct 5, 2021
9ef4dae
Remove userServices and importIds update on LDAP DataSync
matheusbsilva137 Oct 5, 2021
f9eeedf
Update roles field only if it is specified in the LDAP data
matheusbsilva137 Oct 6, 2021
a9e9935
Merge remote-tracking branch 'origin/develop' into fix/ldap-roles-update
sampaiodiego Oct 6, 2021
2bdb7fb
Send existing user type and roles on LDAP sync
sampaiodiego Oct 6, 2021
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
12 changes: 12 additions & 0 deletions server/lib/ldap/Manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,18 @@ export class LDAPManager {
logger.debug({ msg: 'Syncing user data', ldapUser: _.omit(ldapUser, '_raw'), user: { ...existingUser && { email: existingUser.emails, _id: existingUser._id } } });

const userData = this.mapUserData(ldapUser, usedUsername);

// make sure to persist existing user data when passing to sync/convert
// TODO this is only needed because ImporterDataConverter assigns a default role and type if nothing is set. we might need to figure out a better way and stop doing that there
if (existingUser) {
if (!userData.roles && existingUser.roles) {
userData.roles = existingUser.roles;
}
if (!userData.type && existingUser.type) {
userData.type = existingUser.type as IImportUser['type'];
}
}

const options = this.getConverterOptions();
LDAPDataConverter.convertSingleUser(userData, options);

Expand Down