Merge branch 'forgot_password_captcha' into develop

api/models/authentication/ForgotPasswordForm.php

@@ -1,9 +1,10 @@
 <?php
 namespace api\models\authentication;
 
-use common\emails\EmailHelper;
+use api\components\ReCaptcha\Validator as ReCaptchaValidator;
 use api\models\base\ApiForm;
 use api\validators\TotpValidator;
+use common\emails\EmailHelper;
 use common\helpers\Error as E;
 use api\traits\AccountFinder;
 use common\components\UserFriendlyRandomKey;
@@ -15,11 +16,15 @@ use yii\base\ErrorException;
 class ForgotPasswordForm extends ApiForm {
     use AccountFinder;
 
+    public $captcha;
+
     public $login;
+
     public $token;
 
     public function rules() {
         return [
+            ['captcha', ReCaptchaValidator::class],
             ['login', 'required', 'message' => E::LOGIN_REQUIRED],
             ['login', 'validateLogin'],
             ['token', 'required', 'when' => function(self $model) {

tests/codeception/api/unit/models/authentication/ForgotPasswordFormTest.php

@@ -1,6 +1,7 @@
 <?php
 namespace codeception\api\unit\models\authentication;
 
+use api\components\ReCaptcha\Validator as ReCaptchaValidator;
 use api\models\authentication\ForgotPasswordForm;
 use Codeception\Specify;
 use common\models\EmailActivation;
@@ -8,10 +9,20 @@ use OTPHP\TOTP;
 use tests\codeception\api\unit\TestCase;
 use tests\codeception\common\fixtures\AccountFixture;
 use tests\codeception\common\fixtures\EmailActivationFixture;
+use Yii;
 
 class ForgotPasswordFormTest extends TestCase {
     use Specify;
 
+    public function setUp() {
+        parent::setUp();
+        Yii::$container->set(ReCaptchaValidator::class, new class extends ReCaptchaValidator {
+            public function validateValue($value) {
+                return null;
+            }
+        });
+    }
+
     public function _fixtures() {
         return [
             'accounts' => AccountFixture::class,