Merge pull request #2984 from overleaf/msm-oerror-remove-bad-request-error

Replace HTTPErrors.BadRequestError with calls to badRequest() handler

GitOrigin-RevId: 57a91a13bde942ee373e235ee925f1c76a0f4e88
This commit is contained in:
Miguel Serrano
2020-07-17 02:07:12 +00:00
committed by Copybot
parent 4b90b09365
commit 63503f2079
3 changed files with 73 additions and 2 deletions
@@ -1,7 +1,7 @@
const logger = require('logger-sharelatex')
function renderJSONError(res, message, info) {
const fullInfo = { message, ...info }
const fullInfo = { ...info, message }
if (info.message) {
logger.warn(
info,
@@ -12,6 +12,21 @@ function renderJSONError(res, message, info) {
}
module.exports = {
badRequest(req, res, message, info) {
res.status(400)
switch (req.accepts(['html', 'json'])) {
case 'html':
return res.render('general/400', {
title: 'Client Error',
message: message
})
case 'json':
return renderJSONError(res, message, info || {})
default:
return res.send('client error')
}
},
forbidden(req, res, message = 'restricted', info = {}) {
res.status(403)
switch (req.accepts(['html', 'json'])) {