Redirect browse fix

docker-compose.local.yaml

@@ -12,5 +12,6 @@ services:
     environment:
       - base_address_http=http://localhost
       - base_address_https=https://localhost
+      - base_browse_address=https://staging.knowwheregraph.org/browse
     networks:
       - kwg_network

docker-compose.prod.yaml

@@ -10,7 +10,8 @@ services:
     ports:
       - '8080:8080'
     environment:
-      - base_address_http=http://stko-kwg.geog.ucsb.edu
-      - base_address_https=https://stko-kwg.geog.ucsb.edu
+      - base_address_http=http://kwg-api:8080
+      - base_address_https=https://kwg-api:8080
+      - base_browse_address=https://stko-kwg.geog.ucsb.edu/browse
     networks:
       - kwg_network

docker-compose.stage.yaml

@@ -10,7 +10,8 @@ services:
     ports:
       - '8080:8080'
     environment:
-      - base_address_http=http://staging.knowwheregraph.org
-      - base_address_https=https://staging.knowwheregraph.org
+      - base_address_http=http://kwg-api:8080
+      - base_address_https=https://kwg-api:8080
+      - base_browse_address=https://staging.knowwheregraph.org/browse
     networks:
       - kwg_network

kwg_api/api/node_negotiator.py

@@ -75,11 +75,9 @@ def _redirect_browse(self) -> RedirectResponse:
 
         :return: A response signaling a redirect to a URL
         """
-        browse_url = f"{self.base_address_https}/browse/"
         resource_id_shortened = PrefixBuilder.resolve_prefix(
             self.request_url, self.resource_id
         )
         if not resource_id_shortened:
             resource_id_shortened = self.resource_id
-        print(self.base_address_https)
-        return RedirectResponse(url=f"{browse_url}#{resource_id_shortened}")
+        return RedirectResponse(url=f"{self.base_browse_address}#{resource_id_shortened}")

kwg_api/lib/content_negotiator.py

@@ -18,6 +18,7 @@ def __init__(self, request: Request, resource_id: str):
         """
         self.base_address_http = os.getenv("base_address_http")
         self.base_address_https = os.getenv("base_address_https")
+        self.base_browse_address = os.getenv("base_browse_address")
         accept_header = request.headers.get("accept")
         if not accept_header:
             raise ValueError("Failed to read the request headers")

kwg_api/lib/prefix_builder.py

@@ -54,7 +54,6 @@ def resolve_prefix(full_uri: str | URL, resource_id: str) -> str | None:
             # Split the resource out of the . It should look like
             # {base_address}/lod/resource/
             base_url = str(full_uri).split(resource_id)[0]
-
         except IndexError:
             logging.warning(
                 f"Failed to find a prefix for URI {full_uri}", exc_info=True