Only attempt to change password if the confirmation field is filled in

Firefox autocompletes the password field (but not the password
confirmation field) for me. This makes it annoying to use the settings
page, because miniflux thinks I'm trying to change my password and
complains that the fields don't match.
This commit is contained in:
Peter De Wachter 2019-01-01 21:53:52 +01:00 committed by fguillot
parent 28ba09e952
commit 6f5ef10553
2 changed files with 66 additions and 1 deletions

View File

@ -43,7 +43,12 @@ func (s *SettingsForm) Validate() error {
return errors.NewLocalizedError("error.settings_mandatory_fields")
}
if s.Password != "" {
if s.Confirmation == "" {
// Firefox insists on auto-completing the password field.
// If the confirmation field is blank, the user probably
// didn't intend to change their password.
s.Password = ""
} else if s.Password != "" {
if s.Password != s.Confirmation {
return errors.NewLocalizedError("error.different_passwords")
}

60
ui/form/settings_test.go Normal file
View File

@ -0,0 +1,60 @@
package form // import "miniflux.app/ui/form"
import (
"testing"
)
func TestValid(t *testing.T) {
settings := &SettingsForm{
Username: "user",
Password: "hunter2",
Confirmation: "hunter2",
Theme: "default",
Language: "en_US",
Timezone: "UTC",
EntryDirection: "asc",
}
err := settings.Validate()
if err != nil {
t.Error(err)
}
}
func TestConfirmationEmpty(t *testing.T) {
settings := &SettingsForm{
Username: "user",
Password: "hunter2",
Confirmation: "",
Theme: "default",
Language: "en_US",
Timezone: "UTC",
EntryDirection: "asc",
}
err := settings.Validate()
if err != nil {
t.Error(err)
}
if settings.Password != "" {
t.Error("Password should have been cleared")
}
}
func TestConfirmationIncorrect(t *testing.T) {
settings := &SettingsForm{
Username: "user",
Password: "hunter2",
Confirmation: "unter2",
Theme: "default",
Language: "en_US",
Timezone: "UTC",
EntryDirection: "asc",
}
err := settings.Validate()
if err == nil {
t.Error("Validate should return an error")
}
}