mirror of
https://github.com/node-red/node-red.git
synced 2023-10-10 13:36:53 +02:00
Give passport verfiy callback wrapper the same arity as the original callback passed in via options
This commit is contained in:
parent
34cb93794c
commit
630d2ca926
@ -173,27 +173,30 @@ function genericStrategy(adminApp,strategy) {
|
|||||||
adminApp.use(passport.session());
|
adminApp.use(passport.session());
|
||||||
|
|
||||||
var options = strategy.options;
|
var options = strategy.options;
|
||||||
|
var verify = function() {
|
||||||
|
var originalDone = arguments[arguments.length-1];
|
||||||
|
if (options.verify) {
|
||||||
|
var args = Array.from(arguments);
|
||||||
|
args[args.length-1] = function(err,profile) {
|
||||||
|
if (err) {
|
||||||
|
return originalDone(err);
|
||||||
|
} else {
|
||||||
|
return completeVerify(profile,originalDone);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
passport.use(new strategy.strategy(options,
|
options.verify.apply(null,args);
|
||||||
function() {
|
} else {
|
||||||
var originalDone = arguments[arguments.length-1];
|
var profile = arguments[arguments.length - 2];
|
||||||
if (options.verify) {
|
return completeVerify(profile,originalDone);
|
||||||
var args = Array.from(arguments);
|
|
||||||
args[args.length-1] = function(err,profile) {
|
|
||||||
if (err) {
|
|
||||||
return originalDone(err);
|
|
||||||
} else {
|
|
||||||
return completeVerify(profile,originalDone);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
options.verify.apply(null,args);
|
|
||||||
} else {
|
|
||||||
var profile = arguments[arguments.length - 2];
|
|
||||||
return completeVerify(profile,originalDone);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
));
|
};
|
||||||
|
// Give our callback the same arity as the original one from options
|
||||||
|
if (options.verify) {
|
||||||
|
Object.defineProperty(verify, "length", { value: options.verify.length })
|
||||||
|
}
|
||||||
|
|
||||||
|
passport.use(new strategy.strategy(options, verify));
|
||||||
|
|
||||||
adminApp.get('/auth/strategy',
|
adminApp.get('/auth/strategy',
|
||||||
passport.authenticate(strategy.name, {session:false, failureRedirect: settings.httpAdminRoot }),
|
passport.authenticate(strategy.name, {session:false, failureRedirect: settings.httpAdminRoot }),
|
||||||
|
Loading…
Reference in New Issue
Block a user