Merge pull request #635 from plone/fix-email-notification-errors

Standardize errors data structure of email-notification endpoint

CHANGES.rst

@@ -4,7 +4,10 @@ Changelog
 3.5.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+Bugfixes:
+
+- Standardize errors data structure of email-notification endpoint.
+  [cekk]
 
 
 3.5.0 (2018-11-06)

src/plone/restapi/services/email_notification/post.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
+from plone.restapi.deserializer import json_body
 from plone.restapi.services import Service
+from zExceptions import BadRequest
 from zope.component import getMultiAdapter
-from plone.restapi.deserializer import json_body
 from zope.interface import alsoProvides
 
 import plone
@@ -18,18 +19,12 @@ def reply(self):
         subject = data.get('subject', '')
 
         if not sender_from_address or not message:
-            self.request.response.setStatus(400)
-            return dict(error=dict(
-                type='BadRequest',
-                message='Missing from or message parameters'))
+            raise BadRequest('Missing from or message parameters')
 
         overview_controlpanel = getMultiAdapter((self.context, self.request),
                                                 name='overview-controlpanel')
         if overview_controlpanel.mailhost_warning():
-            self.request.response.setStatus(400)
-            return dict(error=dict(
-                type='BadRequest',
-                message='MailHost is not configured.'))
+            raise BadRequest('MailHost is not configured.')
 
         # Disable CSRF protection
         if 'IDisableCSRFProtection' in dir(plone.protect.interfaces):
@@ -41,10 +36,10 @@ def reply(self):
 
         contact_info_view.send_message(
             dict(
-              message=message,
-              subject=subject,
-              sender_from_address=sender_from_address,
-              sender_fullname=sender_fullname
+                message=message,
+                subject=subject,
+                sender_from_address=sender_from_address,
+                sender_fullname=sender_fullname
             )
         )
 

src/plone/restapi/tests/test_services_email_notification.py

@@ -21,7 +21,7 @@
     PLONE5 = True
 
 
-@unittest.skipIf(not PLONE5, 'email notification not implemented for Plone < 5.') # noqa
+@unittest.skipIf(not PLONE5, 'email notification not implemented for Plone < 5.')  # noqa
 class EmailNotificationEndpoint(unittest.TestCase):
 
     layer = PLONE_RESTAPI_DX_FUNCTIONAL_TESTING
@@ -46,6 +46,19 @@ def setUp(self):
 
         transaction.commit()
 
+    def test_email_notification_missing_parameters(self):
+        response = self.api_session.post(
+            '/@email-notification',
+            json={
+                'message': 'Just want to say hi.'
+            })
+        transaction.commit()
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(self.mailhost.messages, [])
+        error = response.json()
+        self.assertEqual(error['message'],
+                         'Missing from or message parameters')
+
     def test_email_notification(self):
         response = self.api_session.post(
             '/@email-notification',