Ne demande pas de mot de passe aux utilisateurs qui n'en ont pas (#6420)

zestedesavoir · Dec 1, 2022 · 60ad124 · 60ad124
1 parent 6e9ad77
commit 60ad124
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/zds/member/forms.py b/zds/member/forms.py
@@ -411,7 +411,7 @@ def __init__(self, user, *args, **kwargs):
             Field("username", value=user.username),
             Field("email", value=user.email),
             Field("options"),
-            Field("password"),
+            self.insert_password_required_field(),
             ButtonHolder(
                 StrictButton(_("Enregistrer"), type="submit"),
             ),
@@ -449,7 +449,7 @@ def __init__(self, user, *args, **kwargs):
         self.user = user
 
         self.helper.layout = Layout(
-            Field("password"),
+            self.insert_password_required_field(),
             HTML(
                 _(
                     """
@@ -491,7 +491,7 @@ def __init__(self, user, *args, **kwargs):
         self.user = user
 
         self.helper.layout = Layout(
-            Field("password"),
+            self.insert_password_required_field(),
             Field("password_new"),
             Field("password_confirm"),
             ButtonHolder(

diff --git a/zds/utils/forms.py b/zds/utils/forms.py
@@ -168,11 +168,17 @@ class PasswordRequiredForm(forms.Form):
         widget=forms.PasswordInput,
     )
 
+    def insert_password_required_field(self):
+        if self.user.has_usable_password():
+            return Field("password")
+        else:
+            del self.fields["password"]
+
     def clean(self):
         cleaned_data = super().clean()
         password = cleaned_data.get("password")
 
-        if password and self.user:
+        if password and self.user and self.user.has_usable_password():
             user_exist = authenticate(username=self.user.username, password=password)
             # Check if the user exist.
             if not user_exist and password != "":