Merge branch 'master' into develop

This commit is contained in:
Barış Soner Uşaklı
2024-10-24 19:25:39 -04:00
5 changed files with 73 additions and 10 deletions

View File

@@ -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' : ''}`);