Ran black and isort.

Author: rohe

src/idpyoidc/claims.py

@@ -155,7 +155,7 @@ def handle_keys(self, configuration: dict, keyjar: Optional[KeyJar] = None):
         return {"keyjar": keyjar, "jwks": _jwks, "jwks_uri": _jwks_uri}
 
     def load_conf(
-            self, configuration: dict, supports: dict, keyjar: Optional[KeyJar] = None
+        self, configuration: dict, supports: dict, keyjar: Optional[KeyJar] = None
     ) -> KeyJar:
         for attr, val in configuration.items():
             if attr in ["preference", "capabilities"]:
@@ -212,4 +212,3 @@ def get_claim(self, key, default=None):
             return default
         else:
             return _val
-

src/idpyoidc/client/claims/oidc.py

@@ -95,15 +95,15 @@ def __init__(self, prefer: Optional[dict] = None, callback_path: Optional[dict]
 
     def verify_rules(self, supports):
         if self.get_preference("request_parameter_supported") and self.get_preference(
-                "request_uri_parameter_supported"
+            "request_uri_parameter_supported"
         ):
             raise ValueError(
                 "You have to chose one of 'request_parameter_supported' and "
                 "'request_uri_parameter_supported'. You can't have both."
             )
 
         if self.get_preference("request_parameter_supported") or self.get_preference(
-                "request_uri_parameter_supported"
+            "request_uri_parameter_supported"
         ):
             if not self.get_preference("request_object_signing_alg_values_supported"):
                 self.set_preference(

src/idpyoidc/client/client_auth.py

@@ -12,14 +12,15 @@
 
 from idpyoidc.defaults import DEF_SIGN_ALG
 from idpyoidc.defaults import JWT_BEARER
-from idpyoidc.message.oauth2 import AccessTokenRequest
 from idpyoidc.message.oauth2 import SINGLE_OPTIONAL_STRING
+from idpyoidc.message.oauth2 import AccessTokenRequest
 from idpyoidc.message.oidc import AuthnToken
 from idpyoidc.time_util import utc_time_sans_frac
 from idpyoidc.util import rndstr
-from .util import sanitize
+
 from ..message import VREQUIRED
 from ..util import instantiate
+from .util import sanitize
 
 # from idpyoidc.oidc.backchannel_authentication import ClientNotificationAuthn
 

src/idpyoidc/client/configure.py

@@ -7,6 +7,7 @@
 
 from idpyoidc.configure import Base
 from idpyoidc.logging import configure_logging
+
 from .util import lower_or_upper
 
 try:

src/idpyoidc/client/entity.py

@@ -141,7 +141,7 @@ def __init__(
                 keyjar=self.keyjar,
                 upstream_get=self.unit_get,
                 client_type=client_type,
-                entity_id=self.entity_id
+                entity_id=self.entity_id,
             )
 
         self.setup_client_authn_methods(config)

src/idpyoidc/client/http.py

@@ -4,10 +4,10 @@
 from http.cookies import CookieError
 from http.cookies import SimpleCookie
 
-from requests import request
 from idpyoidc.client.exception import NonFatalException
 from idpyoidc.client.util import sanitize
 from idpyoidc.client.util import set_cookie
+from requests import request
 
 __author__ = "roland"
 

src/idpyoidc/client/oauth2/__init__.py

@@ -5,22 +5,22 @@
 from typing import Union
 
 from cryptojwt.key_jar import KeyJar
-from requests import request
 
 from idpyoidc.client.entity import Entity
 from idpyoidc.client.exception import ConfigurationError
 from idpyoidc.client.exception import OidcServiceError
 from idpyoidc.client.exception import ParseError
 from idpyoidc.client.service import REQUEST_INFO
-from idpyoidc.client.service import Service
 from idpyoidc.client.service import SUCCESSFUL
+from idpyoidc.client.service import Service
 from idpyoidc.client.util import do_add_ons
 from idpyoidc.client.util import get_deserialization_method
 from idpyoidc.configure import Configuration
 from idpyoidc.context import OidcContext
 from idpyoidc.exception import FormatError
 from idpyoidc.message import Message
 from idpyoidc.message.oauth2 import is_error_message
+from requests import request
 
 __author__ = "Roland Hedberg"
 
@@ -38,20 +38,20 @@ class Client(Entity):
     client_type = "oauth2"
 
     def __init__(
-            self,
-            keyjar: Optional[KeyJar] = None,
-            config: Optional[Union[dict, Configuration]] = None,
-            services: Optional[dict] = None,
-            httpc: Optional[Callable] = None,
-            httpc_params: Optional[dict] = None,
-            context: Optional[OidcContext] = None,
-            upstream_get: Optional[Callable] = None,
-            key_conf: Optional[dict] = None,
-            entity_id: Optional[str] = "",
-            verify_ssl: Optional[bool] = True,
-            jwks_uri: Optional[str] = "",
-            client_type: Optional[str] = "",
-            **kwargs
+        self,
+        keyjar: Optional[KeyJar] = None,
+        config: Optional[Union[dict, Configuration]] = None,
+        services: Optional[dict] = None,
+        httpc: Optional[Callable] = None,
+        httpc_params: Optional[dict] = None,
+        context: Optional[OidcContext] = None,
+        upstream_get: Optional[Callable] = None,
+        key_conf: Optional[dict] = None,
+        entity_id: Optional[str] = "",
+        verify_ssl: Optional[bool] = True,
+        jwks_uri: Optional[str] = "",
+        client_type: Optional[str] = "",
+        **kwargs
     ):
         """
 
@@ -73,7 +73,7 @@ def __init__(
 
         if client_type:
             self.client_type = client_type
-        elif config and 'client_type' in config:
+        elif config and "client_type" in config:
             client_type = self.client_type = config["client_type"]
         else:
             client_type = self.client_type
@@ -85,7 +85,7 @@ def __init__(
             else:
                 httpc_params = {"verify": False}
 
-        jwks_uri = jwks_uri or config.get('jwks_uri', '')
+        jwks_uri = jwks_uri or config.get("jwks_uri", "")
 
         Entity.__init__(
             self,
@@ -113,12 +113,12 @@ def __init__(
             do_add_ons(_add_ons, self._service)
 
     def do_request(
-            self,
-            request_type: str,
-            response_body_type: Optional[str] = "",
-            request_args: Optional[dict] = None,
-            behaviour_args: Optional[dict] = None,
-            **kwargs
+        self,
+        request_type: str,
+        response_body_type: Optional[str] = "",
+        request_args: Optional[dict] = None,
+        behaviour_args: Optional[dict] = None,
+        **kwargs
     ):
         _srv = self._service[request_type]
 
@@ -141,14 +141,14 @@ def set_client_id(self, client_id):
         self.get_context().set("client_id", client_id)
 
     def get_response(
-            self,
-            service: Service,
-            url: str,
-            method: Optional[str] = "GET",
-            body: Optional[dict] = None,
-            response_body_type: Optional[str] = "",
-            headers: Optional[dict] = None,
-            **kwargs
+        self,
+        service: Service,
+        url: str,
+        method: Optional[str] = "GET",
+        body: Optional[dict] = None,
+        response_body_type: Optional[str] = "",
+        headers: Optional[dict] = None,
+        **kwargs
     ):
         """
 
@@ -184,14 +184,14 @@ def get_response(
         return self.parse_request_response(service, resp, response_body_type, **kwargs)
 
     def service_request(
-            self,
-            service: Service,
-            url: str,
-            method: Optional[str] = "GET",
-            body: Optional[dict] = None,
-            response_body_type: Optional[str] = "",
-            headers: Optional[dict] = None,
-            **kwargs
+        self,
+        service: Service,
+        url: str,
+        method: Optional[str] = "GET",
+        body: Optional[dict] = None,
+        response_body_type: Optional[str] = "",
+        headers: Optional[dict] = None,
+        **kwargs
     ) -> Message:
         """
         The method that sends the request and handles the response returned.
@@ -320,10 +320,10 @@ def dynamic_provider_info_discovery(client: Client, behaviour_args: Optional[dic
     :param client: A :py:class:`idpyoidc.client.oidc.Client` instance
     """
 
-    if client.client_type == 'oidc' and client.get_service("provider_info"):
-        service = 'provider_info'
-    elif client.client_type == 'oauth2' and client.get_service('server_metadata'):
-        service = 'server_metadata'
+    if client.client_type == "oidc" and client.get_service("provider_info"):
+        service = "provider_info"
+    elif client.client_type == "oauth2" and client.get_service("server_metadata"):
+        service = "server_metadata"
     else:
         raise ConfigurationError("Can not do dynamic provider info discovery")
 

src/idpyoidc/client/oauth2/access_token.py

@@ -7,8 +7,8 @@
 from idpyoidc.client.service import Service
 from idpyoidc.message import oauth2
 from idpyoidc.message.oauth2 import ResponseMessage
-from idpyoidc.time_util import time_sans_frac
 from idpyoidc.metadata import get_signing_algs
+from idpyoidc.time_util import time_sans_frac
 
 LOGGER = logging.getLogger(__name__)
 

src/idpyoidc/client/oauth2/add_on/dpop.py

@@ -4,16 +4,16 @@
 from typing import Optional
 
 from cryptojwt.jwk.jwk import key_from_jwk_dict
-from cryptojwt.jws.jws import factory
 from cryptojwt.jws.jws import JWS
+from cryptojwt.jws.jws import factory
 from cryptojwt.key_bundle import key_by_alg
 
 from idpyoidc.client.service_context import ServiceContext
-from idpyoidc.message import Message
 from idpyoidc.message import SINGLE_OPTIONAL_STRING
 from idpyoidc.message import SINGLE_REQUIRED_INT
 from idpyoidc.message import SINGLE_REQUIRED_JSON
 from idpyoidc.message import SINGLE_REQUIRED_STRING
+from idpyoidc.message import Message
 from idpyoidc.metadata import get_signing_algs
 from idpyoidc.time_util import utc_time_sans_frac
 
@@ -91,13 +91,13 @@ def verify_header(self, dpop_header) -> Optional["DPoPProof"]:
 
 
 def dpop_header(
-        service_context: ServiceContext,
-        service_endpoint: str,
-        http_method: str,
-        headers: Optional[dict] = None,
-        token: Optional[str] = "",
-        nonce: Optional[str] = "",
-        **kwargs
+    service_context: ServiceContext,
+    service_endpoint: str,
+    http_method: str,
+    headers: Optional[dict] = None,
+    token: Optional[str] = "",
+    nonce: Optional[str] = "",
+    **kwargs
 ) -> dict:
     """
 

src/idpyoidc/client/oauth2/add_on/jar.py

@@ -1,9 +1,8 @@
 import logging
 from typing import Optional
 
-from idpyoidc import metadata
-
 from idpyoidc import claims
+from idpyoidc import metadata
 from idpyoidc.client.oidc.utils import construct_request_uri
 from idpyoidc.client.oidc.utils import request_object_encryption
 from idpyoidc.message.oidc import make_openid_request