Fixed references.

Set correct service_name.

Author: rohe

src/idpyoidc/client/defaults.py

@@ -18,7 +18,7 @@
 }
 
 DEFAULT_OAUTH2_SERVICES = {
-    "discovery": {"class": "idpyoidc.client.oauth2.provider_info_discovery.ProviderInfoDiscovery"},
+    "discovery": {"class": "idpyoidc.client.oauth2.server_metadata.ServerMetadata"},
     "authorization": {"class": "idpyoidc.client.oauth2.authorization.Authorization"},
     "access_token": {"class": "idpyoidc.client.oauth2.access_token.AccessToken"},
     "refresh_access_token": {

src/idpyoidc/client/oidc/provider_info_discovery.py

@@ -1,7 +1,7 @@
 import logging
 
 from idpyoidc.client.exception import ConfigurationError
-from idpyoidc.client.oauth2 import provider_info_discovery
+from idpyoidc.client.oauth2 import server_metadata
 from idpyoidc.message import oidc
 from idpyoidc.message.oauth2 import ResponseMessage
 
@@ -61,14 +61,16 @@ def add_redirect_uris(request_args, service=None, **kwargs):
     return request_args, {}
 
 
-class ProviderInfoDiscovery(provider_info_discovery.ProviderInfoDiscovery):
+class ProviderInfoDiscovery(server_metadata.ServerMetadata):
     msg_type = oidc.Message
     response_cls = oidc.ProviderConfigurationResponse
     error_msg = ResponseMessage
+    service_name = "provider_info"
+
     metadata_attributes = {}
 
     def __init__(self, client_get, conf=None):
-        provider_info_discovery.ProviderInfoDiscovery.__init__(self, client_get, conf=conf)
+        server_metadata.ServerMetadata.__init__(self, client_get, conf=conf)
 
     def update_service_context(self, resp, **kwargs):
         _context = self.client_get("service_context")

tests/test_client_40_dpop.py

@@ -88,7 +88,7 @@ def create_client(self):
 
         services = {
             "discovery": {
-                "class": "idpyoidc.client.oauth2.provider_info_discovery.ProviderInfoDiscovery"
+                "class": "idpyoidc.client.oauth2.server_metadata.ServerMetadata"
             },
             "authorization": {"class": "idpyoidc.client.oauth2.authorization.Authorization"},
             "access_token": {"class": "idpyoidc.client.oauth2.access_token.AccessToken"},

tests/test_server_24_oauth2_token_endpoint.py

@@ -689,8 +689,9 @@ def test_do_refresh_access_token_not_allowed(self):
         _request = REFRESH_TOKEN_REQ.copy()
         _request["refresh_token"] = _resp["response_args"]["refresh_token"]
         _req = self.token_endpoint.parse_request(_request.to_json())
-        with pytest.raises(MintingNotAllowed):
-            self.token_endpoint.process_request(_req)
+        res = self.token_endpoint.process_request(_req)
+        assert "error" in res
+        assert res["error_description"] == 'Minting of access_token not supported'
 
     def test_do_refresh_access_token_revoked(self):
         areq = AUTH_REQ.copy()

tests/test_server_35_oidc_token_endpoint.py

@@ -905,8 +905,8 @@ def test_do_refresh_access_token_not_allowed(self):
         _request = REFRESH_TOKEN_REQ.copy()
         _request["refresh_token"] = _resp["response_args"]["refresh_token"]
         _req = self.token_endpoint.parse_request(_request.to_urlencoded())
-        with pytest.raises(MintingNotAllowed):
-            self.token_endpoint.process_request(_req)
+        res = self.token_endpoint.process_request(_req)
+        assert "error" in res
 
     def test_do_refresh_access_token_revoked(self):
         areq = AUTH_REQ.copy()