Fix before request (#449)

* added xfail

When Redirect.to_response is returned by the before request hook, it raises ImproperlyConfiguredException

* fix before_request hook

* 1.16.2

Co-authored-by: infohash <[email protected]>

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+[1.16.2]
+
+- fix `before_requiest` regression causing it to not handle returned responses from the hook.
+
+[1.16.1]
+
+[1.16.0]
+
 [1.15.0]
 
 - `examples/` directory and tests for complete documentation examples

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "starlite"
-version = "1.16.1"
+version = "1.16.2"
 description = "Light-weight and flexible ASGI API Framework"
 authors = ["Na'aman Hirschfeld <[email protected]>"]
 maintainers = ["Na'aman Hirschfeld <[email protected]>", "Peter Schutt <[email protected]>", "Cody Fincher <[email protected]>"]

starlite/routes/http.py

@@ -4,23 +4,23 @@
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Union, cast
 
 from anyio.to_thread import run_sync
+from starlette.responses import Response as StarletteResponse
 from starlette.routing import get_name
 
 from starlite.connection import Request
 from starlite.controller import Controller
 from starlite.enums import ScopeType
 from starlite.exceptions import ImproperlyConfiguredException
+from starlite.response import Response
 from starlite.routes.base import BaseRoute
 from starlite.signature import get_signature_model
 from starlite.utils import is_async_callable
 
 if TYPE_CHECKING:
     from pydantic.typing import AnyCallable
-    from starlette.responses import Response as StarletteResponse
 
     from starlite.handlers.http import HTTPRouteHandler
     from starlite.kwargs import KwargsModel
-    from starlite.response import Response
     from starlite.types import Method, Receive, Scope, Send
 
 
@@ -145,6 +145,9 @@ async def _call_handler_function(
                 route_handler=route_handler, parameter_model=parameter_model, request=request
             )
 
+        if isinstance(response_data, (Response, StarletteResponse)):
+            return response_data
+
         return await route_handler.to_response(
             app=scope["app"],
             data=response_data,

tests/handlers/http/test_to_response.py

@@ -2,7 +2,7 @@
 from json import loads
 from pathlib import Path
 from time import sleep
-from typing import TYPE_CHECKING, Any, AsyncIterator, Generator, Iterator
+from typing import TYPE_CHECKING, Any, AsyncIterator, Dict, Generator, Iterator
 
 import pytest
 from pydantic import ValidationError
@@ -15,7 +15,7 @@
 )
 from starlette.responses import Response as StarletteResponse
 from starlette.responses import StreamingResponse
-from starlette.status import HTTP_200_OK
+from starlette.status import HTTP_200_OK, HTTP_308_PERMANENT_REDIRECT
 
 from starlite import (
     Cookie,
@@ -24,6 +24,7 @@
     HTTPRoute,
     MediaType,
     Redirect,
+    Request,
     Response,
     ResponseHeader,
     Stream,
@@ -141,6 +142,26 @@ def test_function() -> Redirect:
         assert response.background == background_task
 
 
+def test_to_response_returning_redirect_response_from_redirect() -> None:
+    @get(path="/proxy")
+    def proxy_handler() -> Dict[str, str]:
+        return {"message": "redirected by before request hook"}
+
+    def before_request_hook_handler(request: Request) -> RedirectResponse:
+        return Redirect(path="/proxy").to_response(
+            headers={}, media_type="application/json", status_code=HTTP_308_PERMANENT_REDIRECT, app=request.app
+        )
+
+    @get(path="/test", before_request=before_request_hook_handler)
+    def redirect_handler() -> None:
+        raise AssertionError("this endpoint should not be reached")
+
+    with create_test_client(route_handlers=[redirect_handler, proxy_handler]) as client:
+        response = client.get("/test")
+        assert response.status_code == HTTP_200_OK
+        assert response.json() == {"message": "redirected by before request hook"}
+
+
 @pytest.mark.asyncio()
 async def test_to_response_returning_file_response() -> None:
     current_file_path = Path(__file__).resolve()