Cater for client_id(=entity_id) in request being different from the one

assigned by the OP.

Author: rohe

setup.py

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

src/oidcendpoint/__init__.py

@@ -6,7 +6,7 @@
 except ImportError:
     import random as rnd
 
-__version__ = "0.12.1"
+__version__ = "0.12.2"
 
 
 DEF_SIGN_ALG = {

src/oidcendpoint/client_authn.py

@@ -205,7 +205,7 @@ def valid_client_info(cinfo):
 
 def verify_client(
         endpoint_context, request, authorization_info=None, get_client_id_from_token=None,
-        endpoint=None
+        endpoint=None, also_known_as=None
 ):
     """
     Initiated Guessing !
@@ -254,7 +254,12 @@ def verify_client(
         else:
             raise UnknownOrNoAuthnMethod(authorization_info)
 
-    client_id = auth_info.get("client_id")
+    if also_known_as:
+        client_id = also_known_as[auth_info.get("client_id")]
+        auth_info["client_id"] = client_id
+    else:
+        client_id = auth_info.get("client_id")
+
     _token = auth_info.get("token")
 
     if client_id:

src/oidcendpoint/endpoint.py

@@ -268,12 +268,9 @@ def client_authentication(self, request, auth=None, **kwargs):
         :return: client_id or raise an exception
         """
 
-        _endpoint = kwargs.get("endpoint")
-
         try:
             authn_info = verify_client(
-                self.endpoint_context, request, auth, self.get_client_id_from_token,
-                endpoint=_endpoint
+                self.endpoint_context, request, auth, self.get_client_id_from_token, **kwargs
             )
         except UnknownOrNoAuthnMethod:
             if self.client_authn_method is None:

src/oidcendpoint/oidc/registration.py

@@ -371,9 +371,11 @@ def client_registration_setup(self, request, new_id=True, set_secret=True):
         if new_id:
             # create new id och secret
             client_id = rndstr(12)
-            # cdb client_id MUT be unique!
+            # cdb client_id MUST be unique!
             while client_id in _context.cdb:
                 client_id = rndstr(12)
+            if "client_id" in request:
+                del request["client_id"]
         else:
             client_id = request.get("client_id")
             if not client_id: