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

Образован валидатор EmailValidator

Browse Source
This commit is contained in:
ErickSkrauch
2016-11-01 23:57:42 +03:00
parent 94a8e21f27
commit 91df81f97d
6 changed files with 184 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/models/authentication/RegistrationForm.php
View File

@@ -9,6 +9,7 @@ use common\models\Account;
use common\models\confirmations\RegistrationConfirmation;
use common\models\EmailActivation;
use common\models\UsernameHistory;
use common\validators\EmailValidator;
use common\validators\LanguageValidator;
use common\validators\PasswordValidate;
use common\validators\UsernameValidator;
@@ -42,7 +43,7 @@ class RegistrationForm extends ApiForm {
['rulesAgreement', 'required', 'message' => E::RULES_AGREEMENT_REQUIRED],
['username', UsernameValidator::class],
['email', 'validateEmail', 'skipOnEmpty' => false],
['email', EmailValidator::class],
['password', 'required', 'message' => E::PASSWORD_REQUIRED],
['rePassword', 'required', 'message' => E::RE_PASSWORD_REQUIRED],
@@ -54,14 +55,6 @@ class RegistrationForm extends ApiForm {
];
}
public function validateEmail() {
$account = new Account();
$account->email = $this->email;
if (!$account->validate(['email'])) {
$this->addErrors($account->getErrors());
}
}
public function validatePasswordAndRePasswordMatch($attribute) {
if (!$this->hasErrors()) {
if ($this->password !== $this->rePassword) {

20
api/models/profile/ChangeEmail/NewEmailForm.php
View File

@@ -2,10 +2,10 @@
namespace api\models\profile\ChangeEmail;
use api\models\base\KeyConfirmationForm;
use common\helpers\Error as E;
use common\models\Account;
use common\models\confirmations\NewEmailConfirmation;
use common\models\EmailActivation;
use common\validators\EmailValidator;
use Yii;
use yii\base\ErrorException;
use yii\base\Exception;
@@ -25,26 +25,14 @@ class NewEmailForm extends KeyConfirmationForm {
parent::__construct($config);
}
/**
* @return Account
*/
public function getAccount() {
return $this->account;
}
public function rules() {
return array_merge(parent::rules(), [
['email', 'required', 'message' => E::EMAIL_REQUIRED],
['email', 'validateEmail'],
['email', EmailValidator::class],
]);
}
public function validateEmail() {
$account = new Account();
$account->email = $this->email;
if (!$account->validate(['email'])) {
$this->addErrors($account->getErrors());
}
public function getAccount() : Account {
return $this->account;
}
public function sendNewEmailConfirmation() {