From c341b1b0ffdf848f2bfaba8166d91acd46a2ad6e Mon Sep 17 00:00:00 2001 From: Daniel Stanton Date: Wed, 25 Jan 2017 18:00:02 +0000 Subject: [PATCH] Renamed KnoxTokenSerializer to KnoxSerializer As it now returns both token and user --- rest_auth/app_settings.py | 6 +++--- rest_auth/serializers.py | 2 +- rest_auth/views.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rest_auth/app_settings.py b/rest_auth/app_settings.py index 59d3456..e0ab429 100644 --- a/rest_auth/app_settings.py +++ b/rest_auth/app_settings.py @@ -7,7 +7,7 @@ else: from rest_auth.serializers import ( TokenSerializer as DefaultTokenSerializer, - KnoxTokenSerializer as DefaultKnoxTokenSerializer, + KnoxSerializer as DefaultKnoxSerializer, JWTSerializer as DefaultJWTSerializer, UserDetailsSerializer as DefaultUserDetailsSerializer, LoginSerializer as DefaultLoginSerializer, @@ -27,8 +27,8 @@ TokenSerializer = import_callable( JWTSerializer = import_callable( serializers.get('JWT_SERIALIZER', DefaultJWTSerializer)) -KnoxTokenSerializer = import_callable( - serializers.get('KNOX_TOKEN_SERIALIZER', DefaultKnoxTokenSerializer)) +KnoxSerializer = import_callable( + serializers.get('KNOX_TOKEN_SERIALIZER', DefaultKnoxSerializer)) UserDetailsSerializer = import_callable( serializers.get('USER_DETAILS_SERIALIZER', DefaultUserDetailsSerializer) diff --git a/rest_auth/serializers.py b/rest_auth/serializers.py index 15a6082..a1ddbc8 100644 --- a/rest_auth/serializers.py +++ b/rest_auth/serializers.py @@ -145,7 +145,7 @@ class JWTSerializer(serializers.Serializer): user = CustomUserDetailsSerializer() -class KnoxTokenSerializer(serializers.Serializer): +class KnoxSerializer(serializers.Serializer): """ Serializer for Knox authentication. """ diff --git a/rest_auth/views.py b/rest_auth/views.py index 3ec81de..ffb2f67 100644 --- a/rest_auth/views.py +++ b/rest_auth/views.py @@ -16,7 +16,7 @@ from rest_framework.generics import GenericAPIView, RetrieveUpdateAPIView from rest_framework.permissions import IsAuthenticated, AllowAny from .app_settings import ( - TokenSerializer, KnoxTokenSerializer, UserDetailsSerializer, + TokenSerializer, KnoxSerializer, UserDetailsSerializer, LoginSerializer, PasswordResetSerializer, PasswordResetConfirmSerializer, PasswordChangeSerializer, JWTSerializer, create_token @@ -62,7 +62,7 @@ class LoginView(GenericAPIView): if getattr(settings, 'REST_USE_JWT', False): response_serializer = JWTSerializer elif getattr(settings, 'REST_USE_KNOX', False): - response_serializer = KnoxTokenSerializer + response_serializer = KnoxSerializer else: response_serializer = TokenSerializer return response_serializer