chore: reorg code

developmentseed · Dec 8, 2024 · e6af5a3 · e6af5a3
1 parent cd64125
commit e6af5a3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/stac_auth_proxy/app.py b/src/stac_auth_proxy/app.py
@@ -22,7 +22,9 @@ def create_app(settings: Optional[Settings] = None) -> FastAPI:
     """FastAPI Application Factory."""
     settings = settings or Settings()
 
-    app = FastAPI(openapi_url=None)
+    app = FastAPI(
+        openapi_url=None,
+    )
     app.add_middleware(AddProcessTimeHeaderMiddleware)
 
     auth_scheme = OpenIdConnectAuth(
@@ -33,6 +35,13 @@ def create_app(settings: Optional[Settings] = None) -> FastAPI:
         logger.info("Wrapping auth scheme")
         auth_scheme = settings.guard(auth_scheme)
 
+    if settings.debug:
+        app.add_api_route(
+            "/_debug",
+            lambda: {"settings": settings},
+            methods=["GET"],
+        )
+
     proxy_handler = ReverseProxyHandler(upstream=str(settings.upstream_url))
     openapi_handler = OpenApiSpecHandler(
         proxy=proxy_handler, oidc_config_url=str(settings.oidc_discovery_url)
@@ -63,13 +72,6 @@ def create_app(settings: Optional[Settings] = None) -> FastAPI:
             methods=methods,
         )
 
-    if settings.debug:
-        app.add_api_route(
-            "/_debug",
-            lambda: {"settings": settings},
-            methods=["GET"],
-        )
-
     # Catchall for remainder of the endpoints
     app.add_api_route(
         "/{path:path}",

diff --git a/src/stac_auth_proxy/handlers/reverse_proxy.py b/src/stac_auth_proxy/handlers/reverse_proxy.py
@@ -34,12 +34,13 @@ async def proxy_request(self, request: Request, *, stream=False) -> httpx.Respon
         headers.setdefault("X-Forwarded-Host", request.url.hostname)
 
         # https://github.com/fastapi/fastapi/discussions/7382#discussioncomment-5136466
+        url = httpx.URL(
+            path=request.url.path,
+            query=request.url.query.encode("utf-8"),
+        )
         rp_req = self.client.build_request(
             request.method,
-            url=httpx.URL(
-                path=request.url.path,
-                query=request.url.query.encode("utf-8"),
-            ),
+            url=url,
             headers=headers,
             content=request.stream(),
         )