Merge pull request RasaHQ#5322 from RasaHQ/fix-callback-resp

Fix callback resp

Author: erohmensing

changelog/5230.bugfix.rst

@@ -0,0 +1 @@
+Fixed issue where posting to certain callback channel URLs would return a 500 error on successful posts due to invalid response format

rasa/utils/endpoints.py

@@ -2,6 +2,7 @@
 import os
 
 import aiohttp
+from aiohttp.client_exceptions import ContentTypeError
 from typing import Any, Optional, Text, Dict
 
 from sanic.request import Request
@@ -119,10 +120,9 @@ async def request(
         method: Text = "post",
         subpath: Optional[Text] = None,
         content_type: Optional[Text] = "application/json",
-        return_method: Text = "json",
         **kwargs: Any,
-    ):
-        """Send a HTTP request to the endpoint.
+    ) -> Optional[Any]:
+        """Send a HTTP request to the endpoint. Return json response, if available.
 
         All additional arguments will get passed through
         to aiohttp's `session.request`."""
@@ -144,12 +144,15 @@ async def request(
                 headers=headers,
                 params=self.combine_parameters(kwargs),
                 **kwargs,
-            ) as resp:
-                if resp.status >= 400:
+            ) as response:
+                if response.status >= 400:
                     raise ClientResponseError(
-                        resp.status, resp.reason, await resp.content.read()
+                        response.status, response.reason, await response.content.read()
                     )
-                return await getattr(resp, return_method)()
+                try:
+                    return await response.json()
+                except ContentTypeError:
+                    return None
 
     @classmethod
     def from_dict(cls, data) -> "EndpointConfig":

tests/utils/test_endpoints.py

@@ -94,3 +94,19 @@ def test_endpoint_config_custom_token_name():
     actual = endpoint_utils.EndpointConfig.from_dict(test_data)
 
     assert actual.token_name == "test_token"
+
+
+async def test_request_non_json_response():
+    with aioresponses() as mocked:
+        endpoint = endpoint_utils.EndpointConfig("https://example.com/")
+
+        mocked.post(
+            "https://example.com/test",
+            payload="ok",
+            content_type="application/text",
+            status=200,
+        )
+
+        response = await endpoint.request("post", subpath="test",)
+
+        assert not response