summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSheogorath2020-02-25 10:58:10 +0100
committerSheogorath2020-03-21 16:56:09 +0100
commitd389f45818b39e95fb22d3e7d06f7ba061d6f34a (patch)
tree7e7a14fc8c6b2f1ab6f57b11466d4de7f8068dae
parent840109b129647476af8c2cd2575b5911ec16c0dd (diff)
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 <sheogorath@shivering-isles.com>
Diffstat (limited to '')
-rw-r--r--lib/errors.js6
1 files changed, 4 insertions, 2 deletions
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 + '/')
}
},