Merge 72670bf into 996a1c5

st4lk · Aug 29, 2020 · 5d6db1d · 5d6db1d
2 parents 996a1c5 + 72670bf
commit 5d6db1d
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/rest_social_auth/serializers.py b/rest_social_auth/serializers.py
@@ -6,6 +6,15 @@
 from rest_framework.authtoken.models import Token
 
 
+# Finding fields to be excluded from User Serializer
+User = get_user_model()
+user_fields = set([field.name for field in User._meta.get_fields()])
+fields_to_exclude = {'is_staff', 'is_active', 'date_joined', 'password', 'last_login',
+                     'user_permissions', 'groups', 'is_superuser'}
+fields_to_exclude &= user_fields
+fields_to_exclude = list(fields_to_exclude)
+
+
 class OAuth2InputSerializer(serializers.Serializer):
 
     provider = serializers.CharField(required=False)
@@ -24,10 +33,7 @@ class UserSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = get_user_model()
-        exclude = (
-            'is_staff', 'is_active', 'date_joined', 'password', 'last_login', 'user_permissions',
-            'groups', 'is_superuser',
-        )
+        exclude = fields_to_exclude
 
 
 class TokenSerializer(serializers.Serializer):