From 58737538fac710aafe50d47a72cfcd38fbccb92b Mon Sep 17 00:00:00 2001
From: Harsha Kethineni <harshakethineni@flywheel.io>
Date: Mon, 10 Jul 2017 16:41:00 -0500
Subject: [PATCH] more descriptive error messages

---
 api/handlers/collectionshandler.py | 2 +-
 api/handlers/containerhandler.py   | 2 +-
 api/handlers/grouphandler.py       | 2 +-
 api/handlers/userhandler.py        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/handlers/collectionshandler.py b/api/handlers/collectionshandler.py
index d35720a5..000fc2ef 100644
--- a/api/handlers/collectionshandler.py
+++ b/api/handlers/collectionshandler.py
@@ -58,7 +58,7 @@ class CollectionsHandler(ContainerHandler):
 
         payload = self.request.json_body or {}
         if not payload:
-            self.abort(400, 'Bad Request')
+            self.abort(400, 'PUT request body cannot be empty')
         contents = payload.pop('contents', None)
         payload_validator(payload, 'PUT')
         permchecker = self._get_permchecker(container=container)
diff --git a/api/handlers/containerhandler.py b/api/handlers/containerhandler.py
index b2f942cd..f2bea7ef 100644
--- a/api/handlers/containerhandler.py
+++ b/api/handlers/containerhandler.py
@@ -436,7 +436,7 @@ class ContainerHandler(base.RequestHandler):
 
         payload = self.request.json_body
         if not payload:
-            self.abort(400, 'Bad Request')
+            self.abort(400, 'PUT request body cannot be empty')
         payload_validator(payload, 'PUT')
 
         # Check if any payload keys are any propogated property, add to r_payload
diff --git a/api/handlers/grouphandler.py b/api/handlers/grouphandler.py
index c43a230b..51facb28 100644
--- a/api/handlers/grouphandler.py
+++ b/api/handlers/grouphandler.py
@@ -51,7 +51,7 @@ class GroupHandler(base.RequestHandler):
         permchecker = groupauth.default(self, group)
         payload = self.request.json_body
         if not payload:
-            self.abort(400, 'Bad Request')
+            self.abort(400, 'PUT request body cannot be empty')
         mongo_schema_uri = validators.schema_uri('mongo', 'group.json')
         mongo_validator = validators.decorator_from_schema_path(mongo_schema_uri)
         payload_schema_uri = validators.schema_uri('input', 'group-update.json')
diff --git a/api/handlers/userhandler.py b/api/handlers/userhandler.py
index 9f08bd9e..50fb1fad 100644
--- a/api/handlers/userhandler.py
+++ b/api/handlers/userhandler.py
@@ -70,7 +70,7 @@ class UserHandler(base.RequestHandler):
         permchecker = userauth.default(self, user)
         payload = self.request.json_body
         if not payload:
-            self.abort(400, 'Bad Request')
+            self.abort(400, 'PUT request body cannot be empty')
         mongo_schema_uri = validators.schema_uri('mongo', 'user.json')
         mongo_validator = validators.decorator_from_schema_path(mongo_schema_uri)
         payload_schema_uri = validators.schema_uri('input', 'user-update.json')
-- 
GitLab