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

Образован хелпер Error, в который вынесены все коды ошибок.

Browse Source 
Подкорректирован errorDict на фронте
This commit is contained in:
ErickSkrauch
2016-06-16 23:32:23 +03:00
parent 4614cf8fe7
commit 8906370bb9
22 changed files with 146 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/models/authentication/ForgotPasswordForm.php
View File

@@ -2,6 +2,7 @@
namespace api\models\authentication;
use api\models\base\ApiForm;
use common\helpers\Error as E;
use api\traits\AccountFinder;
use common\components\UserFriendlyRandomKey;
use common\models\Account;
@@ -18,7 +19,7 @@ class ForgotPasswordForm extends ApiForm {
public function rules() {
return [
['login', 'required', 'message' => 'error.login_required'],
['login', 'required', 'message' => E::LOGIN_REQUIRED],
['login', 'validateLogin'],
['login', 'validateActivity'],
['login', 'validateFrequency'],
@@ -28,7 +29,7 @@ class ForgotPasswordForm extends ApiForm {
public function validateLogin($attribute) {
if (!$this->hasErrors()) {
if ($this->getAccount() === null) {
$this->addError($attribute, 'error.' . $attribute . '_not_exist');
$this->addError($attribute, E::LOGIN_NOT_EXIST);
}
}
}
@@ -37,7 +38,7 @@ class ForgotPasswordForm extends ApiForm {
if (!$this->hasErrors()) {
$account = $this->getAccount();
if ($account->status !== Account::STATUS_ACTIVE) {
$this->addError($attribute, 'error.account_not_activated');
$this->addError($attribute, E::ACCOUNT_NOT_ACTIVATED);
}
}
}
@@ -46,7 +47,7 @@ class ForgotPasswordForm extends ApiForm {
if (!$this->hasErrors()) {
$emailConfirmation = $this->getEmailActivation();
if ($emailConfirmation !== null && !$emailConfirmation->canRepeat()) {
$this->addError($attribute, 'error.recently_sent_message');
$this->addError($attribute, E::RECENTLY_SENT_MESSAGE);
}
}
}