gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6250 from bugron/fix/incorrect-redirection

Browse Source 
Fixes incorrect redirection to map-aside
This commit is contained in:
Rex Schrader
2016-01-17 09:55:33 -08:00
parent df429fb2b4 a5bde55f6e
commit 62c8b59fd7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/models/user.js
View File

@ -178,7 +178,11 @@ module.exports = function(User) {
debug('user logged in'); debug('user logged in');
if (req.session && req.session.returnTo) { if (req.session && req.session.returnTo) {
return res.redirect(req.session.returnTo); var redirectTo = req.session.returnTo;
if (redirectTo === '/map-aside') {
redirectTo = '/map';
}
return res.redirect(redirectTo);
} }
req.flash('success', { msg: 'Success! You are logged in.' }); req.flash('success', { msg: 'Success! You are logged in.' });

3
server/middlewares/add-return-to.js
View File

@ -36,7 +36,8 @@ export default function addReturnToUrl() {
) { ) {
return next(); return next();
} }
req.session.returnTo = req.originalUrl; req.session.returnTo = req.originalUrl === '/map-aside'
? '/map' : req.originalUrl;
next(); next();
}; };
} }