Merge pull request #33 from EO-DataHub/patch/32-server-responds-with-a-500-if-the-airbus-api-key-is-invalid

bug: adds error handling when accessing Airbus API with invalid key

Author: GeoSpark

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.1.26 (2025-10-23)
+
+Improved Airbus country code response when an invalid token is provided
+
 ## v0.1.25 (2025-07-01)
 
 - Geometry for ordered items are clipped by an AOI if provided

resource_catalogue_fastapi/airbus_client.py

@@ -60,7 +60,17 @@ def validate_country_code(self, country_code: str):
         access_token = self.generate_access_token()
         headers = {"Authorization": f"Bearer {access_token}"}
         properties_response = requests.get(url, headers=headers)
-        properties = properties_response.json().get("properties")
+
+        if properties_response.status_code != 200:
+            try:
+                j = properties_response.json()
+            except requests.exceptions.JSONDecodeError:
+                j = {"message": "Unknown error"}
+
+            message = j.get("message", "Unknown error")
+            raise HTTPException(status_code=400, detail=message)
+
+        properties = properties_response.json().get("properties", [])
 
         countries = next((prop["values"] for prop in properties if prop["key"] == "countries"), [])
         country_ids = [country["id"] for country in countries]