Reorg handlers and middleware

Author: alukach

src/stac_auth_proxy/app.py

@@ -29,8 +29,20 @@ def create_app(settings: Optional[Settings] = None) -> FastAPI:
 
     app = FastAPI(
         openapi_url=None,  # Disable OpenAPI schema endpoint, we want to serve upstream's schema
+
+    # Add catchall proxy handler
+    proxy_handler = ReverseProxyHandler(upstream=str(settings.upstream_url))
+    app.add_api_route(
+        "/{path:path}",
+        proxy_handler.stream,
+        methods=["GET", "POST", "PUT", "PATCH", "DELETE"],
     )
 
+    if settings.healthz_prefix:
+        healthz_handler = HealthzHandler(upstream_url=str(settings.upstream_url))
+        app.include_router(healthz_handler.router, prefix="/healthz")
+
+    # Add middleware in reverse order (last added = first to run)
     app.add_middleware(AddProcessTimeHeaderMiddleware)
 
     if settings.openapi_spec_endpoint:
@@ -59,16 +71,4 @@ def create_app(settings: Optional[Settings] = None) -> FastAPI:
         oidc_config_url=settings.oidc_discovery_url,
     )
 
-    if settings.healthz_prefix:
-        healthz_handler = HealthzHandler(upstream_url=str(settings.upstream_url))
-        app.include_router(healthz_handler.router, prefix="/healthz")
-
-    # Catchall for any endpoint
-    proxy_handler = ReverseProxyHandler(upstream=str(settings.upstream_url))
-    app.add_api_route(
-        "/{path:path}",
-        proxy_handler.stream,
-        methods=["GET", "POST", "PUT", "PATCH", "DELETE"],
-    )
-
     return app