|
@@ -220,7 +220,12 @@ class PassportService {
|
|
|
bindDN.replace(/{{username}}/, loginForm.username):
|
|
bindDN.replace(/{{username}}/, loginForm.username):
|
|
|
bindDN;
|
|
bindDN;
|
|
|
const fixedBindCredentials = (isUserBind) ? loginForm.password : bindCredentials;
|
|
const fixedBindCredentials = (isUserBind) ? loginForm.password : bindCredentials;
|
|
|
- let serverOpt = { url, bindDN: fixedBindDN, bindCredentials: fixedBindCredentials, searchBase, searchFilter };
|
|
|
|
|
|
|
+ let serverOpt = {
|
|
|
|
|
+ url, bindDN: fixedBindDN, bindCredentials: fixedBindCredentials,
|
|
|
|
|
+ searchBase, searchFilter,
|
|
|
|
|
+ attrMapUsername: this.getLdapAttrNameMappedToUsername(),
|
|
|
|
|
+ attrMapName: this.getLdapAttrNameMappedToName(),
|
|
|
|
|
+ };
|
|
|
|
|
|
|
|
if (groupSearchBase && groupSearchFilter) {
|
|
if (groupSearchBase && groupSearchFilter) {
|
|
|
serverOpt = Object.assign(serverOpt, { groupSearchBase, groupSearchFilter, groupDnProperty });
|
|
serverOpt = Object.assign(serverOpt, { groupSearchBase, groupSearchFilter, groupDnProperty });
|