undid regressions from code merge with diego

core/serializers.py

@@ -1,30 +1,27 @@
-from rest_framework_simplejwt.serializers import TokenObtainPairSerializer
 from rest_framework import serializers
 
 from . import models
 
 
 class CustomUserSerializer(serializers.ModelSerializer):
-    password = serializers.CharField(write_only=True, required=True, style={'input_type': 'password'})
+
     class Meta:
         model = models.CustomUser
-        fields = ('id', 'email', 'full_name', 'role', 'password', 'is_active', 'notify')
+        fields = ('email', 'full_name', 'role', 'is_active')
 
 
-class CustomUserAdminSerializer(serializers.ModelSerializer):
-    password = serializers.CharField(write_only=True, required=False, style={'input_type': 'password'})
+class CustomUserReadSerializer(serializers.ModelSerializer):
+
     class Meta:
         model = models.CustomUser
-        fields = ('id', 'email', 'full_name', 'role', 'password', 'is_active', 'notify')
+        fields = ('id', 'email', 'full_name', 'role', 'is_active', 'provider', 'notify')
 
-    def update(self, instance, validated_data):
-        for key, value in validated_data.items():
-            instance.__dict__[key] = value
-        if 'password' in validated_data:
-            instance.set_password(validated_data['password'])
-        instance.save()
 
-        return instance
+class CustomUserWriteSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = models.CustomUser
+        fields = ('email', 'full_name', 'role', 'password', 'provider')
 
 
 class CreatorSerializer(serializers.ModelSerializer):
@@ -34,6 +31,24 @@ class CreatorSerializer(serializers.ModelSerializer):
         fields = ('email',)
 
 
+class CustomUserAdminSerializer(serializers.ModelSerializer):
+
+    password = serializers.CharField(write_only=True, required=False, style={'input_type': 'password'})
+
+    class Meta:
+        model = models.CustomUser
+        fields = ('id', 'email', 'full_name', 'role', 'password', 'is_active', 'notify')
+
+    def update(self, instance, validated_data):
+
+        for key, value in validated_data.items():
+            instance.__dict__[key] = value
+        if 'password' in validated_data:
+            instance.set_password(validated_data['password'])
+        instance.save()
+        return instance
+
+
 class ChangePasswordSerializer(serializers.ModelSerializer):
     password = serializers.CharField(write_only=True, required=True)
     password2 = serializers.CharField(write_only=True, required=True)