"Translated" test_server_36_oauth2_token_exchange to use server and client instances instead of handcrafted messages.

Author: rohe

src/idpyoidc/client/oauth2/token_exchange.py

@@ -3,6 +3,8 @@
 
 from idpyoidc.client.oauth2.utils import get_state_parameter
 from idpyoidc.client.service import Service
+from idpyoidc.exception import MissingParameter
+from idpyoidc.exception import MissingRequiredAttribute
 from idpyoidc.message import oauth2
 from idpyoidc.message.oauth2 import ResponseMessage
 from idpyoidc.time_util import time_sans_frac
@@ -45,7 +47,11 @@ def oauth_pre_construct(self, request_args=None, post_args=None, **kwargs):
             request_args = {}
 
         if 'subject_token' not in request_args:
-            _key = get_state_parameter(request_args, kwargs)
+            try:
+                _key = get_state_parameter(request_args, kwargs)
+            except MissingParameter:
+                raise MissingRequiredAttribute("subject_token")
+
             parameters = {'access_token', 'scope'}
 
             _state = self.client_get("service_context").state

src/idpyoidc/client/service.py

@@ -16,14 +16,13 @@
 from idpyoidc.message.oauth2 import ResponseMessage
 from idpyoidc.message.oauth2 import is_error_message
 from idpyoidc.util import importer
-
-from ..constant import JOSE_ENCODED
-from ..constant import JSON_ENCODED
-from ..constant import URL_ENCODED
 from .configure import Configuration
 from .exception import ResponseError
 from .util import get_http_body
 from .util import get_http_url
+from ..constant import JOSE_ENCODED
+from ..constant import JSON_ENCODED
+from ..constant import URL_ENCODED
 
 __author__ = "Roland Hedberg"
 
@@ -452,6 +451,7 @@ def get_request_parameters(
                 content_type = JSON_ENCODED
 
             _info["body"] = get_http_body(request, content_type)
+
             _headers.update({"Content-Type": content_type})
 
         if _headers:
@@ -655,7 +655,7 @@ def construct_uris(self, base_url, hex):
                 uri = self.usage_to_uri_map.get(usage)
                 if uri and uri not in self.metadata:
                     self.metadata[uri] = self.get_uri(base_url, self.callback_path[uri],
-                                                               hex)
+                                                      hex)
 
     def get_metadata(self, attribute, default=None):
         try:

src/idpyoidc/server/oauth2/token.py

@@ -13,6 +13,7 @@
 from idpyoidc.server.exception import ProcessError
 from idpyoidc.server.oauth2.token_helper import AccessTokenHelper
 from idpyoidc.server.oauth2.token_helper import RefreshTokenHelper
+from idpyoidc.server.session import MintingNotAllowed
 from idpyoidc.server.session.token import TOKEN_TYPES_MAPPING
 from idpyoidc.util import importer
 
@@ -121,6 +122,8 @@ def process_request(self, request: Optional[Union[Message, dict]] = None, **kwar
                 )
         except JWEException as err:
             return self.error_cls(error="invalid_request", error_description="%s" % err)
+        except MintingNotAllowed as err:
+            return self.error_cls(error="invalid_request", error_description="%s" % err)
 
         if isinstance(response_args, ResponseMessage):
             return response_args