Release 4-8-6

rog/serializers.py

@@ -155,17 +155,22 @@ class UserRegistrationSerializer(serializers.ModelSerializer):
 #        return user
 
 class TempUserRegistrationSerializer(serializers.ModelSerializer):
+    password = serializers.CharField(write_only=True)
+
     class Meta:
         model = TempUser
-        fields = ('email', 'firstname', 'lastname', 'date_of_birth', 'female')
+        fields = ('email', 'password', 'firstname', 'lastname', 'date_of_birth', 'female')
 
     def create(self, validated_data):
-        validated_data['verification_code'] = str(uuid.uuid4())
-        raw_password = validated_data.get('password')
-        hashed_password = make_password(raw_password)
-        validated_data['password'] = hashed_password
+        # パスワードのハッシュ化はviewで行うので、ここではそのまま保存
         return TempUser.objects.create(**validated_data)
 
+        #validated_data['verification_code'] = str(uuid.uuid4())
+        #raw_password = validated_data.get('password')
+        #hashed_password = make_password(raw_password)
+        #validated_data['password'] = hashed_password
+        #return TempUser.objects.create(**validated_data)
+
 
 class UserSerializer(serializers.ModelSerializer):
     class Meta:
@@ -793,4 +798,16 @@ class EntryCreationSerializer(serializers.Serializer):
 
         return entry
 
+class PasswordResetRequestSerializer(serializers.Serializer):
+    email = serializers.EmailField()
+
+class PasswordResetConfirmSerializer(serializers.Serializer):
+    new_password = serializers.CharField(write_only=True)
+    confirm_password = serializers.CharField(write_only=True)
+
+    def validate(self, data):
+        if data['new_password'] != data['confirm_password']:
+            raise serializers.ValidationError("Passwords do not match")
+        validate_password(data['new_password'])
+        return data