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

Поле token в контексте otp токенов переименовано в totp

Browse Source
This commit is contained in:
ErickSkrauch
2017-09-06 20:17:52 +03:00
parent 2bdb79b43d
commit 2c08130f4e
16 changed files with 65 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/models/authentication/LoginForm.php
View File

@ -17,10 +17,10 @@ class LoginForm extends ApiForm {
public $login;
public $password;
public $token;
public $totp;
public $rememberMe = false;
public function rules() {
public function rules(): array {
return [
['login', 'required', 'message' => E::LOGIN_REQUIRED],
['login', 'validateLogin'],
@ -30,10 +30,10 @@ class LoginForm extends ApiForm {
}, 'message' => E::PASSWORD_REQUIRED],
['password', 'validatePassword'],
['token', 'required', 'when' => function(self $model) {
['totp', 'required', 'when' => function(self $model) {
return !$model->hasErrors() && $model->getAccount()->is_otp_enabled;
}, 'message' => E::OTP_TOKEN_REQUIRED],
['token', 'validateTotpToken'],
}, 'message' => E::TOTP_REQUIRED],
['totp', 'validateTotp'],
['login', 'validateActivity'],
@ -58,7 +58,7 @@ class LoginForm extends ApiForm {
}
}
public function validateTotpToken($attribute) {
public function validateTotp($attribute) {
if ($this->hasErrors()) {
return;
}