ensure token is forwarded in request to n-API (#132)

app/api/crud.py

@@ -45,6 +45,7 @@ async def get(
     pipeline_name: str,
     pipeline_version: str,
     node_urls: list[str],
+    token: str | None = None,
 ) -> dict:
     """
     Makes GET requests to one or more Neurobagel node APIs using send_get_request utility function where the parameters are Neurobagel query parameters.
@@ -75,6 +76,8 @@ async def get(
         Version of pipeline run on subject scans.
     node_urls : list[str]
         List of Neurobagel nodes to send the query to.
+    token : str, optional
+        Google ID token for authentication, by default None
 
     Returns
     -------
@@ -113,7 +116,7 @@ async def get(
         params["pipeline_version"] = pipeline_version
 
     tasks = [
-        util.send_get_request(node_url + "query", params)
+        util.send_get_request(node_url + "query", params, token)
         for node_url in node_urls
     ]
     responses = await asyncio.gather(*tasks, return_exceptions=True)

app/api/routers/query.py

@@ -76,6 +76,7 @@ async def get_query(
         query.pipeline_name,
         query.pipeline_version,
         query.node_url,
+        token,
     )
 
     if response_dict["errors"]:

app/api/utility.py

@@ -228,7 +228,10 @@ def validate_query_node_url_list(node_urls: list) -> list:
 
 
 async def send_get_request(
-    url: str, params: list = None, timeout: float = None
+    url: str,
+    params: list | None = None,
+    token: str | None = None,
+    timeout: float | None = None,
 ) -> dict:
     """
     Makes a GET request to one or more Neurobagel nodes.
@@ -239,6 +242,8 @@ async def send_get_request(
         URL of Neurobagel node API.
     params : list, optional
         Neurobagel query parameters, by default None.
+    token : str, optional
+        Authorization token for the request, by default None.
     timeout : float, optional
         Timeout for the request, by default None.
 
@@ -254,10 +259,15 @@ async def send_get_request(
         _description_
     """
     async with httpx.AsyncClient() as client:
+        headers = {
+            "Content-Type": "application/json",
+            **({"Authorization": f"Bearer {token}"} if token else {}),
+        }
         try:
             response = await client.get(
                 url=url,
                 params=params,
+                headers=headers,
                 timeout=timeout,
                 # Enable redirect following (off by default) so
                 # APIs behind a proxy can be reached