[sc-104770] Adding error message when api returns non json

Author: alexbourret

python-lib/rest_api_client.py

@@ -157,7 +157,17 @@ def request(self, method, url, can_raise_exeption=True, **kwargs):
         if response.status_code in [204]:
             self.pagination.update_next_page({}, response.links)
             return self.empty_json_response()
-        json_response = response.json()
+        try:
+            json_response = response.json()
+        except Exception as err:
+            self.pagination.update_next_page({}, response.links)
+            error_message = "Error '{}' when decoding JSON".format(str(err)[:100])
+            logger.error(error_message)
+            logger.error("response.content={}".format(response.content))
+            if can_raise_exeption:
+                raise RestAPIClientError("The API did not return JSON as expected. {}".format(error_message))
+            return {"error": error_message}
+
         self.pagination.update_next_page(json_response, response.links)
         return json_response