From 67d3b29204cf0b39458a6fcbac0ebdc6eaf4c2fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 31 Oct 2018 16:22:40 -0400 Subject: [PATCH] #6903 --- src/routes/authentication.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/routes/authentication.js b/src/routes/authentication.js index a958bac97b..a15c074806 100644 --- a/src/routes/authentication.js +++ b/src/routes/authentication.js @@ -74,10 +74,16 @@ Auth.reloadRoutes = function (router, callback) { // Trigger registration interstitial checks req.session.registration = req.session.registration || {}; next(); - }, passport.authenticate(strategy.name, { - successReturnToOrRedirect: nconf.get('relative_path') + (strategy.successUrl !== undefined ? strategy.successUrl : '/'), - failureRedirect: nconf.get('relative_path') + (strategy.failureUrl !== undefined ? strategy.failureUrl : '/login'), - })); + }, function (req, res, next) { + let successReturnToOrRedirect = nconf.get('relative_path') + (strategy.successUrl !== undefined ? strategy.successUrl : '/'); + if (req.session && req.session.returnTo) { + successReturnToOrRedirect = req.session.returnTo; + } + passport.authenticate(strategy.name, { + successReturnToOrRedirect: successReturnToOrRedirect, + failureRedirect: nconf.get('relative_path') + (strategy.failureUrl !== undefined ? strategy.failureUrl : '/login'), + })(req, res, next); + }); }); router.post('/register', Auth.middleware.applyCSRF, Auth.middleware.applyBlacklist, controllers.authentication.register);