Moved redirect query param check to middleware

This commit is contained in:
Jonathan Barrow 2022-07-10 10:30:40 -04:00
parent 13c8c24efe
commit 9e99627839
2 changed files with 4 additions and 9 deletions

View File

@ -3,6 +3,10 @@ async function redirectMiddleware(request, response, next) {
request.redirect = request.body.redirect?.startsWith('/') ? request.body.redirect : null;
}
if (request.query.redirect) {
response.locals.redirect = request.query.redirect?.startsWith('/') ? request.query.redirect : null;
}
return next();
}

View File

@ -207,8 +207,6 @@ router.get('/login', async (request, response) => {
error: request.cookies.error
};
renderData.redirect = request.query.redirect;
response.clearCookie('error', { domain: '.pretendo.network' });
response.render('account/login', renderData);
@ -267,13 +265,6 @@ router.get('/register', async (request, response) => {
response.clearCookie('username', { domain: '.pretendo.network' });
response.clearCookie('mii_name', { domain: '.pretendo.network' });
let redirect = request.query.redirect;
if (!redirect.startsWith('/')) {
redirect = null;
}
renderData.redirect = redirect;
response.render('account/register', renderData);
});