fix password check

Georiviere · Apr 29, 2024 · 5859bf6 · 5859bf6
1 parent 393aba1
commit 5859bf6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/georiviere/contribution/locale/en/LC_MESSAGES/django.po b/georiviere/contribution/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-29 07:30+0000\n"
+"POT-Creation-Date: 2024-04-29 07:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/georiviere/contribution/locale/fr/LC_MESSAGES/django.po b/georiviere/contribution/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-29 07:30+0000\n"
+"POT-Creation-Date: 2024-04-29 07:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/georiviere/portal/serializers/contribution.py b/georiviere/portal/serializers/contribution.py
@@ -6,7 +6,7 @@
 from django.contrib.gis.geos import GEOSGeometry
 from django.db import transaction
 from django.db.models import ForeignKey
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 
 from georiviere.contribution.schema import (
     get_contribution_properties,
@@ -228,6 +228,7 @@ def __init__(self, *args, **kwargs):
             self.fields["password"] = serializers.CharField(required=True, write_only=True)
 
     def create(self, validated_data):
+        validated_data.pop("password", None)
         custom_type = self.context.get("custom_type")
         # add and customize fields from json schema
         schema = custom_type.get_json_schema_form()
@@ -239,16 +240,11 @@ def create(self, validated_data):
         validated_data["data"] = data
         return super().create(validated_data)
 
-    def validate(self, data):
-        # check password if required
+    def validate_password(self, value):
         custom_type = self.context.get("custom_type")
-        if (
-            custom_type
-            and custom_type.password
-            and data.get("password", "") != custom_type.password
-        ):
+        if custom_type and custom_type.password and value != custom_type.password:
             raise serializers.ValidationError(_("Password mismatch."))
-        return data
+        return value
 
     class Meta:
         model = CustomContribution

diff --git a/georiviere/portal/views/contribution.py b/georiviere/portal/views/contribution.py
@@ -189,7 +189,8 @@ def create_contribution(self, request, *args, **kwargs):
             custom_type = self.get_object()
             context["custom_type"] = custom_type
             serializer = self.get_serializer(data=request.data, context=context)
-            serializer.is_valid(raise_exception=True)
+            if not serializer.is_valid():
+                return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
             extra_save_params = {}
             # if station selected, save its geom
             if "station" in serializer.validated_data: