feat: Follow upstream DiracX API changes for legacy-exchange

chrisburr · Oct 9, 2023 · 9bc6b2f · 9bc6b2f
1 parent 87af7fd
commit 9bc6b2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/DIRAC/FrameworkSystem/Service/ProxyManagerHandler.py b/src/DIRAC/FrameworkSystem/Service/ProxyManagerHandler.py
@@ -430,7 +430,7 @@ def export_exchangeProxyForToken(self):
 
         try:
             r = requests.get(
-                f"{diracxUrl}/auth/legacy-exchange",
+                f"{diracxUrl}/api/auth/legacy-exchange",
                 params={
                     "preferred_username": credDict["username"],
                     "scope": " ".join(scopes),

diff --git a/src/DIRAC/FrameworkSystem/Utilities/diracx.py b/src/DIRAC/FrameworkSystem/Utilities/diracx.py
@@ -42,7 +42,7 @@ def _get_token(credDict, diracxUrl, /) -> Path:
     scopes = [f"vo:{vo}", f"group:{group}"] + [f"property:{prop}" for prop in dirac_properties]
 
     r = requests.get(
-        f"{diracxUrl}/auth/legacy-exchange",
+        f"{diracxUrl}/api/auth/legacy-exchange",
         params={
             "preferred_username": credDict["username"],
             "scope": " ".join(scopes),
@@ -71,6 +71,8 @@ def TheImpersonator(credDict: dict[str, Any]) -> DiracClient:
     """
 
     diracxUrl = gConfig.getValue("/DiracX/URL")
+    if not diracxUrl:
+        raise ValueError("Missing mandatory /DiracX/URL configuration")
     token_location = _get_token(credDict, diracxUrl)
     pref = DiracxPreferences(url=diracxUrl, credentials_path=token_location)