Test 00 fixed and small cleanups

src/oidcop/endpoint_context.py

@@ -328,7 +328,9 @@ def create_providerinfo(self, capabilities):
             _provider_info["jwks_uri"] = self.jwks_uri
 
         if "scopes_supported" not in _provider_info:
-            _provider_info["scopes_supported"] = [s for s in self.scope2claims.keys()]
+            _provider_info["scopes_supported"] = [
+                s for s in self.scope2claims.keys()
+            ]
         if "claims_supported" not in _provider_info:
             _provider_info["claims_supported"] = STANDARD_CLAIMS[:]
 

src/oidcop/scopes.py

@@ -33,19 +33,22 @@ def available_scopes(endpoint_context):
         return [s for s in endpoint_context.scope2claims.keys()]
 
 
-def convert_scopes2claims(scopes, allowed_claims=None, map=None):
-    if map is None:
-        map = SCOPE2CLAIMS
+def convert_scopes2claims(scopes, allowed_claims=None, scope2claim_map=None):
+    scope2claim_map = scope2claim_map or SCOPE2CLAIMS
 
     res = {}
     if allowed_claims is None:
         for scope in scopes:
-            claims = {name: None for name in map[scope]}
+            claims = {name: None for name in scope2claim_map[scope]}
             res.update(claims)
     else:
         for scope in scopes:
             try:
-                claims = {name: None for name in map[scope] if name in allowed_claims}
+                claims = {
+                    name: None
+                    for name in scope2claim_map[scope]
+                    if name in allowed_claims
+                }
                 res.update(claims)
             except KeyError:
                 continue

src/oidcop/session/claims.py

@@ -99,7 +99,9 @@ def get_claims(self, session_id: str, scopes: str, usage: str) -> dict:
                     client_id, _context, scopes
                 )
 
-                _claims = convert_scopes2claims(_scopes, map=_context.scope2claims)
+                _claims = convert_scopes2claims(
+                    _scopes, scope2claim_map=_context.scope2claims
+                )
                 claims.update(_claims)
 
         # Bring in claims specification from the authorization request

tests/op_config.json

@@ -222,7 +222,7 @@
   "id_token": {
     "class": "oidcop.id_token.IDToken",
     "kwargs": {
-      "default_claims": {
+      "base_claims": {
         "email": {
           "essential": true
         },

tests/test_07_userinfo.py

@@ -131,18 +131,18 @@ def test_custom_scopes():
     _available_claims.append("eduperson_scoped_affiliation")
 
     assert set(
-        convert_scopes2claims(["email"], _available_claims, map=_scopes).keys()
+        convert_scopes2claims(["email"], _available_claims, scope2claim_map=_scopes).keys()
     ) == {"email", "email_verified",}
     assert set(
-        convert_scopes2claims(["address"], _available_claims, map=_scopes).keys()
+        convert_scopes2claims(["address"], _available_claims, scope2claim_map=_scopes).keys()
     ) == {"address"}
     assert set(
-        convert_scopes2claims(["phone"], _available_claims, map=_scopes).keys()
+        convert_scopes2claims(["phone"], _available_claims, scope2claim_map=_scopes).keys()
     ) == {"phone_number", "phone_number_verified",}
 
     assert set(
         convert_scopes2claims(
-            ["research_and_scholarship"], _available_claims, map=_scopes
+            ["research_and_scholarship"], _available_claims, scope2claim_map=_scopes
         ).keys()
     ) == {
         "name",