refactor

Author: swaroopAkkineniWorkos

src/workos/authorization.py

@@ -49,7 +49,6 @@ class PermissionListFilters(ListArgs, total=False):
 
 class ResourcesForMembershipListFilters(ListArgs, total=False):
     permission_slug: str
-    parent_resource: ParentResourceIdentifier
 
 
 ResourcesForMembershipListResource = WorkOSListResource[
@@ -524,12 +523,9 @@ def list_resources_for_membership(
             "after": after,
             "order": order,
             "permission_slug": permission_slug,
-            "parent_resource": parent_resource,
         }
 
-        http_params: Dict[str, Any] = {
-            k: v for k, v in list_params.items() if k != "parent_resource"
-        }
+        http_params: Dict[str, Any] = {**list_params}
         http_params.update(parent_resource)
 
         response = self._http_client.request(
@@ -542,7 +538,9 @@ def list_resources_for_membership(
             Resource, ResourcesForMembershipListFilters, ListMetadata
         ](
             list_method=partial(
-                self.list_resources_for_membership, organization_membership_id
+                self.list_resources_for_membership,
+                organization_membership_id,
+                parent_resource=parent_resource,
             ),
             list_args=list_params,
             **ListPage[Resource](**response).model_dump(),
@@ -905,8 +903,6 @@ async def add_environment_role_permission(
 
         return EnvironmentRole.model_validate(response)
 
-    # Resource-Membership Relationships
-
     async def list_resources_for_membership(
         self,
         organization_membership_id: str,
@@ -924,12 +920,9 @@ async def list_resources_for_membership(
             "after": after,
             "order": order,
             "permission_slug": permission_slug,
-            "parent_resource": parent_resource,
         }
 
-        http_params: Dict[str, Any] = {
-            k: v for k, v in list_params.items() if k != "parent_resource"
-        }
+        http_params: Dict[str, Any] = {**list_params}
         http_params.update(parent_resource)
 
         response = await self._http_client.request(
@@ -942,7 +935,9 @@ async def list_resources_for_membership(
             Resource, ResourcesForMembershipListFilters, ListMetadata
         ](
             list_method=partial(
-                self.list_resources_for_membership, organization_membership_id
+                self.list_resources_for_membership,
+                organization_membership_id,
+                parent_resource=parent_resource,
             ),
             list_args=list_params,
             **ListPage[Resource](**response).model_dump(),

tests/test_authorization_resource_memberships.py

@@ -69,6 +69,7 @@ def test_list_resources_for_membership_with_parent_resource_id(
             )
         )
 
+        assert result.object == "list"
         assert len(result.data) == 3
         assert request_kwargs["method"] == "get"
         assert request_kwargs["url"].endswith(
@@ -101,6 +102,54 @@ def test_list_resources_for_membership_with_parent_external_id(
         assert request_kwargs["params"]["parent_resource_external_id"] == "folder_abc"
         assert "parent_resource_id" not in request_kwargs["params"]
 
+    def test_list_resources_for_membership_empty(
+        self, capture_and_mock_http_client_request
+    ):
+        empty_response = {
+            "data": [],
+            "list_metadata": {"before": None, "after": None},
+            "object": "list",
+        }
+        capture_and_mock_http_client_request(self.http_client, empty_response, 200)
+
+        result = syncify(
+            self.authorization.list_resources_for_membership(
+                "om_01ABC",
+                permission_slug="documents:read",
+                parent_resource=ParentResourceIdentifierById(
+                    parent_resource_id="res_parent_01",
+                ),
+            )
+        )
+
+        assert result.object == "list"
+        assert len(result.data) == 0
+
+    def test_list_resources_for_membership_passes_pagination_params(
+        self, mock_resources_list, capture_and_mock_http_client_request
+    ):
+        request_kwargs = capture_and_mock_http_client_request(
+            self.http_client, mock_resources_list, 200
+        )
+
+        syncify(
+            self.authorization.list_resources_for_membership(
+                "om_01ABC",
+                permission_slug="documents:read",
+                parent_resource=ParentResourceIdentifierById(
+                    parent_resource_id="res_parent_01",
+                ),
+                limit=10,
+                after="res_cursor123",
+                order="desc",
+            )
+        )
+
+        assert request_kwargs["params"]["permission_slug"] == "documents:read"
+        assert request_kwargs["params"]["limit"] == 10
+        assert request_kwargs["params"]["after"] == "res_cursor123"
+        assert request_kwargs["params"]["order"] == "desc"
+
     def test_list_resources_for_membership_auto_pagination(
         self,
         mock_resources_multiple_pages,