go/pocketbase
1
0
Fork 0
mirror of https://github.com/pocketbase/pocketbase.git synced 2025-02-04 02:04:08 +02:00
Code Issues Releases Activity

[#356] trigger password validators when any of the password related fields is set

Browse Source
This commit is contained in:
Gani Georgiev 2022-12-12 12:42:15 +02:00
parent 18d6a1c529
commit 21f442293f
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
forms/record_upsert.go
View File

@ -494,13 +494,16 @@ func (form *RecordUpsert) Validate() error {
), ),
validation.Field( validation.Field(
&form.Password, &form.Password,
validation.When(form.record.IsNew(), validation.Required), validation.When(
(form.record.IsNew() || form.PasswordConfirm != "" || form.OldPassword != ""),
validation.Required,
),
validation.Length(form.record.Collection().AuthOptions().MinPasswordLength, 72), validation.Length(form.record.Collection().AuthOptions().MinPasswordLength, 72),
), ),
validation.Field( validation.Field(
&form.PasswordConfirm, &form.PasswordConfirm,
validation.When( validation.When(
(form.record.IsNew() || form.Password != ""), (form.record.IsNew() || form.Password != "" || form.OldPassword != ""),
validation.Required, validation.Required,
), ),
validation.By(validators.Compare(form.Password)), validation.By(validators.Compare(form.Password)),
@ -511,7 +514,7 @@ func (form *RecordUpsert) Validate() error {
// - form.manageAccess is not set // - form.manageAccess is not set
// - changing the existing password // - changing the existing password
validation.When( validation.When(
!form.record.IsNew() && !form.manageAccess && form.Password != "", !form.record.IsNew() && !form.manageAccess && (form.Password != "" || form.PasswordConfirm != ""),
validation.Required, validation.Required,
validation.By(form.checkOldPassword), validation.By(form.checkOldPassword),
), ),
@ -648,7 +651,7 @@ func (form *RecordUpsert) ValidateAndFill() error {
} }
} }
if form.Password != "" { if form.Password != "" && form.Password == form.PasswordConfirm {
if err := form.record.SetPassword(form.Password); err != nil { if err := form.record.SetPassword(form.Password); err != nil {
return err return err
} }

18
forms/record_upsert_test.go
View File

@ -794,6 +794,24 @@ func TestRecordUpsertAuthRecord(t *testing.T) {
}, },
// password // password
{
"trigger the password validations if only oldPassword is set",
"4q1xlclmfloku33",
map[string]any{
"oldPassword": "1234567890",
},
false,
true,
},
{
"trigger the password validations if only passwordConfirm is set",
"4q1xlclmfloku33",
map[string]any{
"passwordConfirm": "1234567890",
},
false,
true,
},
{ {
"try to update password without managed access", "try to update password without managed access",
"4q1xlclmfloku33", "4q1xlclmfloku33",