Tivix/django-rest-auth
1
1
Fork 0
mirror of https://github.com/Tivix/django-rest-auth.git synced 2025-07-08 13:13:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renamed KnoxTokenSerializer to KnoxSerializer

Browse Source 
As it now returns both token and user
This commit is contained in:
Daniel Stanton 2017-01-25 18:00:02 +00:00
parent 1ce7b850d7
commit c341b1b0ff
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_auth/app_settings.py
View File

@ -7,7 +7,7 @@ else:
from rest_auth.serializers import ( from rest_auth.serializers import (
TokenSerializer as DefaultTokenSerializer, TokenSerializer as DefaultTokenSerializer,
KnoxTokenSerializer as DefaultKnoxTokenSerializer, KnoxSerializer as DefaultKnoxSerializer,
JWTSerializer as DefaultJWTSerializer, JWTSerializer as DefaultJWTSerializer,
UserDetailsSerializer as DefaultUserDetailsSerializer, UserDetailsSerializer as DefaultUserDetailsSerializer,
LoginSerializer as DefaultLoginSerializer, LoginSerializer as DefaultLoginSerializer,
@ -27,8 +27,8 @@ TokenSerializer = import_callable(
JWTSerializer = import_callable( JWTSerializer = import_callable(
serializers.get('JWT_SERIALIZER', DefaultJWTSerializer)) serializers.get('JWT_SERIALIZER', DefaultJWTSerializer))
KnoxTokenSerializer = import_callable( KnoxSerializer = import_callable(
serializers.get('KNOX_TOKEN_SERIALIZER', DefaultKnoxTokenSerializer)) serializers.get('KNOX_TOKEN_SERIALIZER', DefaultKnoxSerializer))
UserDetailsSerializer = import_callable( UserDetailsSerializer = import_callable(
serializers.get('USER_DETAILS_SERIALIZER', DefaultUserDetailsSerializer) serializers.get('USER_DETAILS_SERIALIZER', DefaultUserDetailsSerializer)

2
rest_auth/serializers.py
View File

@ -145,7 +145,7 @@ class JWTSerializer(serializers.Serializer):
user = CustomUserDetailsSerializer() user = CustomUserDetailsSerializer()
class KnoxTokenSerializer(serializers.Serializer): class KnoxSerializer(serializers.Serializer):
""" """
Serializer for Knox authentication. Serializer for Knox authentication.
""" """

4
rest_auth/views.py
View File

@ -16,7 +16,7 @@ from rest_framework.generics import GenericAPIView, RetrieveUpdateAPIView
from rest_framework.permissions import IsAuthenticated, AllowAny from rest_framework.permissions import IsAuthenticated, AllowAny
from .app_settings import ( from .app_settings import (
TokenSerializer, KnoxTokenSerializer, UserDetailsSerializer, TokenSerializer, KnoxSerializer, UserDetailsSerializer,
LoginSerializer, PasswordResetSerializer, LoginSerializer, PasswordResetSerializer,
PasswordResetConfirmSerializer, PasswordChangeSerializer, PasswordResetConfirmSerializer, PasswordChangeSerializer,
JWTSerializer, create_token JWTSerializer, create_token
@ -62,7 +62,7 @@ class LoginView(GenericAPIView):
if getattr(settings, 'REST_USE_JWT', False): if getattr(settings, 'REST_USE_JWT', False):
response_serializer = JWTSerializer response_serializer = JWTSerializer
elif getattr(settings, 'REST_USE_KNOX', False): elif getattr(settings, 'REST_USE_KNOX', False):
response_serializer = KnoxTokenSerializer response_serializer = KnoxSerializer
else: else:
response_serializer = TokenSerializer response_serializer = TokenSerializer
return response_serializer return response_serializer