From d389f45818b39e95fb22d3e7d06f7ba061d6f34a Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Tue, 25 Feb 2020 10:58:10 +0100 Subject: Fix broken redirect on login This patch fixes the currently broken redirect on login when people try to access a site they have no access to, they are redirected to the main page to log in. After a successful login they should be redirected to the original note, but instead are redirect to the index page again. This aptch fixes the typo that causes the behavior and brings people back to the note they edited. Thanks to @clvs7-gh on Github[1], who submitted the patch via email. On their behalf I hereby submit the change. [1]: https://github.com/clvs7-gh Note: I had to ajust this patch to work properly. Signed-off-by: Sheogorath --- lib/errors.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/errors.js b/lib/errors.js index f86e8aa3..950b4cae 100644 --- a/lib/errors.js +++ b/lib/errors.js @@ -7,8 +7,10 @@ module.exports = { responseError(res, '403', 'Forbidden', 'oh no.') } else { if (!req.session) req.session = {} - req.session.returnTo = req.originalUrl || config.serverUrl + '/' - req.flash('error', 'You are not allowed to access this page. Maybe try logging in?') + if (req.originalUrl !== '/403') { + req.session.returnTo = config.serverURL + (req.originalUrl || '/') + req.flash('error', 'You are not allowed to access this page. Maybe try logging in?') + } res.redirect(config.serverURL + '/') } }, -- cgit v1.2.3