From bf60fe7f6cba1f4e9df2ddbc0117aa640f3970be Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Thu, 4 Oct 2018 10:36:10 +0100 Subject: [PATCH] Add error handling for InvalidError --- .../web/app/coffee/Features/Errors/ErrorController.coffee | 4 ++++ services/web/app/coffee/Features/Errors/Errors.coffee | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/services/web/app/coffee/Features/Errors/ErrorController.coffee b/services/web/app/coffee/Features/Errors/ErrorController.coffee index c4f3089fe0..50f0ba3c06 100644 --- a/services/web/app/coffee/Features/Errors/ErrorController.coffee +++ b/services/web/app/coffee/Features/Errors/ErrorController.coffee @@ -25,6 +25,10 @@ module.exports = ErrorController = else if error instanceof Errors.TooManyRequestsError logger.warn {err: error, url: req.url}, "too many requests error" res.sendStatus(429) + else if error instanceof Errors.InvalidError + logger.warn {err: error, url: req.url}, "invalid error" + res.status(400) + res.send(error.message) else if error instanceof Errors.InvalidNameError logger.warn {err: error, url: req.url}, "invalid name error" res.status(400) diff --git a/services/web/app/coffee/Features/Errors/Errors.coffee b/services/web/app/coffee/Features/Errors/Errors.coffee index 94aeaa2a90..3239bbbb58 100644 --- a/services/web/app/coffee/Features/Errors/Errors.coffee +++ b/services/web/app/coffee/Features/Errors/Errors.coffee @@ -82,6 +82,13 @@ EmailExistsError = (message) -> return error EmailExistsError.prototype.__proto__ = Error.prototype +InvalidError = (message) -> + error = new Error(message) + error.name = "InvalidError" + error.__proto__ = InvalidError.prototype + return error +InvalidError.prototype.__proto__ = Error.prototype + module.exports = Errors = NotFoundError: NotFoundError ServiceNotConfiguredError: ServiceNotConfiguredError @@ -95,3 +102,4 @@ module.exports = Errors = V1ConnectionError: V1ConnectionError UnconfirmedEmailError: UnconfirmedEmailError EmailExistsError: EmailExistsError + InvalidError: InvalidError