Finally all tests green

Author: rohe

src/idpyoidc/claims.py

@@ -245,11 +245,39 @@ def get_endpoint_claims(self, endpoints):
                         _info[md_param] = _val
         return _info
 
-    def get_metadata(self,
+    def get_server_metadata(self,
                      entity_type: Optional[str] = "",
                      endpoints: Optional[list] = None,
                      metadata_schema: Optional[Message] = None,
                      extra_claims: Optional[List[str]] = None,
+                     **kwargs):
+
+        metadata = self.prefer
+        # the claims that can appear in the metadata
+        if metadata_schema:
+            attr = list(metadata_schema.c_param.keys())
+        else:
+            attr = []
+
+        if extra_claims:
+            attr.extend(extra_claims)
+
+        if attr:
+            metadata = {k: v for k, v in metadata.items() if k in attr}
+
+        # collect endpoints
+        if endpoints:
+            metadata.update(self.get_endpoint_claims(endpoints))
+
+        if entity_type:
+            return {entity_type: metadata}
+        else:
+            return metadata
+
+    def get_client_metadata(self,
+                     entity_type: Optional[str] = "",
+                     metadata_schema: Optional[Message] = None,
+                     extra_claims: Optional[List[str]] = None,
                      supported: Optional[dict] = None,
                      **kwargs):
 
@@ -272,10 +300,6 @@ def get_metadata(self,
         if attr:
             metadata = {k: v for k, v in metadata.items() if k in attr}
 
-        # collect endpoints
-        if endpoints:
-            metadata.update(self.get_endpoint_claims(endpoints))
-
         if entity_type:
             return {entity_type: metadata}
         else:

src/idpyoidc/client/claims/oidc.py

@@ -95,13 +95,13 @@ def __init__(self, prefer: Optional[dict] = None, callback_path: Optional[dict]
         client_claims.Claims.__init__(self, prefer=prefer, callback_path=callback_path)
 
     def verify_rules(self, supports):
-        if self.get_preference("request_parameter_supported") and self.get_preference(
-            "request_uri_parameter_supported"
-        ):
-            raise ValueError(
-                "You have to chose one of 'request_parameter_supported' and "
-                "'request_uri_parameter_supported'. You can't have both."
-            )
+        # if self.get_preference("request_parameter_supported") and self.get_preference(
+        #     "request_uri_parameter_supported"
+        # ):
+        #     raise ValueError(
+        #         "You have to chose one of 'request_parameter_supported' and "
+        #         "'request_uri_parameter_supported'. You can't have both."
+        #     )
 
         if self.get_preference("request_parameter_supported") or self.get_preference(
             "request_uri_parameter_supported"

src/idpyoidc/client/oidc/registration.py

@@ -102,7 +102,8 @@ def gather_request_args(self, **kwargs):
         @return:
         """
         _context = self.upstream_get("context")
-        req_args = _context.claims.get_metadata(metadata_schema=self.msg_type)
+        req_args = _context.claims.get_client_metadata(metadata_schema=self.msg_type,
+                                                       supported=_context.supports())
         if "request_args" in self.conf:
             req_args.update(self.conf["request_args"])