From 75521a4c86d0922fa099bf8ae83b5bcb01edd45a Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 28 Aug 2018 10:47:33 +0100 Subject: [PATCH] add error handling for changing email in newsletter of user who has not subscribed --- .../app/coffee/Features/Newsletter/NewsletterManager.coffee | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee b/services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee index 5fb2e00eb7..eee7258985 100644 --- a/services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee +++ b/services/web/app/coffee/Features/Newsletter/NewsletterManager.coffee @@ -39,8 +39,11 @@ module.exports = delete options.body.status options.body.email_address = newEmail mailchimp.request options, (err)-> + if err? and err?.message?.indexOf("merge fields were invalid") + logger.log {oldEmail, newEmail}, "unable to change email in newsletter as user has not subscribed" + return callback() # if the user has unsubscribed mailchimp will error on email address change - if err? and err?.message.indexOf("could not be validated") == -1 + else if err? and err?.message?.indexOf("could not be validated") == -1 logger.err err:err, "error changing email in newsletter" return callback(err) else