fix: fixed bugs introduced in earlier releases

Author: atsareg

src/DIRAC/FrameworkSystem/Service/TokenManagerHandler.py

@@ -259,7 +259,7 @@ def export_getToken(
                     result = self.__checkProperties(dn, userGroup)
                     if result["OK"]:
                         # refresh token with requested scope
-                        result = idpObj.refreshToken(tokens.get("refresh_token"))
+                        result = idpObj.refreshToken(tokens.get("refresh_token"), group=userGroup, scope=scope)
                         if result["OK"]:
                             # caching new tokens
                             self.__tokensCache.add(

src/DIRAC/Resources/IdProvider/Utilities.py

@@ -39,7 +39,8 @@ def getIdProviderIdentifierFromIssuerAndClientID(issuer, clientID):
 
     for identifier in result["Value"]:
         testedClientID = gConfig.getValue(f"/Resources/IdProviders/{identifier}/client_id")
-        if testedClientID and testedClientID == clientID:
+        # clientID is not always available, e.g. in case of a token of particular user
+        if not clientID or (testedClientID and testedClientID == clientID):
             # Found the client ID but need to check the issuer
             # 2 different issuers could theoretically have a same client ID
             testedIssuer = gConfig.getValue(f"/Resources/IdProviders/{identifier}/issuer")