mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-07-03 17:08:58 +02:00
feat: merge
This commit is contained in:
@@ -11,6 +11,7 @@ const privileges = require('../privileges');
|
||||
const categories = require('../categories');
|
||||
const plugins = require('../plugins');
|
||||
const meta = require('../meta');
|
||||
const middlewareHelpers = require('../middleware/helpers');
|
||||
|
||||
const helpers = module.exports;
|
||||
|
||||
@@ -124,7 +125,17 @@ helpers.notAllowed = async function (req, res, error) {
|
||||
|
||||
if (req.loggedIn || req.uid === -1) {
|
||||
if (res.locals.isAPI) {
|
||||
helpers.formatApiResponse(403, res, error);
|
||||
if (req.originalUrl.startsWith(`${relative_path}/api/v3`)) {
|
||||
helpers.formatApiResponse(403, res, error);
|
||||
} else {
|
||||
res.status(403).json({
|
||||
path: req.path.replace(/^\/api/, ''),
|
||||
loggedIn: req.loggedIn,
|
||||
error: error,
|
||||
title: '[[global:403.title]]',
|
||||
bodyClass: middlewareHelpers.buildBodyClass(req, res),
|
||||
});
|
||||
}
|
||||
} else {
|
||||
const middleware = require('../middleware');
|
||||
await middleware.buildHeaderAsync(req, res);
|
||||
|
||||
Reference in New Issue
Block a user