fix url links with root-path

Author: vincentsarago

stac_fastapi/pgstac/models/links.py

@@ -51,7 +51,7 @@ def base_url(self):
     @property
     def url(self):
         """Get the current request url."""
-        return str(self.request.url)
+        return urljoin(str(self.request.base_url), str(self.request.url.path).lstrip("/"))
 
     def resolve(self, url):
         """Resolve url to the current request url."""
@@ -143,7 +143,7 @@ def link_next(self) -> Optional[Dict[str, Any]]:
                     "rel": Relations.next.value,
                     "type": MimeTypes.geojson.value,
                     "method": method,
-                    "href": str(self.request.url),
+                    "href": self.url,
                     "body": {**self.request.postbody, "token": f"next:{self.next}"},
                 }
 
@@ -167,7 +167,7 @@ def link_prev(self) -> Optional[Dict[str, Any]]:
                     "rel": Relations.previous.value,
                     "type": MimeTypes.geojson.value,
                     "method": method,
-                    "href": str(self.request.url),
+                    "href": self.url,
                     "body": {**self.request.postbody, "token": f"prev:{self.prev}"},
                 }
         return None

tests/api/test_links.py

@@ -60,7 +60,7 @@ async def collections(request: Request):
         base_url="http://stac.io",
         root_path=root_path,
     ) as client:
-        response = client.get(f"{endpoint_prefix}/search")
+        response = client.get(f"{prefix}/search")
         assert response.status_code == 200
         assert response.json()["url"] == url_prefix + "/search"
         assert response.json()["base_url"].rstrip("/") == url_prefix
@@ -71,7 +71,7 @@ async def collections(request: Request):
             assert link["href"].startswith(url_prefix)
         assert {"next", "previous", "root", "self"} == {link["rel"] for link in links}
 
-        response = client.post(f"{endpoint_prefix}/search", json={})
+        response = client.post(f"{prefix}/search", json={})
         assert response.status_code == 200
         assert response.json()["url"] == url_prefix + "/search"
         assert response.json()["base_url"].rstrip("/") == url_prefix
@@ -82,7 +82,7 @@ async def collections(request: Request):
             assert link["href"].startswith(url_prefix)
         assert {"next", "previous", "root", "self"} == {link["rel"] for link in links}
 
-        response = client.get(f"{endpoint_prefix}/collections")
+        response = client.get(f"{prefix}/collections")
         assert response.status_code == 200
         assert response.json()["url"] == url_prefix + "/collections"
         assert response.json()["base_url"].rstrip("/") == url_prefix

tests/conftest.py

@@ -1,4 +1,3 @@
-import asyncio
 import json
 import logging
 import os
@@ -62,11 +61,6 @@
 )
 
 
-@pytest.fixture(scope="session")
-def event_loop():
-    return asyncio.get_event_loop()
-
-
 @pytest.fixture(scope="session")
 def database(postgresql_proc):
     with DatabaseJanitor(