From 1ea399cbe97ee860b041451bb111671830f8943f Mon Sep 17 00:00:00 2001 From: witzig Date: Fri, 10 Mar 2017 15:38:04 +0100 Subject: [PATCH] Reduce error handling noise --- routes/editorapi.js | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/routes/editorapi.js b/routes/editorapi.js index f6b4d560..fd85bc73 100644 --- a/routes/editorapi.js +++ b/routes/editorapi.js @@ -417,37 +417,32 @@ let parseGrapejsMultipartTestForm = (req, res, next) => { }; router.post('/test', parseGrapejsMultipartTestForm, passport.csrfProtection, (req, res) => { + let sendError = err => { + if (req.query.editor === 'grapejs') { + res.status(500).json({ + errors: err.message || err + }); + } else { + res.status(500).send(err.message || err); + } + }; + prepareHtml({ editorName: req.query.editor, html: req.body.html }, (err, html) => { if (err) { - req.query.editor === 'grapejs' ? - res.status(500).json({ - errors: err.message || err - }) : - res.status(500).send(err.message || err); - return; + return sendError(err); } settings.list(['defaultAddress', 'defaultFrom'], (err, configItems) => { if (err) { - req.query.editor === 'grapejs' ? - res.status(500).json({ - errors: err.message || err - }) : - res.status(500).send(err.message || err); - return; + return sendError(err); } mailer.getMailer((err, transport) => { if (err) { - req.query.editor === 'grapejs' ? - res.status(500).json({ - errors: err.message || err - }) : - res.status(500).send(err.message || err); - return; + return sendError(err); } let opts = { @@ -465,12 +460,7 @@ router.post('/test', parseGrapejsMultipartTestForm, passport.csrfProtection, (re transport.sendMail(opts, (err, info) => { if (err) { - req.query.editor === 'grapejs' ? - res.status(500).json({ - errors: err.message || err - }) : - res.status(500).send(err.message || err); - return; + return sendError(err); } req.query.editor === 'grapejs' ?