Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-06 08:37:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

#6903

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-10-31 19:12:33 -04:00
parent 68b7d92b6f
commit 412358b070
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/controllers/index.js
View File

@@ -212,8 +212,9 @@ Controllers.registerInterstitial = function (req, res, next) {
function (data, next) {
if (!data.interstitials.length) {
// No interstitials, redirect to home
const returnTo = req.session.returnTo || req.session.registration.returnTo;
delete req.session.registration;
return res.redirect(nconf.get('relative_path') + '/');
return res.redirect(returnTo || nconf.get('relative_path') + '/');
}
var renders = data.interstitials.map(function (interstitial) {
return async.apply(req.app.render.bind(req.app), interstitial.template, interstitial.data || {});

17
src/routes/authentication.js
View File

@@ -73,17 +73,14 @@ Auth.reloadRoutes = function (router, callback) {
}, function (req, res, next) {
// Trigger registration interstitial checks
req.session.registration = req.session.registration || {};
// save returnTo for later usage in /register/complete
// passport seems to remove `req.session.returnTo` after it redirects
req.session.registration.returnTo = req.session.returnTo;
next();
}, 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);
});
}, 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'),
}));
});
router.post('/register', Auth.middleware.applyCSRF, Auth.middleware.applyBlacklist, controllers.authentication.register);