Refactoring

Author: rohe

src/oidcrp/oauth2/authorization.py

@@ -7,7 +7,7 @@
 from oidcmsg.time_util import time_sans_frac
 
 from oidcrp.oauth2.utils import get_state_parameter
-from oidcrp.oauth2.utils import pick_redirect_uris
+from oidcrp.oauth2.utils import pre_construct_pick_redirect_uri
 from oidcrp.oauth2.utils import set_state_parameter
 from oidcrp.service import Service
 
@@ -32,7 +32,7 @@ class Authorization(Service):
     def __init__(self, client_get, client_authn_factory=None, conf=None):
         Service.__init__(self, client_get,
                          client_authn_factory=client_authn_factory, conf=conf)
-        self.pre_construct.extend([pick_redirect_uris, set_state_parameter])
+        self.pre_construct.extend([pre_construct_pick_redirect_uri, set_state_parameter])
         self.post_construct.append(self.store_auth_request)
 
     def update_service_context(self, resp, key='', **kwargs):

src/oidcrp/oauth2/utils.py

@@ -1,6 +1,11 @@
 import logging
+from typing import Optional
+from typing import Union
 
 from oidcmsg.exception import MissingParameter
+from oidcmsg.message import Message
+
+from oidcrp.service import Service
 
 logger = logging.getLogger(__name__)
 
@@ -18,16 +23,13 @@ def get_state_parameter(request_args, kwargs):
     return _state
 
 
-def pick_redirect_uris(request_args=None, service=None, **kwargs):
-    """Pick one redirect_uri base on response_mode out of a list of such."""
-    _context = service.client_get("service_context")
-
+def pick_redirect_uri(context, request_args=None):
     if 'redirect_uri' in request_args:
         return request_args, {}
 
-    _callback = _context.callback
+    _callback = context.callback
     if _callback:
-        _response_type = request_args.get('response_type', _context.behaviour['response_types'][0])
+        _response_type = request_args.get('response_type', context.behaviour['response_types'][0])
         request_args['response_type'] = _response_type
 
         _response_mode = request_args.get('response_mode')
@@ -43,11 +45,18 @@ def pick_redirect_uris(request_args=None, service=None, **kwargs):
             f"pick_redirect_uris: response_type={_response_type}, response_mode={_response_mode}, "
             f"redirect_uri={request_args['redirect_uri']}")
     else:
-        request_args['redirect_uri'] = _context.redirect_uris[0]
+        request_args['redirect_uri'] = context.redirect_uris[0]
 
     return request_args, {}
 
 
+def pre_construct_pick_redirect_uri(request_args: Optional[Union[Message, dict]] = None,
+                                    service: Optional[Service] = None, **kwargs):
+    _context = service.client_get("service_context")
+    request_args["redirect_uri"] = pick_redirect_uri(_context, request_args)
+    return request_args, {}
+
+
 def set_state_parameter(request_args=None, **kwargs):
     """Assigned a state value."""
     request_args['state'] = get_state_parameter(request_args, kwargs)

src/oidcrp/oidc/authorization.py

@@ -8,7 +8,7 @@
 
 from oidcrp.exception import ParameterError
 from oidcrp.oauth2 import authorization
-from oidcrp.oauth2.utils import pick_redirect_uris
+from oidcrp.oauth2.utils import pre_construct_pick_redirect_uri
 from oidcrp.oidc import IDT2REG
 from oidcrp.oidc.utils import construct_request_uri
 from oidcrp.oidc.utils import request_object_encryption
@@ -28,7 +28,7 @@ def __init__(self, client_get, client_authn_factory=None, conf=None):
         authorization.Authorization.__init__(self, client_get,
                                              client_authn_factory, conf=conf)
         self.default_request_args = {'scope': ['openid']}
-        self.pre_construct = [self.set_state, pick_redirect_uris,
+        self.pre_construct = [self.set_state, pre_construct_pick_redirect_uri,
                               self.oidc_pre_construct]
         self.post_construct = [self.oidc_post_construct]
 

src/oidcrp/rp_handler.py

@@ -28,6 +28,7 @@
 from .defaults import DEFAULT_RP_KEY_DEFS
 from .exception import OidcServiceError
 from .oauth2 import Client
+from .oauth2.utils import pick_redirect_uri
 from .util import add_path
 from .util import dynamic_provider_info_discovery
 from .util import load_registration_response
@@ -386,15 +387,6 @@ def _get_response_type(self, context, req_args: Optional[dict] = None):
         else:
             return context.get('behaviour')['response_types'][0]
 
-    def _pick_redirect_uri(self, context, response_type: str):
-        _callbacks = context.get("callbacks")
-        if response_type == ["code"]:
-            return _callbacks["code"]
-        elif response_type == ["form_post"]:
-            return _callbacks["formpost"]
-        else:
-            return _callbacks["implicit"]
-
     def init_authorization(self, client=None, state='', req_args=None, behaviour_args=None):
         """
         Constructs the URL that will redirect the user to the authorization
@@ -417,7 +409,7 @@ def init_authorization(self, client=None, state='', req_args=None, behaviour_arg
         _nonce = rndstr(24)
         _response_type = self._get_response_type(_context, req_args)
         request_args = {
-            'redirect_uri': self._pick_redirect_uri(_context, _response_type),
+            'redirect_uri': pick_redirect_uri(_context, _response_type),
             'scope': _context.get('behaviour')['scope'],
             'response_type': _response_type,
             'nonce': _nonce