Merge pull request #49 from Kinto/46/handle-403-for-create-collection

Issue a better error message for create_collection.

Author: Natim

kinto_client/__init__.py

@@ -220,9 +220,17 @@ def create_collection(self, collection=None, bucket=None,
                                               safe=safe)
         headers = DO_NOT_OVERWRITE if safe else None
         endpoint = self._get_endpoint('collection', bucket, collection)
-        resp, _ = self.session.request('put', endpoint, data=data,
-                                       permissions=permissions,
-                                       headers=headers)
+        try:
+            resp, _ = self.session.request('put', endpoint, data=data,
+                                           permissions=permissions,
+                                           headers=headers)
+        except KintoException as e:
+            if e.response.status_code == 403:
+                msg = ("Unauthorized. Please check that the bucket exists and "
+                       "that you have the permission to create or write on "
+                       "this collection.")
+                e = KintoException(msg, e)
+            raise e
         return resp
 
     def update_collection(self, data=None, collection=None, bucket=None,
@@ -285,9 +293,18 @@ def create_record(self, data, id=None, collection=None, permissions=None,
         headers = DO_NOT_OVERWRITE if safe else None
 
         endpoint = self._get_endpoint('record', bucket, collection, id)
-        resp, _ = self.session.request('put', endpoint, data=data,
-                                       permissions=permissions,
-                                       headers=headers)
+        try:
+            resp, _ = self.session.request('put', endpoint, data=data,
+                                           permissions=permissions,
+                                           headers=headers)
+        except KintoException as e:
+            if e.response.status_code == 403:
+                msg = ("Unauthorized. Please check that the collection exists "
+                       "and that you have the permission to create or write on "
+                       "this collection record.")
+                e = KintoException(msg, e)
+            raise e
+
         return resp
 
     def update_record(self, data, id=None, collection=None, permissions=None,

kinto_client/exceptions.py

@@ -1,14 +1,17 @@
 class KintoException(Exception):
-    pass
-
-
-class BucketNotFound(KintoException):
     request = None
     response = None
 
     def __init__(self, message=None, exception=None):
-        super(BucketNotFound, self).__init__(self, message)
+        super(KintoException, self).__init__(self, message)
         self.message = message
         if exception is not None:
             self.request = exception.request
             self.response = exception.response
+        else:
+            self.request = None
+            self.response = None
+
+
+class BucketNotFound(KintoException):
+    pass

kinto_client/tests/test_client.py

@@ -406,6 +406,17 @@ def test_get_or_create_raise_in_other_cases(self):
                 collection="coll",
                 if_not_exists=True)
 
+    def test_create_collection_raises_a_special_error_on_403(self):
+        self.session.request.side_effect = get_http_error(status=403)
+        with self.assertRaises(KintoException) as e:
+            self.client.create_collection(
+                bucket="buck",
+                collection="coll")
+        expected_msg = ("Unauthorized. Please check that the bucket exists "
+                        "and that you have the permission to create or write "
+                        "on this collection.")
+        assert e.exception.message == expected_msg
+
 
 class RecordTest(unittest.TestCase):
     def setUp(self):
@@ -674,3 +685,15 @@ def test_get_or_create_raise_in_other_cases(self):
                 collection="coll",
                 data={'foo': 'bar'},
                 if_not_exists=True)
+
+    def test_create_record_raises_a_special_error_on_403(self):
+        self.session.request.side_effect = get_http_error(status=403)
+        with self.assertRaises(KintoException) as e:
+            self.client.create_record(
+                bucket="buck",
+                collection="coll",
+                data={'foo': 'bar'})
+        expected_msg = ("Unauthorized. Please check that the collection exists"
+                        " and that you have the permission to create or write "
+                        "on this collection record.")
+        assert e.exception.message == expected_msg

kinto_client/tests/test_endpoints.py

@@ -47,15 +47,15 @@ def test_missing_arguments_raise_an_error(self):
         with self.assertRaises(KintoException) as context:
             self.endpoints.get('record', bucket='buck',  collection='coll')
         msg = "Cannot get record endpoint, id is missing"
-        assert text_type(context.exception) == msg
+        assert msg in text_type(context.exception)
 
     def test_null_arguments_raise_an_error(self):
         # Include a null record id; it should raise an error.
         with self.assertRaises(KintoException) as context:
             self.endpoints.get('record', bucket='buck',  collection='coll',
                                id=None)
         msg = "Cannot get record endpoint, id is missing"
-        assert text_type(context.exception) == msg
+        assert msg in text_type(context.exception)
 
     def test_arguments_are_slugified(self):
         assert self.endpoints.get('bucket', bucket='My Bucket') ==\