mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-05-07 14:16:25 +02:00
Merge branch 'master' into develop
This commit is contained in:
@@ -133,7 +133,7 @@ helpers.notAllowed = async function (req, res, error) {
|
||||
if (req.loggedIn || req.uid === -1) {
|
||||
if (res.locals.isAPI) {
|
||||
if (req.originalUrl.startsWith(`${relative_path}/api/v3`)) {
|
||||
helpers.formatApiResponse(403, res, error);
|
||||
await helpers.formatApiResponse(403, res, error);
|
||||
} else {
|
||||
res.status(403).json({
|
||||
path: req.path.replace(/^\/api/, ''),
|
||||
@@ -155,7 +155,7 @@ helpers.notAllowed = async function (req, res, error) {
|
||||
}
|
||||
} else if (res.locals.isAPI) {
|
||||
req.session.returnTo = req.url.replace(/^\/api/, '');
|
||||
helpers.formatApiResponse(401, res, error);
|
||||
await helpers.formatApiResponse(401, res, error);
|
||||
} else {
|
||||
req.session.returnTo = req.url;
|
||||
res.redirect(`${relative_path}/login${req.path.startsWith('/admin') ? '?local=1' : ''}`);
|
||||
|
||||
Reference in New Issue
Block a user