Change TypeError on bad kid to InvalidTokenError

Author: Gabriel Gironda

jwt/api_jws.py

@@ -6,7 +6,7 @@
 
 from .algorithms import Algorithm, get_default_algorithms  # NOQA
 from .compat import string_types, text_type
-from .exceptions import DecodeError, InvalidAlgorithmError
+from .exceptions import DecodeError, InvalidAlgorithmError, InvalidTokenError
 from .utils import base64url_decode, base64url_encode, merge_dict
 
 
@@ -190,7 +190,7 @@ def _validate_headers(self, headers):
 
     def _validate_kid(self, kid):
         if not isinstance(kid, string_types):
-            raise TypeError('Key ID header parameter must be a string')
+            raise InvalidTokenError('Key ID header parameter must be a string')
 
 _jws_global_obj = PyJWS()
 encode = _jws_global_obj.encode

tests/test_api_jws.py

@@ -6,7 +6,7 @@
 from jwt.algorithms import Algorithm
 from jwt.api_jws import PyJWS
 from jwt.exceptions import (
-    DecodeError, InvalidAlgorithmError
+    DecodeError, InvalidAlgorithmError, InvalidTokenError
 )
 from jwt.utils import base64url_decode
 
@@ -381,7 +381,7 @@ def test_get_unverified_header_fails_on_bad_header_types(self, jws, payload):
             '.eyJzdWIiOiIxMjM0NTY3ODkwIn0'
             '.vs2WY54jfpKP3JGC73Vq5YlMsqM5oTZ1ZydT77SiZSk')
 
-        with pytest.raises(TypeError) as exc:
+        with pytest.raises(InvalidTokenError) as exc:
             jws.get_unverified_header(example_jws)
 
         assert 'Key ID header parameter must be a string' == str(exc.value)
@@ -611,12 +611,12 @@ def test_encode_headers_parameter_adds_headers(self, jws, payload):
         assert header_obj['testheader'] == headers['testheader']
 
     def test_encode_fails_on_invalid_kid_types(self, jws, payload):
-        with pytest.raises(TypeError) as exc:
+        with pytest.raises(InvalidTokenError) as exc:
             jws.encode(payload, 'secret', headers={'kid': 123})
 
         assert 'Key ID header parameter must be a string' == str(exc.value)
 
-        with pytest.raises(TypeError) as exc:
+        with pytest.raises(InvalidTokenError) as exc:
             jws.encode(payload, 'secret', headers={'kid': None})
 
         assert 'Key ID header parameter must be a string' == str(exc.value)