|
@@ -79,7 +79,7 @@ module.exports = function(crowi, app) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
const provider = 'ldap';
|
|
const provider = 'ldap';
|
|
|
- const ldapAccountInfo = await __promisifiedPassportAuthentication(req, res, next, provider);
|
|
|
|
|
|
|
+ const ldapAccountInfo = await promisifiedPassportAuthentication(req, res, next, provider);
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
|
* authentication success
|
|
* authentication success
|
|
@@ -208,7 +208,7 @@ module.exports = function(crowi, app) {
|
|
|
|
|
|
|
|
const loginPassportGoogleCallback = async(req, res, next) => {
|
|
const loginPassportGoogleCallback = async(req, res, next) => {
|
|
|
const provider = 'google';
|
|
const provider = 'google';
|
|
|
- const response = await __promisifiedPassportAuthentication(req, res, next, provider);
|
|
|
|
|
|
|
+ const response = await promisifiedPassportAuthentication(req, res, next, provider);
|
|
|
const userInfo = {
|
|
const userInfo = {
|
|
|
'id': response.id,
|
|
'id': response.id,
|
|
|
'username': response.displayName,
|
|
'username': response.displayName,
|
|
@@ -224,7 +224,7 @@ module.exports = function(crowi, app) {
|
|
|
});
|
|
});
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- const __promisifiedPassportAuthentication = (req, res, next, provider) => {
|
|
|
|
|
|
|
+ const promisifiedPassportAuthentication = (req, res, next, provider) => {
|
|
|
if(provider === 'ldap'){ provider = 'ldapauth' };
|
|
if(provider === 'ldap'){ provider = 'ldapauth' };
|
|
|
return new Promise((resolve, reject) => {
|
|
return new Promise((resolve, reject) => {
|
|
|
passport.authenticate(provider, (err, response, info) => {
|
|
passport.authenticate(provider, (err, response, info) => {
|