fix: always redirect to home on login

This commit is contained in:
Mrugesh Mohapatra
2018-05-29 02:54:27 +05:30
parent c0156b41e2
commit 1af24d131e
2 changed files with 2 additions and 13 deletions

View File

@ -193,21 +193,11 @@ module.exports = function enableAuthentication(app) {
// update user and log them in // update user and log them in
.map(user => user.loginByRequest(req, res)) .map(user => user.loginByRequest(req, res))
.do(() => { .do(() => {
let redirectTo = '/';
if (
req.session &&
req.session.returnTo
) {
redirectTo = req.session.returnTo;
}
req.flash( req.flash(
'success', 'success',
'Success! You have signed in to your account. Happy Coding!' 'Success! You have signed in to your account. Happy Coding!'
); );
return res.redirect('/');
return res.redirect(redirectTo);
}) })
.subscribe( .subscribe(
() => {}, () => {},

View File

@ -106,9 +106,8 @@ export default function setupPassport(app) {
// https://stackoverflow.com/q/37430452 // https://stackoverflow.com/q/37430452
let successRedirect = (req) => { let successRedirect = (req) => {
if (!!req && req.session && req.session.returnTo) { if (!!req && req.session && req.session.returnTo) {
let returnTo = req.session.returnTo;
delete req.session.returnTo; delete req.session.returnTo;
return returnTo; return '/';
} }
return config.successRedirect || ''; return config.successRedirect || '';
}; };