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

Убраны разрознености в ошибках, скорреткированы тесты

Browse Source
This commit is contained in:
ErickSkrauch
2016-06-16 22:36:52 +03:00
parent 73d07f355a
commit 4614cf8fe7
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ class ForgotPasswordForm extends ApiForm {
if (!$this->hasErrors()) {
$emailConfirmation = $this->getEmailActivation();
if ($emailConfirmation !== null && !$emailConfirmation->canRepeat()) {
$this->addError($attribute, 'error.email_frequency');
$this->addError($attribute, 'error.recently_sent_message');
}
}
}

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

@ -27,7 +27,7 @@ class RegistrationForm extends ApiForm {
public function rules() {
return [
[[], ReCaptchaValidator::class, 'message' => 'error.captcha_invalid', 'when' => !YII_ENV_TEST],
['rulesAgreement', 'required', 'message' => 'error.you_must_accept_rules'],
['rulesAgreement', 'required', 'message' => 'error.rulesAgreement_required'],
['username', 'validateUsername', 'skipOnEmpty' => false],
['email', 'validateEmail', 'skipOnEmpty' => false],

2
api/models/base/KeyConfirmationForm.php
View File

@ -13,7 +13,7 @@ class KeyConfirmationForm extends ApiForm {
public function rules() {
return [
// TODO: нужно провалидировать количество попыток ввода кода для определённого IP адреса и в случае чего запросить капчу
['key', 'required', 'message' => 'error.key_is_required'],
['key', 'required', 'message' => 'error.key_required'],
['key', EmailActivationKeyValidator::class],
];
}