Make auth slightly more robust

Author: chrisburr

src/diracx/client/_patch.py

@@ -9,6 +9,7 @@
 from datetime import datetime
 import json
 import requests
+import logging
 
 from pathlib import Path
 from typing import Any, Dict, List, Optional, cast
@@ -38,6 +39,9 @@ def patch_sdk():
     """
 
 
+logger = logging.getLogger(__name__)
+
+
 class DiracTokenCredential(TokenCredential):
     """Tailor get_token() for our context"""
 
@@ -98,12 +102,21 @@ def on_request(
             return
 
         if not self._token:
-            credentials = json.loads(self._credential.location.read_text())
-            self._token = self._credential.get_token(
-                "", refresh_token=credentials["refresh_token"]
-            )
-
-        request.http_request.headers["Authorization"] = f"Bearer {self._token.token}"
+            try:
+                credentials = json.loads(self._credential.location.read_text())
+            except Exception:
+                logger.warning(
+                    "Cannot load credentials from %s", self._credential.location
+                )
+            else:
+                self._token = self._credential.get_token(
+                    "", refresh_token=credentials["refresh_token"]
+                )
+
+        if self._token:
+            request.http_request.headers[
+                "Authorization"
+            ] = f"Bearer {self._token.token}"
 
 
 class DiracClient(DiracGenerated):
@@ -160,6 +173,7 @@ def refresh_token(
     )
 
     if response.status_code != 200:
+        location.unlink()
         raise RuntimeError(
             f"An issue occured while refreshing your access token: {response.json()['detail']}"
         )
@@ -192,24 +206,28 @@ def get_token(location: Path, token: AccessToken | None) -> AccessToken | None:
         raise RuntimeError("credentials are not set")
 
     # Load the existing credentials
-    if not token:
-        credentials = json.loads(location.read_text())
-        token = AccessToken(
-            cast(str, credentials.get("access_token")),
-            cast(int, credentials.get("expires_on")),
-        )
-
-    # We check the validity of the token
-    # If not valid, then return None to inform the caller that a new token
-    # is needed
-    if not is_token_valid(token):
-        return None
-
-    return token
+    try:
+        if not token:
+            credentials = json.loads(location.read_text())
+            token = AccessToken(
+                cast(str, credentials.get("access_token")),
+                cast(int, credentials.get("expires_on")),
+            )
+    except Exception:
+        logger.warning("Cannot load credentials from %s", location)
+        pass
+    else:
+        # We check the validity of the token
+        # If not valid, then return None to inform the caller that a new token
+        # is needed
+        if is_token_valid(token):
+            return token
+    return None
 
 
 def is_token_valid(token: AccessToken) -> bool:
     """Condition to get a new token"""
+    # TODO: Should we check against the userinfo endpoint?
     return (
         datetime.utcfromtimestamp(token.expires_on) - datetime.utcnow()
     ).total_seconds() > 300

src/diracx/client/aio/_patch.py

@@ -7,6 +7,7 @@
 Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize
 """
 import json
+import logging
 from types import TracebackType
 from pathlib import Path
 from typing import Any, List, Optional
@@ -24,6 +25,8 @@
     "DiracClient",
 ]  # Add all objects you want publicly available to users at this package level
 
+logger = logging.getLogger(__name__)
+
 
 def patch_sdk():
     """Do not remove from this file.
@@ -104,19 +107,29 @@ async def on_request(
         credentials: dict[str, Any]
 
         try:
+            # TODO: Use httpx and await this call
             self._token = get_token(self._credential.location, self._token)
         except RuntimeError:
             # If we are here, it means the credentials path does not exist
             # we suppose it is not needed to perform the request
             return
 
         if not self._token:
-            credentials = json.loads(self._credential.location.read_text())
-            self._token = await self._credential.get_token(
-                "", refresh_token=credentials["refresh_token"]
-            )
-
-        request.http_request.headers["Authorization"] = f"Bearer {self._token.token}"
+            try:
+                credentials = json.loads(self._credential.location.read_text())
+            except Exception:
+                logger.warning(
+                    "Cannot load credentials from %s", self._credential.location
+                )
+            else:
+                self._token = await self._credential.get_token(
+                    "", refresh_token=credentials["refresh_token"]
+                )
+
+        if self._token:
+            request.http_request.headers[
+                "Authorization"
+            ] = f"Bearer {self._token.token}"
 
 
 class DiracClient(DiracGenerated):