Use custom User serializer with Knox as well as JWT

This commit is contained in:
Daniel Stanton 2017-01-25 16:19:02 +00:00
parent abb0ae963e
commit c1df248dbb
2 changed files with 5 additions and 5 deletions

View File

@ -52,7 +52,7 @@ class RegisterView(CreateAPIView):
return JWTSerializer(data).data return JWTSerializer(data).data
elif getattr(settings, 'REST_USE_KNOX', False): elif getattr(settings, 'REST_USE_KNOX', False):
data = { data = {
'token': self.user, 'token': user,
'token': self.token 'token': self.token
} }
return KnoxTokenSerializer(data).data return KnoxTokenSerializer(data).data

View File

@ -132,7 +132,7 @@ class UserDetailsSerializer(serializers.ModelSerializer):
# Required to allow using custom USER_DETAILS_SERIALIZER in # Required to allow using custom USER_DETAILS_SERIALIZER in
# JWTSerializer. Defining it here to avoid circular imports # JWTSerializer. Defining it here to avoid circular imports
rest_auth_serializers = getattr(settings, 'REST_AUTH_SERIALIZERS', {}) rest_auth_serializers = getattr(settings, 'REST_AUTH_SERIALIZERS', {})
JWTUserDetailsSerializer = import_callable( CustomUserDetailsSerializer = import_callable(
rest_auth_serializers.get('USER_DETAILS_SERIALIZER', UserDetailsSerializer) rest_auth_serializers.get('USER_DETAILS_SERIALIZER', UserDetailsSerializer)
) )
@ -142,15 +142,15 @@ class JWTSerializer(serializers.Serializer):
Serializer for JWT authentication. Serializer for JWT authentication.
""" """
token = serializers.CharField() token = serializers.CharField()
user = JWTUserDetailsSerializer() user = CustomUserDetailsSerializer()
class KnoxTokenSerializer(serializers.Serializer): class KnoxTokenSerializer(serializers.Serializer):
""" """
Serializer for Knox AuthToken model. Serializer for Knox authentication.
""" """
token = serializers.CharField() token = serializers.CharField()
user = JWTUserDetailsSerializer() user = CustomUserDetailsSerializer()
class PasswordResetSerializer(serializers.Serializer): class PasswordResetSerializer(serializers.Serializer):