Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions tests/unit/http/test_async_http_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,48 @@ async def test_invalid_request_timeout_raises_exception(self):
with self.assertRaises(ValueError):
await self.client.request("doesnt matter", "doesnt matter", timeout=-1)

async def test_json_content_type_puts_dict_on_json_not_data(self):
payload = {"profile": {"logo_url": "https://example.com/x.jpg"}}
await self.client.request(
"POST",
"https://messaging.twilio.com/v2/Channels/Senders/XE123",
data=payload,
headers={"Content-Type": "application/json"},
)

self.session_mock.request.assert_called()
request_args = self.session_mock.request.call_args.kwargs
self.assertEqual(request_args["json"], payload)
self.assertNotIn("data", request_args)

async def test_scim_json_content_type_puts_dict_on_json_not_data(self):
payload = {"userName": "alice"}
await self.client.request(
"POST",
"https://preview.twilio.com/scim/Users",
data=payload,
headers={"Content-Type": "application/scim+json"},
)

self.session_mock.request.assert_called()
request_args = self.session_mock.request.call_args.kwargs
self.assertEqual(request_args["json"], payload)
self.assertNotIn("data", request_args)

async def test_form_content_type_puts_dict_on_data_not_json(self):
payload = {"To": "+15555555555", "Body": "hi"}
await self.client.request(
"POST",
"https://api.twilio.com/2010-04-01/Accounts/ACxxx/Messages.json",
data=payload,
headers={"Content-Type": "application/x-www-form-urlencoded"},
)

self.session_mock.request.assert_called()
request_args = self.session_mock.request.call_args.kwargs
self.assertEqual(request_args["data"], payload)
self.assertNotIn("json", request_args)


class TestAsyncHttpClientRetries(aiounittest.AsyncTestCase):
def setUp(self):
Expand Down
7 changes: 6 additions & 1 deletion twilio/http/async_http_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,17 @@ async def request(
"method": method.upper(),
"url": url,
"params": params,
"data": data,
"headers": headers,
"auth": basic_auth,
"timeout": timeout,
"allow_redirects": allow_redirects,
}
if headers and headers.get("Content-Type") == "application/json":
kwargs["json"] = data
elif headers and headers.get("Content-Type") == "application/scim+json":
kwargs["json"] = data
else:
kwargs["data"] = data

self.log_request(kwargs)
self._test_only_last_response = None
Expand Down