diff --git a/packages/server/src/controllers/FilesController/index.js b/packages/server/src/controllers/FilesController/index.js index f40af947..515d7df2 100644 --- a/packages/server/src/controllers/FilesController/index.js +++ b/packages/server/src/controllers/FilesController/index.js @@ -8,7 +8,7 @@ function resolveToUrl(filepath) { } export default class FilesController extends ComplexController { - static refName = "FilesController" + static disabled = true get = { "/uploads/:id": { diff --git a/packages/server/src/controllers/RolesController/index.js b/packages/server/src/controllers/RolesController/index.js index d00dbed7..2bb35f79 100644 --- a/packages/server/src/controllers/RolesController/index.js +++ b/packages/server/src/controllers/RolesController/index.js @@ -61,11 +61,11 @@ export default class RolesController extends ComplexController { }, async (req, res) => { // check if issuer user is admin if (!req.isAdmin()) { - return res.status(403).send("You do not have administrator permission") + return res.status(403).json("You do not have administrator permission") } if (!Array.isArray(req.selection.update)) { - return res.status(400).send("Invalid update request") + return res.status(400).json("Invalid update request") } req.selection.update.forEach(async (update) => { @@ -82,7 +82,7 @@ export default class RolesController extends ComplexController { } }) - return res.send("done") + return res.json("done") }), }, } diff --git a/packages/server/src/controllers/SessionController/index.js b/packages/server/src/controllers/SessionController/index.js index 7cfee5b0..46560671 100644 --- a/packages/server/src/controllers/SessionController/index.js +++ b/packages/server/src/controllers/SessionController/index.js @@ -75,18 +75,18 @@ export default class SessionController extends ComplexController { const { token, user_id } = req.body if (typeof user_id === "undefined") { - return res.status(400).send("No user_id provided") + return res.status(400).json("No user_id provided") } if (typeof token === "undefined") { - return res.status(400).send("No token provided") + return res.status(400).json("No token provided") } const session = await Session.findOneAndDelete({ user_id, token }) if (session) { - return res.send("done") + return res.json("done") } - return res.status(404).send("not found") + return res.status(404).json("not found") }, }, "/sessions": { @@ -95,15 +95,15 @@ export default class SessionController extends ComplexController { const { user_id } = req.body if (typeof user_id === "undefined") { - return res.status(400).send("No user_id provided") + return res.status(400).json("No user_id provided") } const allSessions = await Session.deleteMany({ user_id }) if (allSessions) { - return res.send("done") + return res.json("done") } - return res.status(404).send("not found") + return res.status(404).json("not found") } }, } diff --git a/packages/server/src/controllers/UserController/index.js b/packages/server/src/controllers/UserController/index.js index 85cc994d..cd42cbaf 100644 --- a/packages/server/src/controllers/UserController/index.js +++ b/packages/server/src/controllers/UserController/index.js @@ -390,7 +390,7 @@ export default class UserController extends ComplexController { }) }) .catch((err) => { - return res.send(500).json({ + return res.json(500).json({ error: err.message }) }) @@ -420,7 +420,7 @@ export default class UserController extends ComplexController { }) }) .catch((err) => { - return res.send(500).json({ + return res.json(500).json({ error: err.message }) }) diff --git a/packages/server/src/middlewares/onlyAdmin/index.js b/packages/server/src/middlewares/onlyAdmin/index.js index 1bac1ead..730faba8 100644 --- a/packages/server/src/middlewares/onlyAdmin/index.js +++ b/packages/server/src/middlewares/onlyAdmin/index.js @@ -1,6 +1,6 @@ export default (req, res, next) => { if (!req.user.roles.includes("admin")) { - return res.status(403).send({ error: "To make this request it is necessary to have administrator permissions" }) + return res.status(403).json({ error: "To make this request it is necessary to have administrator permissions" }) } next() diff --git a/packages/server/src/middlewares/withAuthentication/index.js b/packages/server/src/middlewares/withAuthentication/index.js index 71509706..4c1f7d52 100644 --- a/packages/server/src/middlewares/withAuthentication/index.js +++ b/packages/server/src/middlewares/withAuthentication/index.js @@ -4,7 +4,7 @@ import jwt from "jsonwebtoken" export default (req, res, next) => { function reject(description) { - return res.status(401).send({ error: `${description ?? "Invalid session"}` }) + return res.status(401).json({ error: `${description ?? "Invalid session"}` }) } const authHeader = req.headers?.authorization?.split(" ") @@ -34,7 +34,7 @@ export default (req, res, next) => { const userData = await User.findOne({ _id: currentSession.user_id }).select("+refreshToken") if (!userData) { - return res.status(404).send({ error: "No user data found" }) + return res.status(404).json({ error: "No user data found" }) } if (err) {