fix: Getting tokens from DiracX

chaen · Sep 28, 2023 · c65e933 · c65e933
1 parent 503fefc
commit c65e933
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/DIRAC/FrameworkSystem/Service/ProxyManagerHandler.py b/src/DIRAC/FrameworkSystem/Service/ProxyManagerHandler.py
@@ -426,13 +426,13 @@ def export_exchangeProxyForToken(self):
         vo = Registry.getVOForGroup(credDict["group"])
         dirac_properties = list(set(credDict.get("groupProperties", [])) | set(credDict.get("properties", [])))
         group = credDict["group"]
-        scopes = [f"vo:{vo}", f"group:{group}", [f"property:{prop}" for prop in dirac_properties]]
+        scopes = [f"vo:{vo}", f"group:{group}"] + [f"property:{prop}" for prop in dirac_properties]
 
         r = requests.get(
             f"{diracxUrl}/auth/legacy-exchange",
             params={
                 "preferred_username": credDict["username"],
-                "scopes": " ".join(scopes),
+                "scope": " ".join(scopes),
             },
             headers={"Authorization": f"Bearer {apiKey}"},
         )

diff --git a/tests/CI/docker-compose.yml b/tests/CI/docker-compose.yml
@@ -150,6 +150,8 @@ services:
       - DIRACX_CONFIG_BACKEND_URL=git+file:///cs_store/initialRepo
       - "DIRACX_DB_URL_AUTHDB=sqlite+aiosqlite:///:memory:"
       - DIRACX_DB_URL_JOBDB=mysql+aiomysql://Dirac:Dirac@mysql/JobDB
+      - DIRACX_DB_URL_JOBLOGGINGDB=mysql+aiomysql://Dirac:Dirac@mysql/JobLoggingDB
+      - DIRACX_DB_URL_SANDBOXMETADATADB=mysql+aiomysql://Dirac:Dirac@mysql/SandboxMetadataDB
       - DIRACX_SERVICE_AUTH_TOKEN_KEY=file:///signing-key/rs256.key
       - DIRACX_SERVICE_AUTH_ALLOWED_REDIRECTS=["http://diracx:8000/docs/oauth2-redirect"]
       # Obtained with echo 'InsecureChangeMe' | base64 -d | openssl sha512

diff --git a/tests/Jenkins/dirac_ci.sh b/tests/Jenkins/dirac_ci.sh
@@ -135,7 +135,7 @@ installSite() {
 
   echo "==> Done installing, now configuring"
   source "${SERVERINSTALLDIR}/bashrc"
-  if ! dirac-configure --cfg "${SERVERINSTALLDIR}/install.cfg" --LegacyExchangeApiKey='InsecureChangeMe' "${DEBUG}"; then
+  if ! dirac-configure --cfg "${SERVERINSTALLDIR}/install.cfg" --LegacyExchangeApiKey='diracx:legacy:InsecureChangeMe' "${DEBUG}"; then
     echo "ERROR: dirac-configure failed" >&2
     exit 1
   fi