Prefer root_path over base_path

Author: alukach

src/stac_auth_proxy/app.py

@@ -138,13 +138,13 @@ async def lifespan(app: FastAPI):
         app.add_middleware(
             ProcessLinksMiddleware,
             upstream_url=str(settings.upstream_url),
-            base_path=settings.root_path,
+            root_path=settings.root_path,
         )
 
     if settings.root_path:
         app.add_middleware(
             RemoveRootPathMiddleware,
-            base_path=settings.root_path,
+            root_path=settings.root_path,
         )
 
     if settings.enable_compression:

src/stac_auth_proxy/middleware/RemoveRootPathMiddleware.py

@@ -1,4 +1,4 @@
-"""Middleware to remove BASE_PATH from incoming requests and update links in responses."""
+"""Middleware to remove ROOT_PATH from incoming requests and update links in responses."""
 
 import logging
 from dataclasses import dataclass
@@ -15,26 +15,26 @@ class RemoveRootPathMiddleware:
     server.
 
     IMPORTANT: This middleware must be placed early in the middleware chain (ie late in
-    the order of declaration) so that it trims the base_path from the request path before
+    the order of declaration) so that it trims the root_path from the request path before
     any middleware that may need to use the request path (e.g. EnforceAuthMiddleware).
     """
 
     app: ASGIApp
-    base_path: str
+    root_path: str
     transform_links: bool = True
 
     json_content_type_expr: str = r"application/(geo\+)?json"
 
     async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
-        """Remove BASE_PATH from the request path if it exists."""
+        """Remove ROOT_PATH from the request path if it exists."""
         if scope["type"] != "http":
             return await self.app(scope, receive, send)
 
         path = scope["path"]
 
-        # Remove base_path if it exists at the start of the path
-        if path.startswith(self.base_path):
+        # Remove root_path if it exists at the start of the path
+        if path.startswith(self.root_path):
             scope["raw_path"] = scope["path"].encode()
-            scope["path"] = path[len(self.base_path) :] or "/"
+            scope["path"] = path[len(self.root_path) :] or "/"
 
         return await self.app(scope, receive, send)