Fixed tests

Author: rohe

tests/private/token_jwks.json

@@ -1 +1 @@
-{"keys": [{"kty": "oct", "use": "enc", "kid": "code", "k": "vSHDkLBHhDStkR0NWu8519rmV5zmnm5_"}, {"kty": "oct", "use": "enc", "kid": "refresh", "k": "agn7Pli1QD_qkJYetnZesVB08q5gumj1"}]}
+{"keys": [{"kty": "oct", "use": "enc", "kid": "code", "k": "vSHDkLBHhDStkR0NWu8519rmV5zmnm5_"}, {"kty": "oct", "use": "enc", "kid": "refresh", "k": "etMvKWMjiDg3OSf1P_eXtue8iDOxUGqp"}]}

tests/test_server_24_oauth2_token_endpoint.py

@@ -6,6 +6,7 @@
 from cryptojwt.jws.jws import factory
 from cryptojwt.key_jar import build_keyjar
 import pytest
+from idpyoidc.server.exception import UnAuthorizedClient
 
 from idpyoidc.context import OidcContext
 from idpyoidc.defaults import JWT_BEARER
@@ -342,7 +343,7 @@ def test_process_request_using_private_key_jwt(self):
         _resp = self.token_endpoint.process_request(request=_req)
 
         # 2nd time used
-        with pytest.raises(InvalidToken):
+        with pytest.raises((InvalidToken, UnAuthorizedClient)):
             self.token_endpoint.parse_request(_token_request)
 
     def test_do_refresh_access_token(self):

tests/test_server_24_oauth2_token_endpoint_def_conf.py

@@ -5,6 +5,7 @@
 from cryptojwt import KeyJar
 from cryptojwt.jws.jws import factory
 from cryptojwt.key_jar import build_keyjar
+from idpyoidc.server.exception import UnAuthorizedClient
 
 from idpyoidc.context import OidcContext
 from idpyoidc.defaults import JWT_BEARER
@@ -241,7 +242,7 @@ def test_process_request_using_private_key_jwt(self):
         _resp = self.token_endpoint.process_request(request=_req)
 
         # 2nd time used
-        with pytest.raises(InvalidToken):
+        with pytest.raises((InvalidToken, UnAuthorizedClient)):
             self.token_endpoint.parse_request(_token_request)
 
     def test_do_refresh_access_token(self):

tests/test_server_26_oidc_userinfo_endpoint.py

@@ -551,8 +551,9 @@ def mock():
 
         monkeypatch.setattr("idpyoidc.server.token.utc_time_sans_frac", mock)
 
-        with pytest.raises(BearerTokenAuthenticationError):
-            self.endpoint.parse_request({}, http_info=http_info)
+        res = self.endpoint.parse_request({}, http_info=http_info)
+        assert "error" in res
+        assert res["error"] == "invalid_token"
 
     def test_userinfo_claims(self):
         _acr = "https://refeds.org/profile/mfa"

tests/test_server_35_oidc_token_endpoint.py

@@ -5,6 +5,7 @@
 import pytest
 from cryptojwt import JWT
 from cryptojwt.key_jar import build_keyjar
+from idpyoidc.server.exception import UnAuthorizedClient
 
 from idpyoidc.defaults import JWT_BEARER
 from idpyoidc.message.oidc import AccessTokenRequest
@@ -350,7 +351,7 @@ def test_process_request_using_private_key_jwt(self):
         _resp = self.token_endpoint.process_request(request=_req)
 
         # 2nd time used
-        with pytest.raises(InvalidToken):
+        with pytest.raises((InvalidToken, UnAuthorizedClient)):
             self.token_endpoint.parse_request(_token_request)
 
     def test_do_refresh_access_token(self):

tests/test_server_35_oidc_token_endpoint_def_conf.py

@@ -3,6 +3,7 @@
 import pytest
 from cryptojwt import JWT
 from cryptojwt.key_jar import build_keyjar
+from idpyoidc.server.exception import UnAuthorizedClient
 
 from idpyoidc.client.defaults import DEFAULT_KEY_DEFS
 from idpyoidc.defaults import JWT_BEARER
@@ -206,7 +207,7 @@ def test_process_request_using_private_key_jwt(self):
         _resp = self.token_endpoint.process_request(request=_req)
 
         # 2nd time used
-        with pytest.raises(InvalidToken):
+        with pytest.raises((InvalidToken, UnAuthorizedClient)):
             self.token_endpoint.parse_request(_token_request)
 
     def test_do_refresh_access_token(self):