Fixed bugs resulting from a faulty rebase.

Author: rohe

src/idpyoidc/client/oidc/authorization.py

@@ -3,7 +3,7 @@
 from typing import Optional
 from typing import Union
 
-from idpyoidc import claims
+from idpyoidc import metadata
 from idpyoidc.client.oauth2 import authorization
 from idpyoidc.client.oauth2.utils import pre_construct_pick_redirect_uri
 from idpyoidc.client.oidc import IDT2REG
@@ -32,9 +32,9 @@ class Authorization(authorization.Authorization):
     error_msg = oidc.ResponseMessage
 
     _supports = {
-        "request_object_signing_alg_values_supported": claims.get_signing_algs,
-        "request_object_encryption_alg_values_supported": claims.get_encryption_algs,
-        "request_object_encryption_enc_values_supported": claims.get_encryption_encs,
+        "request_object_signing_alg_values_supported": metadata.get_signing_algs(),
+        "request_object_encryption_alg_values_supported": metadata.get_encryption_algs(),
+        "request_object_encryption_enc_values_supported": metadata.get_encryption_encs(),
         "response_types_supported": ["code", "id_token", "code id_token"],
         "request_parameter_supported": None,
         "request_uri_parameter_supported": None,
@@ -213,7 +213,7 @@ def store_request_on_file(self, req, **kwargs):
         return _webname
 
     def construct_request_parameter(
-        self, req, request_param, audience=None, expires_in=0, **kwargs
+            self, req, request_param, audience=None, expires_in=0, **kwargs
     ):
         """Construct a request parameter"""
         alg = self.get_request_object_signing_alg(**kwargs)

src/idpyoidc/server/claims/oidc.py

@@ -1,6 +1,7 @@
 from typing import Optional
 
 from idpyoidc import claims
+from idpyoidc import metadata
 from idpyoidc.message.oidc import ProviderConfigurationResponse
 from idpyoidc.message.oidc import RegistrationRequest
 from idpyoidc.message.oidc import RegistrationResponse
@@ -48,9 +49,9 @@ class Claims(server_claims.Claims):
         "display_values_supported": None,
         "encrypt_id_token_supported": None,
         # "grant_types_supported": ["authorization_code", "implicit", "refresh_token"],
-        "id_token_signing_alg_values_supported": claims.get_signing_algs,
-        "id_token_encryption_alg_values_supported": claims.get_encryption_algs,
-        "id_token_encryption_enc_values_supported": claims.get_encryption_encs,
+        "id_token_signing_alg_values_supported": metadata.get_signing_algs(),
+        "id_token_encryption_alg_values_supported": metadata.get_encryption_algs(),
+        "id_token_encryption_enc_values_supported": metadata.get_encryption_encs(),
         "initiate_login_uri": None,
         "jwks": None,
         "jwks_uri": None,

src/idpyoidc/server/oidc/authorization.py

@@ -82,9 +82,9 @@ class Authorization(authorization.Authorization):
         **{
             "claims_parameter_supported": True,
             "encrypt_request_object_supported": False,
-            "request_object_signing_alg_values_supported": metadata.get_signing_algs,
-            "request_object_encryption_alg_values_supported": metadata.get_encryption_algs,
-            "request_object_encryption_enc_values_supported": metadata.get_encryption_encs,
+            "request_object_signing_alg_values_supported": metadata.get_signing_algs(),
+            "request_object_encryption_alg_values_supported": metadata.get_encryption_algs(),
+            "request_object_encryption_enc_values_supported": metadata.get_encryption_encs(),
             "request_parameter_supported": True,
             "request_uri_parameter_supported": True,
             "require_request_uri_registration": False,

src/idpyoidc/server/oidc/token.py

@@ -1,7 +1,6 @@
 import logging
 
-from idpyoidc import claims
-
+from idpyoidc import metadata
 from idpyoidc.message import Message
 from idpyoidc.message import oidc
 from idpyoidc.message.oidc import TokenErrorResponse
@@ -40,7 +39,8 @@ class Token(token.Token):
             "client_secret_jwt",
             "private_key_jwt",
         ],
-        "token_endpoint_auth_signing_alg_values_supported": claims.get_signing_algs,
+        "token_endpoint_auth_signing_alg_values_supported": metadata.get_signing_algs(),
+        "grant_types_supported": list(helper_by_grant_type.keys())
     }
 
     token_exchange_helper = TokenExchangeHelper

tests/test_server_23_oidc_registration_endpoint.py

@@ -77,7 +77,7 @@ def create_endpoint(self):
         conf = {
             "issuer": "https://example.com/",
             "httpc_params": {"verify": False, "timeout": 1},
-            "capabilities": {
+            "preference": {
                 "subject_types_supported": ["public", "pairwise", "ephemeral"],
                 "grant_types_supported": [
                     "authorization_code",