Allow using custom UserDetailsSerializer with JWTSerializer - update

Author: maxim-kht

rest_auth/serializers.py

@@ -6,11 +6,12 @@
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import force_text
 
-from .models import TokenModel
-
 from rest_framework import serializers, exceptions
 from rest_framework.exceptions import ValidationError
 
+from .models import TokenModel
+from .utils import import_callable
+
 # Get the UserModel
 UserModel = get_user_model()
 
@@ -130,21 +131,20 @@ class Meta:
         read_only_fields = ('email', )
 
 
+# Required to allow using custom UserDetailsSerializer in
+# JWTSerializer
+rest_auth_serializers = getattr(settings, 'REST_AUTH_SERIALIZERS', {})
+JWTUserDetailsSerializer = import_callable(
+    rest_auth_serializers.get('USER_DETAILS_SERIALIZER', UserDetailsSerializer)
+)
+
+
 class JWTSerializer(serializers.Serializer):
     """
     Serializer for JWT authentication.
     """
     token = serializers.CharField()
-
-    def __init__(self, *args, **kwargs):
-        """
-        Need to add `user` field dynamically, to allow using
-        custom UserDetailsSerializer
-        """
-        from app_settings import UserDetailsSerializer
-
-        super(JWTSerializer, self).__init__(*args, **kwargs)
-        self.fields['user'] = UserDetailsSerializer()
+    user = JWTUserDetailsSerializer()
 
 
 class PasswordResetSerializer(serializers.Serializer):