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

Revert "Standardize errors data structure of email-notification endpo…

CHANGES.rst

@@ -18,9 +18,6 @@ Bugfixes:
   and `648 <https://github.com/plone/plone.restapi/issues/648>`_.
   [maurits, gforcada]
 
-- Standardize errors data structure of email-notification endpoint.
-  [cekk]
-
 
 3.5.0 (2018-11-06)
 ------------------

src/plone/restapi/services/content/tus.py

@@ -37,7 +37,7 @@ class UploadOptions(Service):
 
     def reply(self):
         for name, value in TUS_OPTIONS_RESPONSE_HEADERS.items():
-                    self.request.response.setHeader(name, value)
+            self.request.response.setHeader(name, value)
         return super(UploadOptions, self).reply()
 
 

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

@@ -1,8 +1,7 @@
 # -*- 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
@@ -19,12 +18,18 @@ def reply(self):
         subject = data.get('subject', '')
 
         if not sender_from_address or not message:
-            raise BadRequest('Missing from or message parameters')
+            self.request.response.setStatus(400)
+            return dict(error=dict(
+                type='BadRequest',
+                message='Missing from or message parameters'))
 
         overview_controlpanel = getMultiAdapter((self.context, self.request),
                                                 name='overview-controlpanel')
         if overview_controlpanel.mailhost_warning():
-            raise BadRequest('MailHost is not configured.')
+            self.request.response.setStatus(400)
+            return dict(error=dict(
+                type='BadRequest',
+                message='MailHost is not configured.'))
 
         # Disable CSRF protection
         if 'IDisableCSRFProtection' in dir(plone.protect.interfaces):
@@ -36,10 +41,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

@@ -49,19 +49,6 @@ def setUp(self):
     def tearDown(self):
         self.api_session.close()
 
-    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',