Merge branch 'main' into feature/apikey-scopes-support

connexion/middleware/routing.py

@@ -35,9 +35,10 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
             scope.get("path_params", {})
         )
 
-        api_base_path = scope.get("root_path", "")[
-            len(original_scope.get("root_path", "")) :
-        ]
+        def get_root_path(scope: Scope) -> str:
+            return scope.get("route_root_path", scope.get("root_path", ""))
+
+        api_base_path = get_root_path(scope)[len(get_root_path(original_scope)) :]
 
         extensions = original_scope.setdefault("extensions", {})
         connexion_routing = extensions.setdefault(ROUTING_CONTEXT, {})

connexion/middleware/swagger_ui.py

@@ -59,7 +59,9 @@ def _base_path_for_prefix(self, request: StarletteRequest) -> str:
         """
         returns a modified basePath which includes the incoming root_path.
         """
-        return request.scope.get("root_path", "").rstrip("/")
+        return request.scope.get(
+            "route_root_path", request.scope.get("root_path", "")
+        ).rstrip("/")
 
     def _spec_for_prefix(self, request):
         """

docs/quickstart.rst

@@ -102,7 +102,7 @@ built using either the :code:`AsyncApp` or :code:`FlaskApp`.
 
             wsgi_app = App(__name__)
             asgi_app = WSGIMiddleware(wsgi_app)
-            app = ConnexionMiddleware(app)
+            app = ConnexionMiddleware(asgi_app)
 
         .. dropdown:: View a detailed reference of the options accepted by the
             :code:`ConnexionMiddleware`

pyproject.toml

@@ -53,7 +53,7 @@ Jinja2 = ">= 3.0.0"
 python-multipart = ">= 0.0.5"
 PyYAML = ">= 5.1"
 requests = ">= 2.27"
-starlette = ">= 0.27, <0.33"
+starlette = ">= 0.27"
 typing-extensions = ">= 4"
 werkzeug = ">= 2.2.1"
 

tests/test_flask_encoder.py

@@ -75,16 +75,16 @@ def get_value(data, path):
     assert example == "a7b8869c-5f24-4ce0-a5d1-3e44c3663aa9"
 
     res = app_client.get("/v1.0/datetime")
-    assert res.status_code == 200, f"Error is {res.data}"
+    assert res.status_code == 200, f"Error is {res.text}"
     data = res.json()
     assert data == {"value": "2000-01-02T03:04:05.000006Z"}
 
     res = app_client.get("/v1.0/date")
-    assert res.status_code == 200, f"Error is {res.data}"
+    assert res.status_code == 200, f"Error is {res.text}"
     data = res.json()
     assert data == {"value": "2000-01-02"}
 
     res = app_client.get("/v1.0/uuid")
-    assert res.status_code == 200, f"Error is {res.data}"
+    assert res.status_code == 200, f"Error is {res.text}"
     data = res.json()
     assert data == {"value": "e7ff66d0-3ec2-4c4e-bed0-6e4723c24c51"}