From 65ad8270145a4daa28ff73975c8aded00a1e5c21 Mon Sep 17 00:00:00 2001 From: C0deZ Lee Date: Thu, 21 Sep 2017 20:00:09 -0400 Subject: [PATCH 1/3] Fix token in cookie unable to refresh --- rest_framework_jwt/views.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rest_framework_jwt/views.py b/rest_framework_jwt/views.py index 30cd4646..186d3f74 100644 --- a/rest_framework_jwt/views.py +++ b/rest_framework_jwt/views.py @@ -51,9 +51,12 @@ def get_serializer(self, *args, **kwargs): kwargs['context'] = self.get_serializer_context() return serializer_class(*args, **kwargs) - def post(self, request, *args, **kwargs): - serializer = self.get_serializer(data=request.data) - + def post(self, request, *args, **kwargs): + request_data = request.data.copy() + if api_settings.JWT_AUTH_COOKIE: + request_data['token'] = request.COOKIES.get(api_settings.JWT_AUTH_COOKIE) + serializer = self.get_serializer(data=request_data) + if serializer.is_valid(): user = serializer.object.get('user') or request.user token = serializer.object.get('token') From e571d4e30801f9668356e773b0f73686939bc275 Mon Sep 17 00:00:00 2001 From: C0deZ Lee Date: Thu, 21 Sep 2017 20:27:31 -0400 Subject: [PATCH 2/3] Fix indentation --- rest_framework_jwt/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework_jwt/views.py b/rest_framework_jwt/views.py index 186d3f74..54c94dba 100644 --- a/rest_framework_jwt/views.py +++ b/rest_framework_jwt/views.py @@ -53,9 +53,9 @@ def get_serializer(self, *args, **kwargs): def post(self, request, *args, **kwargs): request_data = request.data.copy() - if api_settings.JWT_AUTH_COOKIE: - request_data['token'] = request.COOKIES.get(api_settings.JWT_AUTH_COOKIE) - serializer = self.get_serializer(data=request_data) + if api_settings.JWT_AUTH_COOKIE: + request_data['token'] = request.COOKIES.get(api_settings.JWT_AUTH_COOKIE) + serializer = self.get_serializer(data=request_data) if serializer.is_valid(): user = serializer.object.get('user') or request.user From be0cacbffe2ea0dec1fe9e0d932956a743a28141 Mon Sep 17 00:00:00 2001 From: C0deZ Lee Date: Fri, 22 Sep 2017 00:35:42 -0400 Subject: [PATCH 3/3] Indentation again --- rest_framework_jwt/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework_jwt/views.py b/rest_framework_jwt/views.py index 54c94dba..ba971144 100644 --- a/rest_framework_jwt/views.py +++ b/rest_framework_jwt/views.py @@ -53,9 +53,9 @@ def get_serializer(self, *args, **kwargs): def post(self, request, *args, **kwargs): request_data = request.data.copy() - if api_settings.JWT_AUTH_COOKIE: - request_data['token'] = request.COOKIES.get(api_settings.JWT_AUTH_COOKIE) - serializer = self.get_serializer(data=request_data) + if api_settings.JWT_AUTH_COOKIE: + request_data['token'] = request.COOKIES.get(api_settings.JWT_AUTH_COOKIE) + serializer = self.get_serializer(data=request_data) if serializer.is_valid(): user = serializer.object.get('user') or request.user