phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed method _put_data_in_cookies

Browse Source
This commit is contained in:
Dmitriy Kuzmenko 2019-08-23 09:47:30 +03:00 committed by Anatoly
parent f86a94274d
commit 0dba806f04
2 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/authorization/views/common.py
View File

@ -36,8 +36,7 @@ class JWTAuthViewMixin(JWTCreateAPIView):
access_token = serializer.data.get('access_token') access_token = serializer.data.get('access_token')
refresh_token = serializer.data.get('refresh_token') refresh_token = serializer.data.get('refresh_token')
return self._put_cookies_in_response( return self._put_cookies_in_response(
cookies=self._put_data_in_cookies(locale=request.locale, cookies=self._put_data_in_cookies(access_token=access_token,
access_token=access_token,
refresh_token=refresh_token), refresh_token=refresh_token),
response=response) response=response)
@ -147,8 +146,7 @@ class OAuth2SignUpView(OAuth2ViewMixin, JWTGenericViewMixin):
'refresh_token': refresh_token}, 'refresh_token': refresh_token},
status=status.HTTP_200_OK) status=status.HTTP_200_OK)
return self._put_cookies_in_response( return self._put_cookies_in_response(
cookies=self._put_data_in_cookies(locale=request.locale, cookies=self._put_data_in_cookies(access_token=access_token,
access_token=access_token,
refresh_token=refresh_token), refresh_token=refresh_token),
response=response) response=response)
@ -165,10 +163,7 @@ class SignUpView(JWTCreateAPIView):
serializer = self.get_serializer(data=request.data) serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True) serializer.is_valid(raise_exception=True)
serializer.save() serializer.save()
response = Response(status=status.HTTP_201_CREATED) return Response(status=status.HTTP_201_CREATED)
return self._put_cookies_in_response(
cookies=self._put_data_in_cookies(locale=request.locale),
response=response)
# Login by username|email + password # Login by username|email + password
@ -186,8 +181,7 @@ class LoginByUsernameOrEmailView(JWTAuthViewMixin):
refresh_token = serializer.data.get('refresh_token') refresh_token = serializer.data.get('refresh_token')
is_permanent = serializer.validated_data.get('remember') is_permanent = serializer.validated_data.get('remember')
return self._put_cookies_in_response( return self._put_cookies_in_response(
cookies=self._put_data_in_cookies(locale=request.locale, cookies=self._put_data_in_cookies(access_token=access_token,
access_token=access_token,
refresh_token=refresh_token, refresh_token=refresh_token,
permanent=is_permanent), permanent=is_permanent),
response=response) response=response)
@ -206,8 +200,7 @@ class RefreshTokenView(JWTGenericViewMixin):
access_token = serializer.data.get('access_token') access_token = serializer.data.get('access_token')
refresh_token = serializer.data.get('refresh_token') refresh_token = serializer.data.get('refresh_token')
return self._put_cookies_in_response( return self._put_cookies_in_response(
cookies=self._put_data_in_cookies(locale=request.locale, cookies=self._put_data_in_cookies(access_token=access_token,
access_token=access_token,
refresh_token=refresh_token), refresh_token=refresh_token),
response=response) response=response)
@ -222,7 +215,4 @@ class LogoutView(JWTGenericViewMixin):
serializer = self.get_serializer(data=request.data) serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True) serializer.is_valid(raise_exception=True)
serializer.save() serializer.save()
response = Response(status=status.HTTP_200_OK) return Response(status=status.HTTP_200_OK)
return self._put_cookies_in_response(
cookies=self._put_data_in_cookies(locale=request.locale),
response=response)

18
apps/utils/views.py
View File

@ -28,12 +28,11 @@ class JWTGenericViewMixin(generics.GenericAPIView):
'refresh_token': str(token), 'refresh_token': str(token),
} }
def _put_data_in_cookies(self, locale: str, def _put_data_in_cookies(self,
access_token: str = None, access_token: str = None,
refresh_token: str = None, refresh_token: str = None,
permanent: bool = None): permanent: bool = None):
""" """
CHECK locale in cookies and PUT access and refresh tokens there.
cookies it is list that contain namedtuples cookies it is list that contain namedtuples
cookies would contain key, value and secure parameters. cookies would contain key, value and secure parameters.
""" """
@ -105,8 +104,7 @@ class JWTListAPIView(JWTGenericViewMixin, generics.ListAPIView):
response = Response(serializer.data) response = Response(serializer.data)
access_token, refresh_token = self._get_tokens_from_cookies(request) access_token, refresh_token = self._get_tokens_from_cookies(request)
return self._put_cookies_in_response( return self._put_cookies_in_response(
cookies=self._put_data_in_cookies(locale=request.locale, cookies=self._put_data_in_cookies(access_token=access_token.value,
access_token=access_token.value,
refresh_token=refresh_token.value), refresh_token=refresh_token.value),
response=response) response=response)
@ -122,8 +120,7 @@ class JWTCreateAPIView(JWTGenericViewMixin, generics.CreateAPIView):
response = Response(serializer.data, status=status.HTTP_201_CREATED) response = Response(serializer.data, status=status.HTTP_201_CREATED)
access_token, refresh_token = self._get_tokens_from_cookies(request) access_token, refresh_token = self._get_tokens_from_cookies(request)
return self._put_cookies_in_response( return self._put_cookies_in_response(
cookies=self._put_data_in_cookies(locale=request.locale, cookies=self._put_data_in_cookies(access_token=access_token.value,
access_token=access_token.value,
refresh_token=refresh_token.value), refresh_token=refresh_token.value),
response=response) response=response)
@ -144,8 +141,7 @@ class JWTRetrieveAPIView(JWTGenericViewMixin, generics.RetrieveAPIView):
response = Response(serializer.data, status.HTTP_200_OK) response = Response(serializer.data, status.HTTP_200_OK)
access_token, refresh_token = self._get_tokens_from_cookies(request) access_token, refresh_token = self._get_tokens_from_cookies(request)
return self._put_cookies_in_response( return self._put_cookies_in_response(
cookies=self._put_data_in_cookies(locale=request.locale, cookies=self._put_data_in_cookies(access_token=access_token,
access_token=access_token,
refresh_token=refresh_token), refresh_token=refresh_token),
response=response) response=response)
@ -160,8 +156,7 @@ class JWTDestroyAPIView(JWTGenericViewMixin, generics.DestroyAPIView):
response = Response(status=status.HTTP_204_NO_CONTENT) response = Response(status=status.HTTP_204_NO_CONTENT)
access_token, refresh_token = self._get_tokens_from_cookies(request) access_token, refresh_token = self._get_tokens_from_cookies(request)
return self._put_cookies_in_response( return self._put_cookies_in_response(
cookies=self._put_data_in_cookies(locale=request.locale, cookies=self._put_data_in_cookies(access_token=access_token,
access_token=access_token,
refresh_token=refresh_token), refresh_token=refresh_token),
response=response) response=response)
@ -183,8 +178,7 @@ class JWTUpdateAPIView(JWTGenericViewMixin, generics.UpdateAPIView):
response = Response(serializer.data) response = Response(serializer.data)
access_token, refresh_token = self._get_tokens_from_cookies(request) access_token, refresh_token = self._get_tokens_from_cookies(request)
return self._put_cookies_in_response( return self._put_cookies_in_response(
cookies=self._put_data_in_cookies(locale=request.locale, cookies=self._put_data_in_cookies(access_token=access_token,
access_token=access_token,
refresh_token=refresh_token), refresh_token=refresh_token),
response=response) response=response)