ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2024-12-26 23:20:18 +05:30
Code Issues Packages Projects Releases Wiki Activity

Do not request password till newPassword and newRePassword are valid

Browse Source
This commit is contained in:
SleepWalker 2016-05-02 13:11:10 +03:00
parent 479f633d3f
commit 75a0811488
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/models/ChangePasswordForm.php
View File

@ -34,7 +34,7 @@ class ChangePasswordForm extends PasswordProtectedForm {
} }
public function validatePasswordAndRePasswordMatch($attribute) { public function validatePasswordAndRePasswordMatch($attribute) {
if (!$this->hasErrors()) { if (!$this->hasErrors($attribute)) {
if ($this->newPassword !== $this->newRePassword) { if ($this->newPassword !== $this->newRePassword) {
$this->addError($attribute, 'error.newRePassword_does_not_match'); $this->addError($attribute, 'error.newRePassword_does_not_match');
} }

13
tests/codeception/api/unit/models/ChangePasswordFormTest.php
View File

@ -47,6 +47,19 @@ class ChangePasswordFormTest extends DbTestCase {
$model->validatePasswordAndRePasswordMatch('newRePassword'); $model->validatePasswordAndRePasswordMatch('newRePassword');
expect($model->getErrors('newRePassword'))->isEmpty(); expect($model->getErrors('newRePassword'))->isEmpty();
}); });
$this->specify('error.newRePassword_does_not_match expected even if there are errors on other attributes', function() {
// this is very important, because password change flow may be combined of two steps
// therefore we need to validate password sameness before we will validate current account password
$account = new Account();
$account->setPassword('12345678');
$model = new ChangePasswordForm($account, [
'newPassword' => 'my-new-password',
'newRePassword' => 'another-password',
]);
$model->validate();
expect($model->getErrors('newRePassword'))->equals(['error.newRePassword_does_not_match']);
});
} }
public function testChangePassword() { public function testChangePassword() {