Merge branch 'main' into chore/tests

Author: alukach

src/stac_auth_proxy/app.py

@@ -31,11 +31,19 @@ def create_app(settings: Optional[Settings] = None) -> FastAPI:
 
     proxy = ReverseProxy(upstream=str(settings.upstream_url))
 
+    openapi_handler = OpenApiSpecHandler(
+        proxy=proxy, oidc_config_url=str(settings.oidc_discovery_url)
+    ).dispatch
+
     # Endpoints that are explicitely marked private
     for path, methods in settings.private_endpoints.items():
         app.add_api_route(
             path,
-            proxy.stream,
+            (
+                proxy.stream
+                if not path == settings.openapi_spec_endpoint
+                else openapi_handler
+            ),
             methods=methods,
             dependencies=[Depends(auth_scheme)],
         )
@@ -44,20 +52,14 @@ def create_app(settings: Optional[Settings] = None) -> FastAPI:
     for path, methods in settings.public_endpoints.items():
         app.add_api_route(
             path,
-            proxy.stream,
+            (
+                proxy.stream
+                if not path == settings.openapi_spec_endpoint
+                else openapi_handler
+            ),
             methods=methods,
         )
 
-    # Endpoint with special OpenAPI transformation functionality
-    if settings.openapi_spec_endpoint:
-        app.add_api_route(
-            settings.openapi_spec_endpoint,
-            OpenApiSpecHandler(
-                proxy=proxy, oidc_config_url=str(settings.oidc_discovery_url)
-            ).dispatch,
-            methods=["GET"],
-        )
-
     # Catchall for remainder of the endpoints
     app.add_api_route(
         "/{path:path}",

src/stac_auth_proxy/config.py

@@ -26,7 +26,7 @@ class Settings(BaseSettings):
         # https://stac-utils.github.io/stac-fastapi/api/stac_fastapi/extensions/third_party/bulk_transactions/#bulktransactionextension
         "/collections/{collection_id}/bulk_items": ["POST"],
     }
-    public_endpoints: EndpointMethods = {"/api.html": ["GET"]}
+    public_endpoints: EndpointMethods = {"/api.html": ["GET"], "/api": ["GET"]}
     openapi_spec_endpoint: Optional[str] = None
 
     model_config = SettingsConfigDict(env_prefix="STAC_AUTH_PROXY_")