public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #436 from njam/fix-build

Browse source 
Fix build
This commit is contained in:
Tomas Bures 2018-06-12 13:10:09 +02:00 • committed by GitHub
commit fc5fc5b09c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/passport.js
View file

@ -127,16 +127,16 @@ if (config.ldap.enabled && LdapStrategy) {
}); });
})); }));
} else if (config.ldapauth.enabled && LdapAuthStrategy) { } else if (config.ldapauth.enabled && LdapAuthStrategy) {
log.info("Using LDAP auth (passport-ldapauth)"); log.info('Using LDAP auth (passport-ldapauth)');
let opts = { let opts = {
server: { server: {
url: 'ldap://' + config.ldap.host + ':' + config.ldap.port, url: 'ldap://' + config.ldap.host + ':' + config.ldap.port,
searchBase: config.ldapauth.baseDN, searchBase: config.ldapauth.baseDN,
searchFilter: config.ldapauth.filter, searchFilter: config.ldapauth.filter,
searchAttributes: [config.ldapauth.uidTag, 'mail'], searchAttributes: [config.ldapauth.uidTag, 'mail'],
bindDN: config.ldapauth.bindUser, bindDN: config.ldapauth.bindUser,
bindCredentials: config.ldapauth.bindPassword bindCredentials: config.ldapauth.bindPassword
}, }
}; };
passport.use(new LdapAuthStrategy(opts, (profile, done) => { passport.use(new LdapAuthStrategy(opts, (profile, done) => {

2
test/e2e/tests/subscription.js
View file

@ -15,7 +15,7 @@ function getPage(listConf) {
} }
function generateEmail() { function generateEmail() {
return 'keep.' + shortid.generate() + '@mailtrain.org'; return 'keep.' + shortid.generate() + '@gmail.com';
} }
function generateCustomFieldValue(field) { function generateCustomFieldValue(field) {