Only attempt to parse the JSON for JSON responses (#84)

Author: maxdeviant

tests/conftest.py

@@ -10,10 +10,20 @@ def __init__(self, response_dict, status_code, headers=None):
         self.status_code = status_code
         self.headers = {} if headers is None else headers
 
+        if "content-type" not in self.headers:
+            self.headers["content-type"] = "application/json"
+
     def json(self):
         return self.response_dict
 
 
+class MockRawResponse(object):
+    def __init__(self, content, status_code, headers=None):
+        self.content = content
+        self.status_code = status_code
+        self.headers = {} if headers is None else headers
+
+
 @pytest.fixture
 def set_api_key(monkeypatch):
     monkeypatch.setattr(workos, "api_key", "sk_abdsomecharactersm284")
@@ -40,6 +50,17 @@ def mock(*args, **kwargs):
     return inner
 
 
+@pytest.fixture
+def mock_raw_request_method(monkeypatch):
+    def inner(method, content, status_code, headers=None):
+        def mock(*args, **kwargs):
+            return MockRawResponse(content, status_code, headers=headers)
+
+        monkeypatch.setattr(requests, method, mock)
+
+    return inner
+
+
 @pytest.fixture
 def capture_and_mock_request(monkeypatch):
     def inner(method, response_dict, status_code):

tests/test_directory_sync.py

@@ -161,8 +161,13 @@ def test_list_directories(self, mock_directories, mock_request_method):
 
         assert directories == mock_directories
 
-    def test_delete_directory(self, mock_directories, mock_request_method):
-        mock_request_method("delete", None, 202)
+    def test_delete_directory(self, mock_directories, mock_raw_request_method):
+        mock_raw_request_method(
+            "delete",
+            "Accepted",
+            202,
+            headers={"content-type": "text/plain; charset=utf-8"},
+        )
 
         response = self.directory_sync.delete_directory(directory="directory_id")
 

tests/test_organizations.py

@@ -119,8 +119,13 @@ def test_update_organization(self, mock_organization_updated, mock_request_metho
             }
         ]
 
-    def test_delete_organization(self, setup, mock_request_method):
-        mock_request_method("delete", None, 202)
+    def test_delete_organization(self, setup, mock_raw_request_method):
+        mock_raw_request_method(
+            "delete",
+            "Accepted",
+            202,
+            headers={"content-type": "text/plain; charset=utf-8"},
+        )
 
         response = self.organizations.delete_organization(organization="connection_id")
 

tests/test_sso.py

@@ -232,8 +232,13 @@ def test_list_connections(
 
         assert connections_response["data"] == mock_connections["data"]
 
-    def test_delete_connection(self, setup_with_client_id, mock_request_method):
-        mock_request_method("delete", None, 204)
+    def test_delete_connection(self, setup_with_client_id, mock_raw_request_method):
+        mock_raw_request_method(
+            "delete",
+            "No Content",
+            204,
+            headers={"content-type": "text/plain; charset=utf-8"},
+        )
 
         response = self.sso.delete_connection(connection="connection_id")
 

workos/utils/request.py

@@ -67,10 +67,16 @@ def request(
             response = request_fn(url, headers=headers, json=params)
 
         response_json = None
-        try:
-            response_json = response.json()
-        except ValueError:
-            raise ServerException(response)
+        content_type = (
+            response.headers.get("content-type")
+            if response.headers is not None
+            else None
+        )
+        if content_type == "application/json":
+            try:
+                response_json = response.json()
+            except ValueError:
+                raise ServerException(response)
 
         status_code = response.status_code
         if status_code >= 400 and status_code < 500: