Fix response content type header check when content type header contains charset substring

Author: aseveryn-hw

hyperwallet/tests/test_client.py

@@ -120,6 +120,54 @@ def test_receive_valid_json_response(self, session_mock):
             json.loads(encoded)
         )
 
+    @mock.patch('requests.Session.request')
+    def test_receive_valid_json_response_when_content_type_contains_charset(self, session_mock):
+
+        data = {
+            'key': 'value'
+        }
+
+        session_mock.return_value = mock.MagicMock(
+            status_code=200,
+            content=json.dumps(data),
+            headers={
+                "Content-Type": "application/json;charset=utf-8"
+            }
+        )
+
+        encoded = json.dumps(data)
+        if hasattr(encoded, 'decode'):  # Python 2
+            encoded = encoded.decode('utf-8')
+
+        self.assertEqual(
+            self.client._makeRequest(),
+            json.loads(encoded)
+        )
+
+    @mock.patch('requests.Session.request')
+    def test_receive_valid_json_response_when_content_type_starts_with_charset(self, session_mock):
+
+        data = {
+            'key': 'value'
+        }
+
+        session_mock.return_value = mock.MagicMock(
+            status_code=200,
+            content=json.dumps(data),
+            headers={
+                "Content-Type": "charset=utf-8;application/json"
+            }
+        )
+
+        encoded = json.dumps(data)
+        if hasattr(encoded, 'decode'):  # Python 2
+            encoded = encoded.decode('utf-8')
+
+        self.assertEqual(
+            self.client._makeRequest(),
+            json.loads(encoded)
+        )
+
     @mock.patch('requests.Session.request')
     def test_receive_json_error_response_when_content_type_is_not_valid(self, session_mock):
 

hyperwallet/utils/apiclient.py

@@ -204,7 +204,7 @@ def __checkResponseHeaderContentType(self, response):
         '''
 
         contentType = response.headers['Content-Type']
-        if (not self.encrypted and contentType != 'application/json') or (self.encrypted and contentType != 'application/jose+json'):
+        if (not self.encrypted and 'application/json' not in contentType) or (self.encrypted and 'application/jose+json' not in contentType):
             raise HyperwalletAPIException('Invalid Content-Type specified in Response Header')
 
     def __getRequestData(self, data):