Skip to content

Commit 7534fd0

Browse files
committed
fix: Support Authlib v1.2.1
1 parent 2113fec commit 7534fd0

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from dominate import tags as dom
66

77
from authlib.jose import JsonWebKey, jwt
8-
from authlib.oauth2 import HttpRequest, AuthorizationServer as _AuthorizationServer
8+
from authlib.oauth2 import AuthorizationServer as _AuthorizationServer
99
from authlib.oauth2.base import OAuth2Error
1010
from authlib.oauth2.rfc7636 import CodeChallenge
1111
from authlib.oauth2.rfc6749.util import scope_to_list, list_to_scope
@@ -34,6 +34,11 @@
3434
from DIRAC.FrameworkSystem.private.authorization.grants.DeviceFlow import DeviceAuthorizationEndpoint, DeviceCodeGrant
3535
from DIRAC.FrameworkSystem.private.authorization.grants.AuthorizationCode import AuthorizationCodeGrant
3636

37+
try:
38+
from authlib.oauth2 import JsonRequest
39+
except ImportError:
40+
from authlib.oauth2 import HttpRequest as JsonRequest
41+
3742
sLog = gLogger.getSubLogger(__name__)
3843

3944

@@ -326,7 +331,7 @@ def create_oauth2_request(self, request, method_cls=OAuth2Request, use_json=Fals
326331

327332
def create_json_request(self, request):
328333
"""Parse request. Rewrite authlib method."""
329-
return self.create_oauth2_request(request, HttpRequest, True)
334+
return self.create_oauth2_request(request, JsonRequest, True)
330335

331336
def validate_requested_scope(self, scope, state=None):
332337
"""See :func:`authlib.oauth2.rfc6749.authorization_server.validate_requested_scope`"""

0 commit comments

Comments
 (0)