diff --git a/apps/authorization/views/common.py b/apps/authorization/views/common.py index efee7700..8b324bdd 100644 --- a/apps/authorization/views/common.py +++ b/apps/authorization/views/common.py @@ -36,8 +36,7 @@ class JWTAuthViewMixin(JWTCreateAPIView): access_token = serializer.data.get('access_token') refresh_token = serializer.data.get('refresh_token') return self._put_cookies_in_response( - cookies=self._put_data_in_cookies(locale=request.locale, - access_token=access_token, + cookies=self._put_data_in_cookies(access_token=access_token, refresh_token=refresh_token), response=response) @@ -147,8 +146,7 @@ class OAuth2SignUpView(OAuth2ViewMixin, JWTGenericViewMixin): 'refresh_token': refresh_token}, status=status.HTTP_200_OK) return self._put_cookies_in_response( - cookies=self._put_data_in_cookies(locale=request.locale, - access_token=access_token, + cookies=self._put_data_in_cookies(access_token=access_token, refresh_token=refresh_token), response=response) @@ -165,10 +163,7 @@ class SignUpView(JWTCreateAPIView): serializer = self.get_serializer(data=request.data) serializer.is_valid(raise_exception=True) serializer.save() - response = Response(status=status.HTTP_201_CREATED) - return self._put_cookies_in_response( - cookies=self._put_data_in_cookies(locale=request.locale), - response=response) + return Response(status=status.HTTP_201_CREATED) # Login by username|email + password @@ -186,8 +181,7 @@ class LoginByUsernameOrEmailView(JWTAuthViewMixin): refresh_token = serializer.data.get('refresh_token') is_permanent = serializer.validated_data.get('remember') return self._put_cookies_in_response( - cookies=self._put_data_in_cookies(locale=request.locale, - access_token=access_token, + cookies=self._put_data_in_cookies(access_token=access_token, refresh_token=refresh_token, permanent=is_permanent), response=response) @@ -206,8 +200,7 @@ class RefreshTokenView(JWTGenericViewMixin): access_token = serializer.data.get('access_token') refresh_token = serializer.data.get('refresh_token') return self._put_cookies_in_response( - cookies=self._put_data_in_cookies(locale=request.locale, - access_token=access_token, + cookies=self._put_data_in_cookies(access_token=access_token, refresh_token=refresh_token), response=response) @@ -222,7 +215,4 @@ class LogoutView(JWTGenericViewMixin): serializer = self.get_serializer(data=request.data) serializer.is_valid(raise_exception=True) serializer.save() - response = Response(status=status.HTTP_200_OK) - return self._put_cookies_in_response( - cookies=self._put_data_in_cookies(locale=request.locale), - response=response) + return Response(status=status.HTTP_200_OK) diff --git a/apps/utils/views.py b/apps/utils/views.py index c3a2679e..b8c8e9f5 100644 --- a/apps/utils/views.py +++ b/apps/utils/views.py @@ -28,12 +28,11 @@ class JWTGenericViewMixin(generics.GenericAPIView): 'refresh_token': str(token), } - def _put_data_in_cookies(self, locale: str, + def _put_data_in_cookies(self, access_token: str = None, refresh_token: str = None, permanent: bool = None): """ - CHECK locale in cookies and PUT access and refresh tokens there. cookies it is list that contain namedtuples cookies would contain key, value and secure parameters. """ @@ -105,8 +104,7 @@ class JWTListAPIView(JWTGenericViewMixin, generics.ListAPIView): response = Response(serializer.data) access_token, refresh_token = self._get_tokens_from_cookies(request) return self._put_cookies_in_response( - cookies=self._put_data_in_cookies(locale=request.locale, - access_token=access_token.value, + cookies=self._put_data_in_cookies(access_token=access_token.value, refresh_token=refresh_token.value), response=response) @@ -122,8 +120,7 @@ class JWTCreateAPIView(JWTGenericViewMixin, generics.CreateAPIView): response = Response(serializer.data, status=status.HTTP_201_CREATED) access_token, refresh_token = self._get_tokens_from_cookies(request) return self._put_cookies_in_response( - cookies=self._put_data_in_cookies(locale=request.locale, - access_token=access_token.value, + cookies=self._put_data_in_cookies(access_token=access_token.value, refresh_token=refresh_token.value), response=response) @@ -144,8 +141,7 @@ class JWTRetrieveAPIView(JWTGenericViewMixin, generics.RetrieveAPIView): response = Response(serializer.data, status.HTTP_200_OK) access_token, refresh_token = self._get_tokens_from_cookies(request) return self._put_cookies_in_response( - cookies=self._put_data_in_cookies(locale=request.locale, - access_token=access_token, + cookies=self._put_data_in_cookies(access_token=access_token, refresh_token=refresh_token), response=response) @@ -160,8 +156,7 @@ class JWTDestroyAPIView(JWTGenericViewMixin, generics.DestroyAPIView): response = Response(status=status.HTTP_204_NO_CONTENT) access_token, refresh_token = self._get_tokens_from_cookies(request) return self._put_cookies_in_response( - cookies=self._put_data_in_cookies(locale=request.locale, - access_token=access_token, + cookies=self._put_data_in_cookies(access_token=access_token, refresh_token=refresh_token), response=response) @@ -183,8 +178,7 @@ class JWTUpdateAPIView(JWTGenericViewMixin, generics.UpdateAPIView): response = Response(serializer.data) access_token, refresh_token = self._get_tokens_from_cookies(request) return self._put_cookies_in_response( - cookies=self._put_data_in_cookies(locale=request.locale, - access_token=access_token, + cookies=self._put_data_in_cookies(access_token=access_token, refresh_token=refresh_token), response=response)