mirror of
https://github.com/hedgedoc/hedgedoc.git
synced 2024-10-22 15:12:08 -04:00
ef7373f744
We patch passport with the code from https://github .com/jaredhanson/passport/pull/941, which excludes session.returnTo from reset on login. Fixes https://github.com/hedgedoc/hedgedoc/issues/4466 Co-authored-by: Graham White <graham_alton@hotmail.com> Signed-off-by: David Mehren <git@herrmehren.de>
15 lines
628 B
Diff
15 lines
628 B
Diff
diff --git a/lib/sessionmanager.js b/lib/sessionmanager.js
|
|
index 81b59b1d155314e90f3b59a0528d27d71c08e20d..db98d487b720b2d6528ed00b098f373ec636173e 100644
|
|
--- a/lib/sessionmanager.js
|
|
+++ b/lib/sessionmanager.js
|
|
@@ -36,7 +36,9 @@ SessionManager.prototype.logIn = function(req, user, options, cb) {
|
|
}
|
|
if (options.keepSessionInfo) {
|
|
merge(req.session, prevSession);
|
|
- }
|
|
+ } else if (options.successReturnToOrRedirect && prevSession.returnTo) {
|
|
+ req.session.returnTo = prevSession.returnTo;
|
|
+ }
|
|
if (!req.session[self._key]) {
|
|
req.session[self._key] = {};
|
|
}
|