Fix bug for create_user and create_organization_membership and update all tests (#346)

Author: mattgd

tests/conftest.py

@@ -9,6 +9,7 @@
 from workos.types.list_resource import WorkOSListResource
 from workos.utils._base_http_client import DEFAULT_REQUEST_TIMEOUT
 from workos.utils.http_client import AsyncHTTPClient, HTTPClient, SyncHTTPClient
+from workos.utils.request_helper import DEFAULT_LIST_RESPONSE_LIMIT
 
 
 @pytest.fixture
@@ -122,7 +123,7 @@ def capture_and_mock(*args, **kwargs):
 
 
 @pytest.fixture
-def mock_pagination_request_for_http_client(monkeypatch):
+def capture_and_mock_pagination_request_for_http_client(monkeypatch):
     # Mocking pagination correctly requires us to index into a list of data
     # and correctly set the before and after metadata in the response.
     def inner(
@@ -131,10 +132,14 @@ def inner(
         status_code: int = 200,
         headers: Optional[Mapping[str, str]] = None,
     ):
+        request_kwargs = {}
+
         # For convenient index lookup, store the list of object IDs.
         data_ids = list(map(lambda x: x["id"], data_list))
 
         def mock_function(*args, **kwargs):
+            request_kwargs.update(kwargs)
+
             params = kwargs.get("params") or {}
             request_after = params.get("after", None)
             limit = params.get("limit", 10)
@@ -166,20 +171,20 @@ def mock_function(*args, **kwargs):
 
         monkeypatch.setattr(http_client._client, "request", mock)
 
+        return request_kwargs
+
     return inner
 
 
 @pytest.fixture
-def test_sync_auto_pagination(
-    mock_pagination_request_for_http_client,
-):
+def test_sync_auto_pagination(capture_and_mock_pagination_request_for_http_client):
     def inner(
         http_client: SyncHTTPClient,
         list_function: Callable[[], WorkOSListResource],
         expected_all_page_data: dict,
         list_function_params: Optional[Mapping[str, Any]] = None,
     ):
-        mock_pagination_request_for_http_client(
+        request_kwargs = capture_and_mock_pagination_request_for_http_client(
             http_client=http_client,
             data_list=expected_all_page_data,
             status_code=200,
@@ -193,5 +198,15 @@ def inner(
 
         assert len(list(all_results)) == len(expected_all_page_data)
         assert (list_data_to_dicts(all_results)) == expected_all_page_data
+        assert request_kwargs["method"] == "get"
+
+        # Validate parameters
+        assert "after" in request_kwargs["params"]
+        assert request_kwargs["params"]["limit"] == DEFAULT_LIST_RESPONSE_LIMIT
+        assert request_kwargs["params"]["order"] == "desc"
+
+        params = list_function_params or {}
+        for param in params:
+            assert request_kwargs["params"][param] == params[param]
 
     return inner

tests/test_async_http_client.py

@@ -287,3 +287,27 @@ async def test_request_parses_json_when_encoding_in_content_type(self):
         )
 
         assert await self.http_client.request("ok_place") == {"foo": "bar"}
+
+    async def test_request_removes_none_parameter_values(
+        self, capture_and_mock_http_client_request
+    ):
+        request_kwargs = capture_and_mock_http_client_request(self.http_client, {}, 200)
+
+        await self.http_client.request(
+            path="/test",
+            method="get",
+            params={"organization_id": None, "test": "value"},
+        )
+        assert request_kwargs["params"] == {"test": "value"}
+
+    async def test_request_removes_none_json_values(
+        self, capture_and_mock_http_client_request
+    ):
+        request_kwargs = capture_and_mock_http_client_request(self.http_client, {}, 200)
+
+        await self.http_client.request(
+            path="/test",
+            method="post",
+            json={"organization_id": None, "test": "value"},
+        )
+        assert request_kwargs["json"] == {"test": "value"}

tests/test_audit_logs.py

@@ -78,6 +78,8 @@ def test_succeeds(self, capture_and_mock_http_client_request):
                 idempotency_key="test_123456",
             )
 
+            assert request_kwargs["url"].endswith("/audit_logs/events")
+            assert request_kwargs["method"] == "post"
             assert request_kwargs["json"] == {
                 "organization_id": organization_id,
                 "event": event,
@@ -177,7 +179,9 @@ def test_succeeds(self, mock_http_client_with_response):
 
             assert response.dict() == expected_payload
 
-        def test_succeeds_with_additional_filters(self, mock_http_client_with_response):
+        def test_succeeds_with_additional_filters(
+            self, capture_and_mock_http_client_request
+        ):
             now = datetime.now().isoformat()
             organization_id = "org_123456789"
             range_start = now
@@ -196,7 +200,9 @@ def test_succeeds_with_additional_filters(self, mock_http_client_with_response):
                 "updated_at": now,
             }
 
-            mock_http_client_with_response(self.http_client, expected_payload, 201)
+            request_kwargs = capture_and_mock_http_client_request(
+                self.http_client, expected_payload, 201
+            )
 
             response = self.audit_logs.create_export(
                 actions=actions,
@@ -208,6 +214,17 @@ def test_succeeds_with_additional_filters(self, mock_http_client_with_response):
                 actor_ids=actor_ids,
             )
 
+            assert request_kwargs["url"].endswith("/audit_logs/exports")
+            assert request_kwargs["method"] == "post"
+            assert request_kwargs["json"] == {
+                "actions": actions,
+                "organization_id": organization_id,
+                "range_end": range_end,
+                "range_start": range_start,
+                "targets": targets,
+                "actor_names": actor_names,
+                "actor_ids": actor_ids,
+            }
             assert response.dict() == expected_payload
 
         def test_throws_unauthorized_excpetion(self, mock_http_client_with_response):
@@ -233,7 +250,7 @@ def test_throws_unauthorized_excpetion(self, mock_http_client_with_response):
             )
 
     class TestGetExport(_TestSetup):
-        def test_succeeds(self, mock_http_client_with_response):
+        def test_succeeds(self, capture_and_mock_http_client_request):
             now = datetime.now().isoformat()
             expected_payload = {
                 "object": "audit_log_export",
@@ -244,12 +261,18 @@ def test_succeeds(self, mock_http_client_with_response):
                 "updated_at": now,
             }
 
-            mock_http_client_with_response(self.http_client, expected_payload, 200)
+            request_kwargs = capture_and_mock_http_client_request(
+                self.http_client, expected_payload, 200
+            )
 
             response = self.audit_logs.get_export(
                 expected_payload["id"],
             )
 
+            assert request_kwargs["url"].endswith(
+                "/audit_logs/exports/audit_log_export_1234"
+            )
+            assert request_kwargs["method"] == "get"
             assert response.dict() == expected_payload
 
         def test_throws_unauthorized_excpetion(self, mock_http_client_with_response):