Merge pull request #7078 from chrisburr/fix-authlib

[v8r0] Support Authlib v1.2.1

Author: fstagni

src/DIRAC/FrameworkSystem/private/authorization/AuthServer.py

@@ -5,7 +5,7 @@
 from dominate import tags as dom
 
 from authlib.jose import JsonWebKey, jwt
-from authlib.oauth2 import HttpRequest, AuthorizationServer as _AuthorizationServer
+from authlib.oauth2 import AuthorizationServer as _AuthorizationServer
 from authlib.oauth2.base import OAuth2Error
 from authlib.oauth2.rfc7636 import CodeChallenge
 from authlib.oauth2.rfc6749.util import scope_to_list, list_to_scope
@@ -34,6 +34,11 @@
 from DIRAC.FrameworkSystem.private.authorization.grants.DeviceFlow import DeviceAuthorizationEndpoint, DeviceCodeGrant
 from DIRAC.FrameworkSystem.private.authorization.grants.AuthorizationCode import AuthorizationCodeGrant
 
+try:
+    from authlib.oauth2 import JsonRequest
+except ImportError:
+    from authlib.oauth2 import HttpRequest as JsonRequest
+
 sLog = gLogger.getSubLogger(__name__)
 
 
@@ -326,7 +331,7 @@ def create_oauth2_request(self, request, method_cls=OAuth2Request, use_json=Fals
 
     def create_json_request(self, request):
         """Parse request. Rewrite authlib method."""
-        return self.create_oauth2_request(request, HttpRequest, True)
+        return self.create_oauth2_request(request, JsonRequest, True)
 
     def validate_requested_scope(self, scope, state=None):
         """See :func:`authlib.oauth2.rfc6749.authorization_server.validate_requested_scope`"""

src/DIRAC/FrameworkSystem/private/authorization/utils/Requests.py

@@ -4,7 +4,7 @@
 from authlib.common.encoding import to_unicode
 from authlib.oauth2 import OAuth2Request as _OAuth2Request
 from authlib.oauth2.rfc6749.util import scope_to_list
-from urllib.parse import quote
+from urllib.parse import quote, urlparse
 
 
 class OAuth2Request(_OAuth2Request):
@@ -19,6 +19,7 @@ def addScopes(self, scopes):
 
     def setQueryArguments(self, **kwargs):
         """Set query arguments"""
+        query = self.query = urlparse(self.uri).query
         for k in kwargs:
             # Quote value before add it to request query
             value = (
@@ -39,7 +40,8 @@ def path(self):
 
         :return: str
         """
-        return self.uri.replace("?%s" % (self.query or ""), "")
+        query = urlparse(self.uri).query
+        return self.uri.replace("?%s" % (query or ""), "")
 
     @property
     def groups(self):