Editorial changes.

Removed unused parameters.
Changed get_ophash_by_cb_uri to use the provided url.

Author: rohe

example/flask_rp/views.py

@@ -1,6 +1,6 @@
 import logging
-import urllib
 from urllib.parse import parse_qs
+from urllib.parse import splitquery
 
 from flask import Blueprint
 from flask import current_app
@@ -67,7 +67,8 @@ def rp():
         except Exception as err:
             return make_response('Something went wrong:{}'.format(err), 400)
         else:
-            return redirect(result['url'], 303)
+            response = redirect(result['url'], 303)
+            return response
     else:
         _providers = current_app.rp_config.clients.keys()
         return render_template('opbyuid.html', providers=_providers)
@@ -150,10 +151,10 @@ def finalize(op_hash, request_args):
         return make_response(res['error'], 400)
 
 
-def get_ophash_by_cb_uri(url:str):
-    uri = urllib.parse.splitquery(request.url)[0]
+def get_ophash_by_cb_uri(url: str):
+    uri = splitquery(url)[0]
     clients = current_app.rp_config.clients
-    for k,v in clients.items():
+    for k, v in clients.items():
         for endpoint in ("redirect_uris",
                          "post_logout_redirect_uris",
                          "frontchannel_logout_uri",

src/oidcrp/oauth2/__init__.py

@@ -72,9 +72,7 @@ def __init__(self, client_authn_factory=None, keyjar=None, verify_ssl=True, conf
         # just ignore verify_ssl until it goes away
         self.verify_ssl = self.httpc_params.get("verify", True)
 
-    def do_request(self, request_type, response_body_type="", request_args=None,
-                   **kwargs):
-
+    def do_request(self, request_type, response_body_type="", request_args=None, **kwargs):
         _srv = self._service[request_type]
 
         _info = _srv.get_request_parameters(request_args=request_args, **kwargs)
@@ -137,6 +135,7 @@ def service_request(self, service, url, method="GET", body=None,
         The method that sends the request and handles the response returned.
         This assumes that the response arrives in the HTTP response.
 
+        :param service: The Service instance
         :param url: The URL to which the request should be sent
         :param method: Which HTTP method to use
         :param body: A message body if any

src/oidcrp/oauth2/add_on/dpop.py

@@ -85,20 +85,16 @@ def verify_header(self, dpop_header) -> Optional["DPoPProof"]:
 
 
 def dpop_header(service_context: ServiceContext,
-                request: Union[dict, Message],
                 service_endpoint: str,
                 http_method: str,
                 headers: Optional[dict] = None,
-                authn_method: Optional[str] = "",
                 **kwargs) -> dict:
     """
 
     :param service_context:
-    :param request:
     :param service_endpoint:
     :param http_method:
     :param headers:
-    :param authn_method:
     :param kwargs:
     :return:
     """
@@ -156,7 +152,8 @@ def add_support(services, signing_algorithms: Optional[list] = None):
     """
 
     _service = services["accesstoken"]
-    _service.client_get("service_context").add_on['dpop'] = {
+    _context = _service.client_get("service_context")
+    _context.add_on['dpop'] = {
         # "key": key_by_alg(signing_algorithm),
         "sign_algs": signing_algorithms
     }

src/oidcrp/rp_handler.py

@@ -488,8 +488,7 @@ def get_access_token(self, state, client: Optional[Client] = None):
         try:
             tokenresp = client.do_request(
                 'accesstoken', request_args=req_args,
-                authn_method=self.get_client_authn_method(client,
-                                                          "token_endpoint"),
+                authn_method=self.get_client_authn_method(client, "token_endpoint"),
                 state=state
             )
         except Exception as err:

tests/test_40_dpop.py

@@ -1,15 +1,11 @@
 import os
 
-import pytest
 from cryptojwt.jws.jws import factory
 from cryptojwt.key_jar import init_key_jar
+import pytest
 
-from oidcrp.client_auth import factory as ca_factory
 from oidcrp.oauth2 import Client
 from oidcrp.oauth2 import DEFAULT_OAUTH2_SERVICES
-from oidcrp.oauth2.add_on import do_add_ons
-from oidcrp.service import init_services
-from oidcrp.service_context import ServiceContext
 
 _dirname = os.path.dirname(os.path.abspath(__file__))
 
@@ -43,14 +39,14 @@ def create_client(self):
 
         self.client = Client(keyjar=CLI_KEY, config=config, services=DEFAULT_OAUTH2_SERVICES)
 
-        self.client.client_get("service_context").provider_info= {
+        self.client.client_get("service_context").provider_info = {
             "authorization_endpoint": "https://example.com/auth",
             "token_endpoint": "https://example.com/token",
             "dpop_signing_alg_values_supported": ["RS256", "ES256"]
         }
 
     def test_add_header(self):
-        token_serv = self.client.client_get("service","accesstoken")
+        token_serv = self.client.client_get("service", "accesstoken")
         req_args = {
             "grant_type": "authorization_code",
             "code": "SplxlOBeZQQYbYS6WxSbIA",