Authlib 1.7.0__tar.gz → 1.7.1__tar.gz

{authlib-1.7.0 → authlib-1.7.1}/Authlib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Authlib
-Version: 1.7.0
+Version: 1.7.1
 Summary: The ultimate Python library in building OAuth and OpenID Connect servers and clients.
 Author-email: Hsiaoming Yang <me@lepture.com>
 License: BSD-3-Clause

{authlib-1.7.0 → authlib-1.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Authlib
-Version: 1.7.0
+Version: 1.7.1
 Summary: The ultimate Python library in building OAuth and OpenID Connect servers and clients.
 Author-email: Hsiaoming Yang <me@lepture.com>
 License: BSD-3-Clause

{authlib-1.7.0 → authlib-1.7.1}/authlib/_joserfc_helpers.py

@@ -1,3 +1,4 @@
+import sys
 from typing import Any
 
 from joserfc.jwk import KeySet
@@ -5,16 +6,18 @@ from joserfc.jwk import import_key
 
 from authlib.common.encoding import json_loads
 from authlib.deprecate import deprecate
-from authlib.jose import ECKey
-from authlib.jose import OctKey
-from authlib.jose import OKPKey
-from authlib.jose import RSAKey
 
 
 def import_any_key(data: Any):
-    if isinstance(data, (OctKey, RSAKey, ECKey, OKPKey)):
-        deprecate("Please use joserfc to import keys.", version="2.0.0")
-        return import_key(data.as_dict(is_private=not data.public_only))
+    if "authlib.jose" in sys.modules:
+        from authlib.jose.rfc7518 import ECKey
+        from authlib.jose.rfc7518 import OctKey
+        from authlib.jose.rfc7518 import RSAKey
+        from authlib.jose.rfc8037 import OKPKey
+
+        if isinstance(data, (OctKey, RSAKey, ECKey, OKPKey)):
+            deprecate("Please use joserfc to import keys.", version="2.0.0")
+            return import_key(data.as_dict(is_private=not data.public_only))
 
     if (
         isinstance(data, str)

{authlib-1.7.0 → authlib-1.7.1}/authlib/consts.py

@@ -1,5 +1,5 @@
 name = "Authlib"
-version = "1.7.0"
+version = "1.7.1"
 author = "Hsiaoming Yang <me@lepture.com>"
 homepage = "https://authlib.org"
 default_user_agent = f"{name}/{version} (+{homepage})"

{authlib-1.7.0 → authlib-1.7.1}/authlib/oidc/core/grants/hybrid.py

@@ -49,19 +49,20 @@ class OpenIDHybridGrant(OpenIDImplicitGrant):
         raise NotImplementedError()
 
     def validate_authorization_request(self):
-        if not is_openid_scope(self.request.payload.scope):
-            raise InvalidScopeError(
-                "Missing 'openid' scope",
-                redirect_uri=self.request.payload.redirect_uri,
-                redirect_fragment=True,
-            )
         self.register_hook(
             "after_validate_authorization_request_payload",
             lambda grant, redirect_uri: validate_nonce(
                 grant.request, grant.exists_nonce, required=True
             ),
         )
-        return validate_code_authorization_request(self)
+        redirect_uri = validate_code_authorization_request(self)
+        if not is_openid_scope(self.request.payload.scope):
+            raise InvalidScopeError(
+                "Missing 'openid' scope",
+                redirect_uri=redirect_uri,
+                redirect_fragment=True,
+            )
+        return redirect_uri
 
     def create_granted_params(self, grant_user):
         self.request.user = grant_user

{authlib-1.7.0 → authlib-1.7.1}/authlib/oidc/core/grants/implicit.py

@@ -68,13 +68,13 @@ class OpenIDImplicitGrant(LegacyMixin, ImplicitGrant):
         return [client.get_client_id()]
 
     def validate_authorization_request(self):
+        redirect_uri = super().validate_authorization_request()
         if not is_openid_scope(self.request.payload.scope):
             raise InvalidScopeError(
                 "Missing 'openid' scope",
-                redirect_uri=self.request.payload.redirect_uri,
+                redirect_uri=redirect_uri,
                 redirect_fragment=True,
             )
-        redirect_uri = super().validate_authorization_request()
         try:
             validate_nonce(self.request, self.exists_nonce, required=True)
         except OAuth2Error as error: