swap to the new message instance included in pyop

Author: maxxiefjv

README.md

@@ -146,7 +146,7 @@ user data and OpenID Connect claim names. Hence the underlying data source must
 same names as the [standard claims of OpenID Connect](http://openid.net/specs/openid-connect-core-1_0.html#StandardClaims).
 
 ```python
-from oic.oic.message import AuthorizationRequest
+from pyop.message import AuthorizationRequest
 
 from pyop.util import should_fragment_encode
 

src/pyop/authz_state.py

@@ -3,8 +3,8 @@
 import uuid
 
 from oic.extension.message import TokenIntrospectionResponse
-from oic.oic.message import AuthorizationRequest
 
+from .message import AuthorizationRequest
 from .access_token import AccessToken
 from .exceptions import InvalidAccessToken
 from .exceptions import InvalidAuthorizationCode
@@ -80,7 +80,7 @@ def __init__(self, subject_identifier_factory, authorization_code_db=None, acces
         self.subject_identifiers = subject_identifier_db if subject_identifier_db is not None else {}
 
     def create_authorization_code(self, authorization_request, subject_identifier, scope=None):
-        # type: (oic.oic.message.AuthorizationRequest, str, Optional[List[str]]) -> str
+        # type: (AuthorizationRequest, str, Optional[List[str]]) -> str
         """
         Creates an authorization code bound to the authorization request and the authenticated user identified
         by the subject identifier.
@@ -106,7 +106,7 @@ def create_authorization_code(self, authorization_request, subject_identifier, s
         return authorization_code
 
     def create_access_token(self, authorization_request, subject_identifier, scope=None):
-        # type: (oic.oic.message.AuthorizationRequest, str, Optional[List[str]]) -> se_leg_op.access_token.AccessToken
+        # type: (AuthorizationRequest, str, Optional[List[str]]) -> se_leg_op.access_token.AccessToken
         """
         Creates an access token bound to the authentication request and the authenticated user identified by the
         subject identifier.
@@ -315,22 +315,22 @@ def get_user_id_for_subject_identifier(self, subject_identifier):
         raise InvalidSubjectIdentifier('{} unknown'.format(subject_identifier))
 
     def get_authorization_request_for_code(self, authorization_code):
-        # type: (str) -> oic.oic.message.AuthorizationRequest
+        # type: (str) -> AuthorizationRequest
         if authorization_code not in self.authorization_codes:
             raise InvalidAuthorizationCode('{} unknown'.format(authorization_code))
 
         return AuthorizationRequest().from_dict(
             self.authorization_codes[authorization_code][self.KEY_AUTHORIZATION_REQUEST])
 
     def get_authorization_request_for_access_token(self, access_token_value):
-        # type: (str) -> oic.oic.message.AuthorizationRequest
+        # type: (str) -> 
         if access_token_value not in self.access_tokens:
             raise InvalidAccessToken('{} unknown'.format(access_token_value))
 
         return AuthorizationRequest().from_dict(self.access_tokens[access_token_value][self.KEY_AUTHORIZATION_REQUEST])
 
     def get_subject_identifier_for_code(self, authorization_code):
-        # type: (str) -> oic.oic.message.AuthorizationRequest
+        # type: (str) -> AuthorizationRequest
         if authorization_code not in self.authorization_codes:
             raise InvalidAuthorizationCode('{} unknown'.format(authorization_code))
 

src/pyop/provider.py

@@ -83,7 +83,7 @@ def __init__(self, signing_key, configuration_information, authz_state, clients,
         self.userinfo = userinfo
         self.id_token_lifetime = id_token_lifetime
 
-        self.authentication_request_validators = []  # type: List[Callable[[oic.oic.message.AuthorizationRequest], Boolean]]
+        self.authentication_request_validators = []  # type: List[Callable[[AuthorizationRequest], Boolean]]
         self.authentication_request_validators.append(authorization_request_verify)
         self.authentication_request_validators.append(
             functools.partial(client_id_is_known, self))
@@ -116,7 +116,7 @@ def jwks(self):
         return {'keys': keys}
 
     def parse_authentication_request(self, request_body, http_headers=None):
-        # type: (str, Optional[Mapping[str, str]]) -> oic.oic.message.AuthorizationRequest
+        # type: (str, Optional[Mapping[str, str]]) -> AuthorizationRequest
         """
         Parses and verifies an authentication request.
 
@@ -132,7 +132,7 @@ def parse_authentication_request(self, request_body, http_headers=None):
         logger.debug('parsed authentication_request: %s', auth_req)
         return auth_req
 
-    def authorize(self, authentication_request,  # type: oic.oic.message.AuthorizationRequest
+    def authorize(self, authentication_request,  # type: AuthorizationRequest
                   user_id,  # type: str
                   extra_id_token_claims=None
                   # type: Optional[Union[Mapping[str, Union[str, List[str]]], Callable[[str, str], Mapping[str, Union[str, List[str]]]]]
@@ -218,7 +218,7 @@ def _create_subject_identifier(self, user_id, client_id, redirect_uri):
         return self.authz_state.get_subject_identifier(subject_type, user_id, sector_identifier)
 
     def _get_requested_claims_in(self, authentication_request, response_method):
-        # type (oic.oic.message.AuthorizationRequest, str) -> Mapping[str, Optional[Mapping[str, Union[str, List[str]]]]
+        # type (AuthorizationRequest, str) -> Mapping[str, Optional[Mapping[str, Union[str, List[str]]]]
         """
         Parses any claims requested using the 'claims' request parameter, see
         <a href="http://openid.net/specs/openid-connect-core-1_0.html#ClaimsParameter">
@@ -286,7 +286,7 @@ def _create_signed_id_token(self,
         return id_token.to_jwt([self.signing_key], alg)
 
     def _check_subject_identifier_matches_requested(self, authentication_request, sub):
-        # type (oic.message.AuthorizationRequest, str) -> None
+        # type (AuthorizationRequest, str) -> None
         """
         Verifies the subject identifier against any requested subject identifier using the claims request parameter.
         :param authentication_request: authentication request

tests/pyop/test_authz_state.py

@@ -4,8 +4,8 @@
 from unittest.mock import patch, Mock
 
 import pytest
-from oic.oic.message import AuthorizationRequest
 
+from pyop.message import AuthorizationRequest
 from pyop.authz_state import AccessToken, InvalidScope
 from pyop.authz_state import AuthorizationState
 from pyop.exceptions import InvalidSubjectIdentifier, InvalidAccessToken, InvalidAuthorizationCode, InvalidRefreshToken

tests/pyop/test_exceptions.py

@@ -1,7 +1,6 @@
 from urllib.parse import urlparse, parse_qsl
 
-from oic.oic.message import AuthorizationRequest
-
+from pyop.message import AuthorizationRequest
 from pyop.exceptions import InvalidAuthenticationRequest
 
 

tests/pyop/test_util.py

@@ -1,6 +1,6 @@
 import pytest
-from oic.oic.message import AuthorizationRequest
 
+from pyop.message import AuthorizationRequest
 from pyop.util import should_fragment_encode