Added request object to resfresh_token signals

flavors · Jun 1, 2019 · e86f433 · e86f433
1 parent 6a76e6f
commit e86f433
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/docs/refresh_token.rst b/docs/refresh_token.rst
@@ -173,8 +173,8 @@ Automatically revoke a refresh token after it has been used::
 
 
     @receiver(refresh_token_rotated)
-    def revoke_refresh_token(sender, refresh_token, **kwargs):
-        refresh_token.revoke()
+    def revoke_refresh_token(sender, request, refresh_token, **kwargs):
+        refresh_token.revoke(request)
 
 Clear refresh tokens
 ~~~~~~~~~~~~~~~~~~~~

diff --git a/graphql_jwt/refresh_token/mixins.py b/graphql_jwt/refresh_token/mixins.py
@@ -19,15 +19,15 @@ class Fields:
     @setup_jwt_cookie
     def refresh(cls, root, info, refresh_token, **kwargs):
         context = info.context
-        refresh_token = get_refresh_token(refresh_token, info.context)
+        refresh_token = get_refresh_token(refresh_token, context)
 
         if refresh_token.is_expired(context):
             raise exceptions.JSONWebTokenError(_('Refresh token is expired'))
 
         payload = jwt_settings.JWT_PAYLOAD_HANDLER(refresh_token.user, context)
         token = jwt_settings.JWT_ENCODE_HANDLER(payload, context)
 
-        refresh_token.rotate()
+        refresh_token.rotate(context)
         refreshed_token = refresh_token_lazy(refresh_token.user)
         return cls(token=token, payload=payload, refresh_token=refreshed_token)
 
@@ -37,6 +37,7 @@ class RevokeMixin(object):
 
     @classmethod
     def revoke(cls, root, info, refresh_token, **kwargs):
-        refresh_token = get_refresh_token(refresh_token, info.context)
-        refresh_token.revoke()
+        context = info.context
+        refresh_token = get_refresh_token(refresh_token, context)
+        refresh_token.revoke(context)
         return cls(revoked=timegm(refresh_token.revoked.timetuple()))
diff --git a/graphql_jwt/refresh_token/models.py b/graphql_jwt/refresh_token/models.py
@@ -54,21 +54,23 @@ def get_token(self):
             return self._cached_token
         return self.token
 
-    def is_expired(self, context=None):
+    def is_expired(self, request=None):
         orig_iat = timegm(self.created.timetuple())
-        return jwt_settings.JWT_REFRESH_EXPIRED_HANDLER(orig_iat, context)
+        return jwt_settings.JWT_REFRESH_EXPIRED_HANDLER(orig_iat, request)
 
-    def revoke(self):
+    def revoke(self, request=None):
         self.revoked = timezone.now()
         self.save(update_fields=['revoked'])
 
         signals.refresh_token_revoked.send(
             sender=AbstractRefreshToken,
+            request=request,
             refresh_token=self)
 
-    def rotate(self):
+    def rotate(self, request=None):
         signals.refresh_token_rotated.send(
             sender=AbstractRefreshToken,
+            request=request,
             refresh_token=self)
 
 

diff --git a/graphql_jwt/refresh_token/signals.py b/graphql_jwt/refresh_token/signals.py
@@ -1,4 +1,4 @@
 from django.dispatch import Signal
 
-refresh_token_revoked = Signal(providing_args=['refresh_token'])
-refresh_token_rotated = Signal(providing_args=['refresh_token'])
+refresh_token_revoked = Signal(providing_args=['request', 'refresh_token'])
+refresh_token_rotated = Signal(providing_args=['request', 'refresh_token'])
diff --git a/tests/refresh_token/test_models.py b/tests/refresh_token/test_models.py
@@ -47,6 +47,7 @@ def test_revoke(self):
         handler.assert_called_once_with(
             sender=AbstractRefreshToken,
             signal=signals.refresh_token_revoked,
+            request=None,
             refresh_token=self.refresh_token)
 
     def test_rotate(self):
@@ -56,4 +57,5 @@ def test_rotate(self):
         handler.assert_called_once_with(
             sender=AbstractRefreshToken,
             signal=signals.refresh_token_rotated,
+            request=None,
             refresh_token=self.refresh_token)