CUST-5289 Scope grants query alias normalization to grants resource

Move camelCase-to-snake_case key normalization out of the shared HTTP query builder and into the grants resource so only grants list parameters are transformed. Add grants-specific tests to verify camelCase compatibility and snake_case precedence.

Made-with: Cursor

Author: samLRodrigues

nylas/handler/http_client.py

@@ -49,22 +49,15 @@ def _validate_response(response: Response) -> Tuple[Dict, CaseInsensitiveDict]:
 
 def _build_query_params(base_url: str, query_params: dict = None) -> str:
     query_param_parts = []
-    query_param_key_aliases = {
-        "sortBy": "sort_by",
-        "orderBy": "order_by",
-        "grantStatus": "grant_status",
-    }
-
     for key, value in query_params.items():
-        normalized_key = query_param_key_aliases.get(key, key)
         if isinstance(value, list):
             for item in value:
-                query_param_parts.append(f"{normalized_key}={quote(str(item))}")
+                query_param_parts.append(f"{key}={quote(str(item))}")
         elif isinstance(value, dict):
             for k, v in value.items():
-                query_param_parts.append(f"{normalized_key}={k}:{quote(str(v))}")
+                query_param_parts.append(f"{key}={k}:{quote(str(v))}")
         else:
-            query_param_parts.append(f"{normalized_key}={quote(str(value))}")
+            query_param_parts.append(f"{key}={quote(str(value))}")
 
     query_string = "&".join(query_param_parts)
     return f"{base_url}?{query_string}"

nylas/resources/grants.py

@@ -13,6 +13,28 @@
 from nylas.models.response import Response, ListResponse, DeleteResponse
 
 
+def _normalize_grants_query_params(query_params: ListGrantsQueryParams = None) -> dict:
+    if not query_params:
+        return query_params
+
+    normalized_query_params = dict(query_params)
+    key_aliases = {
+        "sortBy": "sort_by",
+        "orderBy": "order_by",
+        "grantStatus": "grant_status",
+    }
+
+    for camel_case_key, snake_case_key in key_aliases.items():
+        if camel_case_key in normalized_query_params:
+            if snake_case_key not in normalized_query_params:
+                normalized_query_params[snake_case_key] = normalized_query_params[
+                    camel_case_key
+                ]
+            del normalized_query_params[camel_case_key]
+
+    return normalized_query_params
+
+
 class Grants(
     ListableApiResource,
     FindableApiResource,
@@ -47,7 +69,7 @@ def list(
         return super().list(
             path="/v3/grants",
             response_type=Grant,
-            query_params=query_params,
+            query_params=_normalize_grants_query_params(query_params),
             overrides=overrides,
         )
 

tests/resources/test_grants.py

@@ -68,6 +68,61 @@ def test_list_grants(self, http_client_list_response):
             "GET", "/v3/grants", None, None, None, overrides=None
         )
 
+    def test_list_grants_normalizes_camel_case_query_params(
+        self, http_client_list_response
+    ):
+        grants = Grants(http_client_list_response)
+
+        grants.list(
+            query_params={
+                "sortBy": "created_at",
+                "orderBy": "asc",
+                "grantStatus": "valid",
+                "limit": 10,
+            }
+        )
+
+        http_client_list_response._execute.assert_called_once_with(
+            "GET",
+            "/v3/grants",
+            None,
+            {
+                "sort_by": "created_at",
+                "order_by": "asc",
+                "grant_status": "valid",
+                "limit": 10,
+            },
+            None,
+            overrides=None,
+        )
+
+    def test_list_grants_prefers_snake_case_query_params(self, http_client_list_response):
+        grants = Grants(http_client_list_response)
+
+        grants.list(
+            query_params={
+                "sortBy": "updated_at",
+                "sort_by": "created_at",
+                "orderBy": "desc",
+                "order_by": "asc",
+                "grantStatus": "invalid",
+                "grant_status": "valid",
+            }
+        )
+
+        http_client_list_response._execute.assert_called_once_with(
+            "GET",
+            "/v3/grants",
+            None,
+            {
+                "sort_by": "created_at",
+                "order_by": "asc",
+                "grant_status": "valid",
+            },
+            None,
+            overrides=None,
+        )
+
     def test_find_grant(self, http_client_response):
         grants = Grants(http_client_response)