Local name change to differentiate between variable.

Author: rohe

src/oidcendpoint/endpoint.py

@@ -85,21 +85,21 @@ def assign_algorithms(typ):
         return jwe.SUPPORTED["enc"]
 
 
-def construct_provider_info(default_capabilities, **kwargs):
+def construct_endpoint_info(default_capabilities, **kwargs):
     if default_capabilities is not None:
-        provider_info = {}
+        _info = {}
         for attr, default_val in default_capabilities.items():
             try:
                 _proposal = kwargs[attr]
             except KeyError:
                 if default_val is not None:
-                    provider_info[attr] = default_val
+                    _info[attr] = default_val
                 elif "signing_alg_values_supported" in attr:
-                    provider_info[attr] = assign_algorithms("signing_alg")
+                    _info[attr] = assign_algorithms("signing_alg")
                 elif "encryption_alg_values_supported" in attr:
-                    provider_info[attr] = assign_algorithms("encryption_alg")
+                    _info[attr] = assign_algorithms("encryption_alg")
                 elif "encryption_enc_values_supported" in attr:
-                    provider_info[attr] = assign_algorithms("encryption_enc")
+                    _info[attr] = assign_algorithms("encryption_enc")
             else:
                 _permitted = None
 
@@ -117,8 +117,8 @@ def construct_provider_info(default_capabilities, **kwargs):
                         )
                     )
 
-                provider_info[attr] = _proposal
-        return provider_info
+                _info[attr] = _proposal
+        return _info
     else:
         return None
 
@@ -165,7 +165,7 @@ def __init__(self, endpoint_context, **kwargs):
                     "client_authn_method"
                 ]
 
-        self.provider_info = construct_provider_info(
+        self.endpoint_info = construct_endpoint_info(
             self.default_capabilities, **kwargs
         )
 

src/oidcendpoint/endpoint_context.py

@@ -324,15 +324,12 @@ def do_endpoints(self):
         _cap = self.conf.get("capabilities", {})
 
         for endpoint, endpoint_instance in self.endpoint.items():
-            if endpoint_instance.provider_info:
-                _cap.update(endpoint_instance.provider_info)
+            if endpoint_instance.endpoint_info:
+                _cap.update(endpoint_instance.endpoint_info)
 
-            if endpoint in ["webfinger", "provider_info"]:
+            if endpoint in ["webfinger", "provider_config"]:
                 continue
 
-            if endpoint_instance.endpoint_name:
-                _cap[endpoint_instance.endpoint_name] = endpoint_instance.full_path
-
         return _cap
 
     def do_authz(self):

src/oidcendpoint/id_token.py

@@ -3,7 +3,7 @@
 from cryptojwt.jws.utils import left_hash
 from cryptojwt.jwt import JWT
 
-from oidcendpoint.endpoint import construct_provider_info
+from oidcendpoint.endpoint import construct_endpoint_info
 from oidcendpoint.userinfo import collect_user_info
 from oidcendpoint.userinfo import userinfo_in_id_token_claims
 
@@ -113,7 +113,7 @@ def __init__(self, endpoint_context, **kwargs):
         self.endpoint_context = endpoint_context
         self.kwargs = kwargs
         self.scope_to_claims = None
-        self.provider_info = construct_provider_info(
+        self.provider_info = construct_endpoint_info(
             self.default_capabilities, **kwargs
         )
 

src/oidcendpoint/oidc/token.py

@@ -32,7 +32,7 @@ def __init__(self, endpoint_context, **kwargs):
         Endpoint.__init__(self, endpoint_context, **kwargs)
         self.post_parse_request.append(self._post_parse_request)
         if "client_authn_method" in kwargs:
-            self.provider_info["token_endpoint_auth_methods_supported"] = kwargs[
+            self.endpoint_info["token_endpoint_auth_methods_supported"] = kwargs[
                 "client_authn_method"
             ]
 

src/oidcendpoint/util.py

@@ -75,9 +75,9 @@ def build_endpoints(conf, endpoint_context, client_authn_method, issuer):
 
         if _instance.endpoint_name:
             try:
-                _instance.provider_info[_instance.endpoint_name] = _instance.full_path
+                _instance.endpoint_info[_instance.endpoint_name] = _instance.full_path
             except TypeError:
-                _instance.provider_info = {_instance.endpoint_name: _instance.full_path}
+                _instance.endpoint_info = {_instance.endpoint_name: _instance.full_path}
 
         endpoint[_instance.name] = _instance
 

tests/test_24_oidc_authorization_endpoint.py

@@ -74,7 +74,7 @@
         "implicit",
         "urn:ietf:params:oauth:grant-type:jwt-bearer",
         "refresh_token",
-    ],
+    ]
 }
 
 CLAIMS = {"id_token": {"given_name": {"essential": True}, "nickname": None}}