Fix #189

Include issuer and audience in payload if set.

Author: jpadilla

rest_framework_jwt/utils.py

@@ -33,6 +33,12 @@ def jwt_payload_handler(user):
             datetime.utcnow().utctimetuple()
         )
 
+    if api_settings.JWT_AUDIENCE is not None:
+        payload['aud'] = api_settings.JWT_AUDIENCE
+
+    if api_settings.JWT_ISSUER is not None:
+        payload['iss'] = api_settings.JWT_ISSUER
+
     return payload
 
 

tests/test_utils.py

@@ -74,7 +74,7 @@ def test_jwt_decode_verify_exp(self):
 
 class TestAudience(TestCase):
     def setUp(self):
-        api_settings.JWT_AUDIENCE = "my_aud"
+        api_settings.JWT_AUDIENCE = 'my_aud'
 
         self.username = 'jpueblo'
         self.email = '[email protected]'
@@ -84,20 +84,20 @@ def setUp(self):
 
     def test_fail_audience_missing(self):
         payload = utils.jwt_payload_handler(self.user)
+        del payload['aud']
         token = utils.jwt_encode_handler(payload)
         with self.assertRaises(jwt.exceptions.MissingRequiredClaimError):
             utils.jwt_decode_handler(token)
 
     def test_fail_audience_wrong(self):
         payload = utils.jwt_payload_handler(self.user)
-        payload['aud'] = "my_aud2"
+        payload['aud'] = 'my_aud2'
         token = utils.jwt_encode_handler(payload)
         with self.assertRaises(jwt.exceptions.InvalidAudienceError):
             utils.jwt_decode_handler(token)
 
     def test_correct_audience(self):
         payload = utils.jwt_payload_handler(self.user)
-        payload['aud'] = "my_aud"
         token = utils.jwt_encode_handler(payload)
         decoded_payload = utils.jwt_decode_handler(token)
         self.assertEqual(decoded_payload, payload)
@@ -108,7 +108,7 @@ def tearDown(self):
 
 class TestIssuer(TestCase):
     def setUp(self):
-        api_settings.JWT_ISSUER = "example.com"
+        api_settings.JWT_ISSUER = 'example.com'
 
         self.username = 'jpueblo'
         self.email = '[email protected]'
@@ -118,20 +118,20 @@ def setUp(self):
 
     def test_fail_issuer_missing(self):
         payload = utils.jwt_payload_handler(self.user)
+        del payload['iss']
         token = utils.jwt_encode_handler(payload)
         with self.assertRaises(jwt.exceptions.MissingRequiredClaimError):
             utils.jwt_decode_handler(token)
 
     def test_fail_issuer_wrong(self):
         payload = utils.jwt_payload_handler(self.user)
-        payload['iss'] = "example2.com"
+        payload['iss'] = 'example2.com'
         token = utils.jwt_encode_handler(payload)
         with self.assertRaises(jwt.exceptions.InvalidIssuerError):
             utils.jwt_decode_handler(token)
 
     def test_correct_issuer(self):
         payload = utils.jwt_payload_handler(self.user)
-        payload['iss'] = "example.com"
         token = utils.jwt_encode_handler(payload)
         decoded_payload = utils.jwt_decode_handler(token)
         self.assertEqual(decoded_payload, payload)