Skip to content

Commit 65c508d

Browse files
committed
fix: resolve conflict with 'enable-multiple-auth-methods'
1 parent 1703530 commit 65c508d

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/service/passport/ldaphelper.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1-
const config = require('../../config').getAuthentication();
21
const thirdpartyApiConfig = require('../../config').getAPIs();
32
const axios = require('axios');
43

54
const isUserInAdGroup = (req, profile, ad, domain, name) => {
65
// determine, via config, if we're using HTTP or AD directly
76
if (thirdpartyApiConfig?.ls?.userInADGroup) {
87
return isUserInAdGroupViaHttp(profile.username, domain, name);
9-
} else if (config.adConfig) {
10-
return isUserInAdGroupViaAD(req, profile, ad, domain, name);
118
} else {
12-
console.error('Unable to check user groups as config is incomplete or unreadable');
9+
return isUserInAdGroupViaAD(req, profile, ad, domain, name);
1310
}
1411
};
1512

1613
const isUserInAdGroupViaAD = (req, profile, ad, domain, name) => {
17-
1814
return new Promise((resolve, reject) => {
1915
ad.isUserMemberOf(profile.username, name, function (err, isMember) {
2016
if (err) {

0 commit comments

Comments
 (0)