fix auth

Author: petercrocker

docker-compose.override.yml

@@ -18,6 +18,7 @@ services:
       - "8501:8501"
     environment:
       - INFRAHUB_ADDRESS=http://infrahub-server:8000
+      - INFRAHUB_API_TOKEN=${INFRAHUB_API_TOKEN:-06438eb2-8019-4776-878c-0941b1f1d1ec}
       - DEFAULT_BRANCH=main
       - GENERATOR_WAIT_TIME=60
     volumes:

service_catalog/Home.py

@@ -9,6 +9,7 @@
 from utils import (
     DEFAULT_BRANCH,
     INFRAHUB_ADDRESS,
+    INFRAHUB_API_TOKEN,
     InfrahubClient,
     display_error,
     display_logo,
@@ -42,7 +43,10 @@ def main() -> None:
     display_logo()
 
     # Initialize API client
-    client = InfrahubClient(st.session_state.infrahub_url)
+    client = InfrahubClient(
+        st.session_state.infrahub_url,
+        api_token=INFRAHUB_API_TOKEN or None
+    )
 
     # Page title
     st.title("Infrahub Service Catalog")

service_catalog/pages/1_Create_DC.py

@@ -13,6 +13,7 @@
     DEFAULT_BRANCH,
     GENERATOR_WAIT_TIME,
     INFRAHUB_ADDRESS,
+    INFRAHUB_API_TOKEN,
     InfrahubClient,
     display_error,
     display_logo,
@@ -598,7 +599,10 @@ def main() -> None:
                 }
 
                 # Initialize API client
-                client = InfrahubClient(st.session_state.infrahub_url)
+                client = InfrahubClient(
+                    st.session_state.infrahub_url,
+                    api_token=INFRAHUB_API_TOKEN or None
+                )
 
                 # Execute DC creation workflow
                 handle_dc_creation(client, form_data)

service_catalog/utils/__init__.py

@@ -7,6 +7,7 @@
     DEFAULT_BRANCH,
     GENERATOR_WAIT_TIME,
     INFRAHUB_ADDRESS,
+    INFRAHUB_API_TOKEN,
     STREAMLIT_PORT,
 )
 from .ui import (
@@ -22,6 +23,7 @@
 __all__ = [
     "InfrahubClient",
     "INFRAHUB_ADDRESS",
+    "INFRAHUB_API_TOKEN",
     "STREAMLIT_PORT",
     "DEFAULT_BRANCH",
     "GENERATOR_WAIT_TIME",

service_catalog/utils/api.py

@@ -39,14 +39,16 @@ def __init__(self, message: str, errors: List[Dict[str, Any]]):
 class InfrahubClient:
     """Client for interacting with the Infrahub API."""
 
-    def __init__(self, base_url: str, timeout: int = 30):
+    def __init__(self, base_url: str, api_token: Optional[str] = None, timeout: int = 30):
         """Initialize the Infrahub API client.
 
         Args:
             base_url: Base URL of the Infrahub instance (e.g., "http://localhost:8000")
+            api_token: Optional API token for authentication
             timeout: Request timeout in seconds (default: 30)
         """
         self.base_url = base_url.rstrip("/")
+        self.api_token = api_token
         self.timeout = timeout
         self.session = requests.Session()
 
@@ -409,6 +411,10 @@ def execute_graphql(
         url = f"{self.base_url}/graphql"
         headers = {"Content-Type": "application/json", "X-INFRAHUB-BRANCH": branch}
 
+        # Add authentication if API token is provided
+        if self.api_token:
+            headers["X-INFRAHUB-KEY"] = self.api_token
+
         payload: Dict[str, Any] = {"query": query}
         if variables:
             payload["variables"] = variables

service_catalog/utils/config.py

@@ -5,6 +5,7 @@
 
 # Load environment variables
 INFRAHUB_ADDRESS: Final[str] = os.getenv("INFRAHUB_ADDRESS", "http://localhost:8000")
+INFRAHUB_API_TOKEN: Final[str] = os.getenv("INFRAHUB_API_TOKEN", "")
 STREAMLIT_PORT: Final[int] = int(os.getenv("STREAMLIT_PORT", "8501"))
 DEFAULT_BRANCH: Final[str] = os.getenv("DEFAULT_BRANCH", "main")
 GENERATOR_WAIT_TIME: Final[int] = int(os.getenv("GENERATOR_WAIT_TIME", "60"))