[refresh-token] make wording consistent, replace RENEW with REFRESH

Author: alvinchow86

README.md

@@ -62,7 +62,7 @@ $ curl -H "Authorization: JWT <your_token>" http://localhost:8000/protected-url/
 ```
 
 ## Refresh Token
-If `JWT_ALLOW_TOKEN_RENEWAL` is True, issued tokens can be "refreshed" to obtain a new brand token with renewed expiration time. Add a URL pattern like this:
+If `JWT_ALLOW_TOKEN_REFRESH` is True, issued tokens can be "refreshed" to obtain a new brand token with renewed expiration time. Add a URL pattern like this:
 ```python
     url(r'^api-token-refresh/', 'rest_framework_jwt.views.refresh_jwt_token'),
 ```
@@ -73,7 +73,7 @@ Pass in an existing token to the refresh endpoint as follows: `{"token": EXISTIN
 $ curl -X POST -H "Content-Type: application/json" -d '{"token":"<EXISTING_TOKEN>}' http://localhost:8000/api-token-refresh/
 ```
 
-Refresh with tokens can be repeated (token1 -> token2 -> token3), but this chain of token stores the time that the original token (obtained with username/password credentials), as `orig_iat`. You can only keep refreshing tokens up to `JWT_TOKEN_RENEWAL_LIMIT`.
+Refresh with tokens can be repeated (token1 -> token2 -> token3), but this chain of token stores the time that the original token (obtained with username/password credentials), as `orig_iat`. You can only keep refreshing tokens up to `JWT_TOKEN_REFRESH_LIMIT`.
 
 
 ## Additional Settings
@@ -100,8 +100,8 @@ JWT_AUTH = {
     'JWT_LEEWAY': 0,
     'JWT_EXPIRATION_DELTA': datetime.timedelta(seconds=300),
 
-    'JWT_ALLOW_TOKEN_RENEWAL': False,
-    'JWT_TOKEN_RENEWAL_LIMIT': datetime.timedelta(days=7),
+    'JWT_ALLOW_TOKEN_REFRESH': False,
+    'JWT_TOKEN_REFRESH_LIMIT': datetime.timedelta(days=7),
 }
 ```
 This packages uses the JSON Web Token Python implementation, [PyJWT](https://github.com/progrium/pyjwt) and allows to modify some of it's available options.
@@ -152,11 +152,11 @@ This is an instance of Python's `datetime.timedelta`. This will be added to `dat
 
 Default is `datetime.timedelta(seconds=300)`(5 minutes).
 
-### JWT_ALLOW_TOKEN_RENEWAL
-Enable token renewal functionality. Token issued from `rest_framework_jwt.views.obtain_jwt_token` will have an `orig_iat` field. Default is `False`
+### JWT_ALLOW_TOKEN_REFRESH
+Enable token refresh functionality. Token issued from `rest_framework_jwt.views.obtain_jwt_token` will have an `orig_iat` field. Default is `False`
 
-### JWT_TOKEN_RENEWAL_LIMIT
-Limit on token renewal, is a `datetime.timedelta` instance. This is how much time after the original token that future tokens can be refreshed from.
+### JWT_TOKEN_REFRESH_LIMIT
+Limit on token refresh, is a `datetime.timedelta` instance. This is how much time after the original token that future tokens can be refreshed from.
 
 Default is `datetime.timedelta(days=7)` (7 days).
 

rest_framework_jwt/serializers.py

@@ -49,7 +49,7 @@ def validate(self, attrs):
 
                 # Include original issued at time for a brand new token,
                 # to allow token refresh
-                if api_settings.JWT_ALLOW_TOKEN_RENEWAL:
+                if api_settings.JWT_ALLOW_TOKEN_REFRESH:
                     payload['orig_iat'] = timegm(
                         datetime.utcnow().utctimetuple()
                     )
@@ -101,13 +101,13 @@ def validate(self, attrs):
         orig_iat = payload.get('orig_iat')
         if orig_iat:
             # Verify expiration
-            renewal_limit = api_settings.JWT_TOKEN_RENEWAL_LIMIT
-            if isinstance(renewal_limit, timedelta):
-                renewal_limit = (renewal_limit.days * 24 * 3600 +
-                                 renewal_limit.seconds)
+            refresh_limit = api_settings.JWT_TOKEN_REFRESH_LIMIT
+            if isinstance(refresh_limit, timedelta):
+                refresh_limit = (refresh_limit.days * 24 * 3600 +
+                                 refresh_limit.seconds)
             expiration_timestamp = (
                 orig_iat +
-                int(renewal_limit)
+                int(refresh_limit)
             )
             now_timestamp = timegm(datetime.utcnow().utctimetuple())
             if now_timestamp > expiration_timestamp:

rest_framework_jwt/settings.py

@@ -26,8 +26,8 @@
     'JWT_LEEWAY': 0,
     'JWT_EXPIRATION_DELTA': datetime.timedelta(seconds=300),
 
-    'JWT_ALLOW_TOKEN_RENEWAL': False,
-    'JWT_TOKEN_RENEWAL_LIMIT': datetime.timedelta(days=7),
+    'JWT_ALLOW_TOKEN_REFRESH': False,
+    'JWT_TOKEN_REFRESH_LIMIT': datetime.timedelta(days=7),
 }
 
 # List of settings that may be in string import notation.

rest_framework_jwt/tests/test_views.py

@@ -164,7 +164,7 @@ class RefreshJSONWebTokenTests(BaseTestCase):
 
     def setUp(self):
         super(RefreshJSONWebTokenTests, self).setUp()
-        api_settings.JWT_ALLOW_TOKEN_RENEWAL = True
+        api_settings.JWT_ALLOW_TOKEN_REFRESH = True
 
     def get_token(self):
         client = APIClient(enforce_csrf_checks=True)
@@ -231,13 +231,13 @@ def test_refresh_jwt_fails_with_expired_token(self):
         self.assertRegexpMatches(response.data['non_field_errors'][0],
                                  'Signature has expired')
 
-    def test_refresh_jwt_after_renewal_expiration(self):
+    def test_refresh_jwt_after_refresh_expiration(self):
         """
-        Test that token can't be refreshed after token renewal limit
+        Test that token can't be refreshed after token refresh limit
         """
         client = APIClient(enforce_csrf_checks=True)
 
-        orig_iat = (datetime.utcnow() - api_settings.JWT_TOKEN_RENEWAL_LIMIT -
+        orig_iat = (datetime.utcnow() - api_settings.JWT_TOKEN_REFRESH_LIMIT -
                     timedelta(seconds=5))
         token = self.create_token(
             self.user,
@@ -253,5 +253,5 @@ def test_refresh_jwt_after_renewal_expiration(self):
 
     def tearDown(self):
         # Restore original settings
-        api_settings.JWT_ALLOW_TOKEN_RENEWAL = \
-            DEFAULTS['JWT_ALLOW_TOKEN_RENEWAL']
+        api_settings.JWT_ALLOW_TOKEN_REFRESH = \
+            DEFAULTS['JWT_ALLOW_TOKEN_REFRESH']