Skip to content

[FIX] LDAP login on Enteprise Version #17508

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 4 commits into from
May 8, 2020
Merged

[FIX] LDAP login on Enteprise Version #17508

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82308f9
Check if Role Mapping is enabled before trying to validate user roles
pierre-lehnen-rc May 1, 2020
fa60850
Merge branch 'develop' into fix.ldap-enterprise-login-again
pierre-lehnen-rc May 8, 2020
eb13915
Add/Remove Role Mapping login callback when the mapping is enabled/di…
pierre-lehnen-rc May 8, 2020
7b210c2
Remove redundancy
pierre-lehnen-rc May 8, 2020
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
4 changes: 4 additions & 0 deletions ee/app/ldap-enterprise/server/listener.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ import { settings } from '../../../../app/settings';
import { getLdapRolesByUsername, getRocketChatRolesByLdapRoles, updateUserUsingMappedLdapRoles } from './ldapEnterprise';

export const onLdapLogin = ({ user, ldapUser, ldap }) => {
if (!settings.get('LDAP_Enable_LDAP_Roles_To_RC_Roles')) {
return;
}

const validateLdapRolesForEachLogin = settings.get('LDAP_Validate_Roles_For_Each_Login');
const userExists = user._id;
const userId = userExists ? user._id : user.userId;
Expand Down