Removed dependencies on oidcservice.

Author: rohe

setup.py

@@ -66,8 +66,7 @@ def run_tests(self):
         'quality': ['pylama', 'isort', 'eradicate', 'mypy', 'black', 'bandit'],
     },
     install_requires=[
-        "oidcmsg>=0.6.3",
-        "oidcservice>=0.6.3",
+        "oidcmsg>=0.6.5",
         "cryptojwt>=0.7.0",
         "jinja2",
         "pyyaml",

src/oidcendpoint/exception.py

@@ -73,3 +73,12 @@ class ProcessError(OidcEndpointError):
 
 class ServiceError(OidcEndpointError):
     pass
+
+
+class InvalidRequest(OidcEndpointError):
+    pass
+
+
+class CapabilitiesMisMatch(OidcEndpointError):
+    pass
+

src/oidcendpoint/oauth2/authorization.py

@@ -13,7 +13,6 @@
 from oidcmsg.oauth2 import AuthorizationRequest
 from oidcmsg.oidc import AuthorizationResponse
 from oidcmsg.oidc import verified_claim_name
-from oidcservice.exception import InvalidRequest
 
 from oidcendpoint import rndstr
 from oidcendpoint import sanitize
@@ -29,6 +28,7 @@
 from oidcendpoint.cookie import compute_session_state
 from oidcendpoint.cookie import new_cookie
 from oidcendpoint.endpoint import Endpoint
+from oidcendpoint.exception import InvalidRequest
 from oidcendpoint.exception import NoSuchAuthentication
 from oidcendpoint.exception import RedirectURIError
 from oidcendpoint.exception import ServiceError

src/oidcendpoint/oidc/authorization.py

@@ -15,7 +15,6 @@
 from oidcmsg.oauth2 import AuthorizationRequest
 from oidcmsg.oidc import AuthorizationResponse
 from oidcmsg.oidc import verified_claim_name
-from oidcservice.exception import InvalidRequest
 
 from oidcendpoint import rndstr
 from oidcendpoint import sanitize
@@ -31,6 +30,7 @@
 from oidcendpoint.cookie import compute_session_state
 from oidcendpoint.cookie import new_cookie
 from oidcendpoint.endpoint import Endpoint
+from oidcendpoint.exception import InvalidRequest
 from oidcendpoint.exception import NoSuchAuthentication
 from oidcendpoint.exception import RedirectURIError
 from oidcendpoint.exception import ServiceError

src/oidcendpoint/oidc/registration.py

@@ -16,12 +16,12 @@
 from oidcmsg.oidc import RegistrationRequest
 from oidcmsg.oidc import RegistrationResponse
 from oidcmsg.time_util import utc_time_sans_frac
-from oidcservice import sanitize
-from oidcservice.exception import CapabilitiesMisMatch
 
 from oidcendpoint import rndstr
+from oidcendpoint import sanitize
 from oidcendpoint.cookie import new_cookie
 from oidcendpoint.endpoint import Endpoint
+from oidcendpoint.exception import CapabilitiesMisMatch
 from oidcendpoint.exception import InvalidRedirectURIError
 from oidcendpoint.exception import InvalidSectorIdentifier
 

src/oidcendpoint/userinfo.py

@@ -1,8 +1,8 @@
 import logging
 
-from oidcservice import sanitize
 from oidcmsg.oidc import Claims
 
+from oidcendpoint import sanitize
 from oidcendpoint.exception import FailedAuthentication
 from oidcendpoint.user_info import scope2claims
 

tests/test_24_oauth2_authorization_endpoint.py

@@ -19,7 +19,6 @@
 from oidcmsg.oauth2 import AuthorizationRequest
 from oidcmsg.oauth2 import AuthorizationResponse
 from oidcmsg.time_util import in_a_while
-from oidcservice.exception import InvalidRequest
 
 from oidcendpoint.common.authorization import FORM_POST
 from oidcendpoint.common.authorization import create_authn_response
@@ -29,6 +28,7 @@
 from oidcendpoint.common.authorization import verify_uri
 from oidcendpoint.cookie import CookieDealer
 from oidcendpoint.endpoint_context import EndpointContext
+from oidcendpoint.exception import InvalidRequest
 from oidcendpoint.exception import NoSuchAuthentication
 from oidcendpoint.exception import RedirectURIError
 from oidcendpoint.exception import ToOld

tests/test_24_oidc_authorization_endpoint.py

@@ -23,12 +23,12 @@
 from oidcmsg.oidc import verified_claim_name
 from oidcmsg.oidc import verify_id_token
 from oidcmsg.time_util import in_a_while
-from oidcservice.exception import InvalidRequest
 
 from oidcendpoint.common.authorization import join_query
 from oidcendpoint.common.authorization import verify_uri
 from oidcendpoint.cookie import CookieDealer
 from oidcendpoint.endpoint_context import EndpointContext
+from oidcendpoint.exception import InvalidRequest
 from oidcendpoint.exception import NoSuchAuthentication
 from oidcendpoint.exception import RedirectURIError
 from oidcendpoint.exception import ToOld