ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2025-05-31 14:11:46 +05:30
Code Issues Packages Projects Releases Wiki Activity

Добавлено поле username в модель Account, скорретирована форма входа и её тесты

Browse Source
This commit is contained in:
ErickSkrauch
2016-01-04 18:31:14 +03:00
parent c6a6f35be6
commit 45c31dfbbe
5 changed files with 76 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
api/modules/login/models/AuthenticationForm.php
View File

@@ -7,17 +7,16 @@ use yii\base\Model;
class AuthenticationForm extends Model {
public $email;
public $login;
public $password;
public $rememberMe = true;
private $_user;
private $_account;
public function rules() {
return [
['email', 'required', 'message' => 'error.email_required'],
['email', 'email', 'message' => 'error.email_invalid'],
['email', 'exist', 'targetClass' => Account::class, 'skipOnError' => true, 'message' => 'error.email_not_exist'],
['login', 'required', 'message' => 'error.login_required'],
['login', 'validateLogin'],
['password', 'required', 'when' => function(self $model) {
return !$model->hasErrors();
@@ -28,11 +27,19 @@ class AuthenticationForm extends Model {
];
}
public function validateLogin($attribute) {
if (!$this->hasErrors()) {
if (!$this->getAccount()) {
$this->addError($attribute, 'error.' . $attribute . '_not_exist');
}
}
}
public function validatePassword($attribute) {
if (!$this->hasErrors()) {
$account = $this->getAccount();
if (!$account || !$account->validatePassword($this->password)) {
$this->addError($attribute, 'error.password_incorrect');
$this->addError($attribute, 'error.' . $attribute . '_incorrect');
}
}
}
@@ -54,11 +61,12 @@ class AuthenticationForm extends Model {
* @return Account|null
*/
protected function getAccount() {
if ($this->_user === NULL) {
$this->_user = Account::findByEmail($this->email);
if ($this->_account === NULL) {
$attribute = strpos($this->login, '@') ? 'email' : 'username';
$this->_account = Account::findOne([$attribute => $this->login]);
}
return $this->_user;
return $this->_account;
}
}