Use the get_client_id method to get client_id.

Author: rohe

Diff for: src/oidcrp/__init__.py

@@ -1,7 +1,7 @@
 import logging
 
 __author__ = 'Roland Hedberg'
-__version__ = '2.1.3'
+__version__ = '2.1.4'
 
 logger = logging.getLogger(__name__)
 

Diff for: src/oidcrp/client_auth.py

@@ -482,7 +482,7 @@ def _get_audience_and_algorithm(self, context, **kwargs):
 
     def _construct_client_assertion(self, service, **kwargs):
         _context = service.client_get("service_context")
-
+        _entity = service.client_get("entity")
         audience, algorithm = self._get_audience_and_algorithm(_context, **kwargs)
 
         if 'kid' in kwargs:
@@ -500,7 +500,7 @@ def _construct_client_assertion(self, service, **kwargs):
 
         # construct the signed JWT with the assertions and add
         # it as value to the 'client_assertion' claim of the request
-        return assertion_jwt(_context.client_id, signing_key, audience, algorithm, **_args)
+        return assertion_jwt(_entity.get_client_id(), signing_key, audience, algorithm, **_args)
 
     def modify_request(self, request, service, **kwargs):
         """

Diff for: src/oidcrp/entity.py

@@ -74,3 +74,9 @@ def get_service_by_endpoint_name(self, endpoint_name, *arg):
                 return service
 
         return None
+
+    def get_entity(self):
+        return self
+
+    def get_client_id(self):
+        return self._service_context.client_id

Diff for: src/oidcrp/rp_handler.py

@@ -277,7 +277,7 @@ def do_client_registration(self, client=None,
         # if _context.callback.get("post_logout_redirect_uri") is None:
         #     _context.callback["post_logout_redirect_uri"] = [self.base_url]
 
-        if not _context.client_id:  # means I have to do dynamic client registration
+        if not client.get_client_id():  # means I have to do dynamic client registration
             if request_args is None:
                 request_args = {}
 
@@ -514,7 +514,7 @@ def get_tokens(self, state, client: Optional[Client] = None):
             'state': state,
             'redirect_uri': authorization_request['redirect_uri'],
             'grant_type': 'authorization_code',
-            'client_id': _context.get('client_id'),
+            'client_id': client.get_client_id(),
             'client_secret': _context.get('client_secret')
         }
         logger.debug('request_args: {}'.format(req_args))
@@ -956,7 +956,7 @@ def backchannel_logout(client, request='', request_args=None):
 
     _context = client.client_get("service_context")
     kwargs = {
-        'aud': _context.get('client_id'),
+        'aud': client.get_client_id(),
         'iss': _context.get('issuer'),
         'keyjar': _context.keyjar,
         'allowed_sign_alg': _context.get('registration_response').get(

Diff for: src/oidcrp/service.py

@@ -460,9 +460,8 @@ def gather_verify_arguments(self,
             'verify': True
         }
 
-        _client_id = _context.client_id
-        if _client_id:
-            kwargs['client_id'] = _client_id
+        _entity = _context.client_get("entity")
+        kwargs['client_id'] = _entity.get_client_id()
 
         if self.service_name == "provider_info":
             if _context.issuer.startswith("http://"):

Diff for: tests/test_40_rp_handler_persistent.py

@@ -565,10 +565,10 @@ def test_userinfo_in_id_token(self):
         res = rph_1.begin(issuer_id='github')
         _session = rph_1.get_session_information(res['state'])
         client = rph_1.issuer2rp[_session['iss']]
-        _context = client.client_get("service_context")
+        #_context = client.client_get("service_context")
         _nonce = _session['auth_request']['nonce']
         _iss = _session['iss']
-        _aud = _context.client_id
+        _aud = client.get_client_id()
         idval = {
             'nonce': _nonce, 'sub': 'EndUserSubject', 'iss': _iss,
             'aud': _aud, 'given_name': 'Diana', 'family_name': 'Krall',