Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: no relative path needed in req.session.returnTo

Browse Source 
re: julianlam/nodebb-plugin-session-sharing#73
This commit is contained in:
Julian Lam
2019-02-15 16:41:49 -05:00
parent d5ece9a4c3
commit 949b10f132
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/controllers/helpers.js
View File

@@ -136,10 +136,10 @@ helpers.notAllowed = function (req, res, error) {
}); });
} }
} else if (res.locals.isAPI) { } else if (res.locals.isAPI) {
req.session.returnTo = nconf.get('relative_path') + req.url.replace(/^\/api/, ''); req.session.returnTo = req.url.replace(/^\/api/, '');
res.status(401).json('not-authorized'); res.status(401).json('not-authorized');
} else { } else {
req.session.returnTo = nconf.get('relative_path') + req.url; req.session.returnTo = req.url;
res.redirect(nconf.get('relative_path') + '/login'); res.redirect(nconf.get('relative_path') + '/login');
} }
}); });

2
src/middleware/user.js
View File

@@ -229,7 +229,7 @@ module.exports = function (middleware) {
} }
returnTo = returnTo.replace(/^\/api/, ''); returnTo = returnTo.replace(/^\/api/, '');
req.session.returnTo = nconf.get('relative_path') + returnTo; req.session.returnTo = returnTo;
req.session.forceLogin = 1; req.session.forceLogin = 1;
if (res.locals.isAPI) { if (res.locals.isAPI) {
res.status(401).json({}); res.status(401).json({});