Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-04-08 02:52:39 -05:00
Code Issues Activity

Redirect members on token error (#11796)

Browse source 
- This restores the functionality from 3.14 as follows:

/members/ -> (with no route) rendered 404 error
/members/ -> (with route) renders members template
/members/?token=invalidtoken&foo=bar -> redirects to /?foo=bar
/members/?token=validtoken&foo=bar -> redirects to /?foo=bar
This commit is contained in:
Hannah Wolfe 2020-05-07 21:55:50 +01:00 • committed by GitHub
parent 27a5887696
commit 7ee2e56bb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/server/services/members/middleware.js
View file

@ -96,26 +96,28 @@ const createSessionFromMagicLink = async function (req, res, next) {
if (!req.url.includes('token=')) {
return next();
}
// req.query is a plain object, copy it to a URLSearchParams object so we can call toString()
const searchParams = new URLSearchParams('');
Object.keys(req.query).forEach((param) => {
// don't copy the token param
if (param !== 'token') {
searchParams.set(param, req.query[param]);
}
});
// We need to include the subdirectory,
// members is already removed from the path by express because it's a mount path
const redirectPath = `${urlUtils.getSubdir()}${req.path}?${searchParams.toString()}`;
try {
await membersService.ssr.exchangeTokenForSession(req, res);
// req.query is a plain object, copy it to a URLSearchParams object so we can call toString()
const searchParams = new URLSearchParams('');
Object.keys(req.query).forEach((param) => {
// don't copy the token param
if (param !== 'token') {
searchParams.set(param, req.query[param]);
}
});
// We need to include the subdirectory, but members is already removed from the path
let redirectPath = `${urlUtils.getSubdir()}${req.path}?${searchParams.toString()}`;
// Do a standard 302 redirect
res.redirect(redirectPath);
return res.redirect(redirectPath);
} catch (err) {
logging.warn(err.message);
return next();
return res.redirect(redirectPath);
}
};