EventController always return json

tracim/tracim/controllers/events.py

@@ -1,5 +1,6 @@
 import tg
 from tg import request
+from tg import Response
 from tg import abort
 from tg import RestController
 from sqlalchemy.orm.exc import NoResultFound
@@ -17,40 +18,72 @@ class EventRestController(RestController):
         try:
             json = request.json_body
         except:
-            abort(400,'Bad json')
+            return Response(
+                status=400,
+                json_body={'msg': 'Bad json'},
+            )
         cfg = CFG.get_instance()
         if 'token' in json and json['token'] == cfg.EMAIL_REPLY_TOKEN:
             if 'user_mail' not in json:
-                abort(400,'Bad sson : user_mail is required.')
+                return Response(
+                    status=400,
+                    json_body={'msg':'Bad json: user_mail is required'}
+                )
             if 'content_id' not in json:
-                abort(400, 'Bad json : content_id is required.')
+                return Response(
+                    status=400,
+                    json_body={'msg':'Bad json: content_id is required'}
+                )
             if  'payload' not in json:
-                abort(400, 'Bad json : payload is required.')
+                return Response(
+                    status=400,
+                    json_body={'msg':'Bad json: payload is required'}
+                )
             uapi = UserApi(None)
             try:
                 user = uapi.get_one_by_email(json['user_mail'])
             except NoResultFound:
-                abort(400,'Unknown user email.')
+                return Response(
+                    status=400,
+                    json_body={'msg': 'Unknown user email'},
+                )
             api = ContentApi(user)
 
             try:
                 thread = api.get_one(json['content_id'],
                                      content_type=ContentType.Any)
             except NoResultFound:
-                abort(400,'Unknown content_id.')
+                return Response(
+                    status=400,
+                    json_body={'msg': 'Unknown content_id'},
+                )
             # INFO - G.M - 2017-11-17
             # When content_id is a sub-elem of a main content like Comment,
             # Attach the thread to the main content.
             if thread.type == ContentType.Comment:
                 thread = thread.parent
             if thread.type == ContentType.Folder:
-                abort(400,'comment for folder not allowed')
-
+                return Response(
+                    status=400,
+                    json_body={'msg': 'comment for folder not allowed'},
+                )
             if 'content' in json['payload']:
                 api.create_comment(thread.workspace, thread,
                                    json['payload']['content'], True)
-                abort(204)
+                return Response(
+                    status=204,
+                )
             else:
-                abort(400,'No content to add new comment')
+                return Response(
+                    status=400,
+                    json_body={'msg': 'No content to add new comment'},
+                )
         else:
-            abort(403)
+            # TODO - G.M - 2017-11-23 - Switch to status 403 ?
+            # 403 is a better status code in this case.
+            # 403 status response can't now return clean json, because they are
+            # handled somewhere else to return html.
+            return Response(
+                status=400,
+                json_body={'msg': 'Invalid token'}
+            )