Merge branch 'develop' into 2.4-bugfixes-013122

Author: dvoskoboinikov

ReCaptchaCustomer/Plugin/Customer/DisableCreateAccountButton.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptchaCustomer\Plugin\Customer;
+
+use Magento\Framework\Exception\InputException;
+use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
+use Magento\Customer\ViewModel\CreateAccountButton;
+
+/**
+ * Disable button Create Account while captcha is loading
+ */
+class DisableCreateAccountButton
+{
+    /**
+     * @var IsCaptchaEnabledInterface
+     */
+    private $isCaptchaEnabled;
+
+    /**
+     * @param IsCaptchaEnabledInterface $isCaptchaEnabled
+     */
+    public function __construct(
+        IsCaptchaEnabledInterface $isCaptchaEnabled
+    ) {
+        $this->isCaptchaEnabled = $isCaptchaEnabled;
+    }
+
+    /**
+     * Temporally disable button Create Account while captcha is loading
+     *
+     * @param CreateAccountButton $subject
+     * @return bool
+     * @throws InputException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterDisabled(CreateAccountButton $subject): bool
+    {
+        $key = 'customer_create';
+        return $this->isCaptchaEnabled->isCaptchaEnabledFor($key);
+    }
+}

ReCaptchaCustomer/Plugin/Customer/DisableLoginButton.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptchaCustomer\Plugin\Customer;
+
+use Magento\Framework\Exception\InputException;
+use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
+use Magento\ReCaptchaUi\Model\UiConfigResolverInterface;
+use Magento\Customer\ViewModel\LoginButton;
+
+/**
+ * Disable Login button while captcha is loading
+ */
+class DisableLoginButton
+{
+    /**
+     * @var IsCaptchaEnabledInterface
+     */
+    private $isCaptchaEnabled;
+
+    /**
+     * @param IsCaptchaEnabledInterface $isCaptchaEnabled
+     */
+    public function __construct(
+        IsCaptchaEnabledInterface $isCaptchaEnabled
+    ) {
+        $this->isCaptchaEnabled = $isCaptchaEnabled;
+    }
+
+    /**
+     * Temporally disable Login button while captcha is loading
+     *
+     * @param LoginButton $subject
+     * @return bool
+     * @throws InputException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterDisabled(LoginButton $subject): bool
+    {
+        $key = 'customer_login';
+        return $this->isCaptchaEnabled->isCaptchaEnabledFor($key);
+    }
+}

ReCaptchaCustomer/Test/Unit/Plugin/Customer/DisableCreateAccountButtonTest.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptchaCustomer\Test\Unit\Plugin\Customer;
+
+use Magento\Customer\ViewModel\CreateAccountButton;
+use Magento\ReCaptchaCustomer\Plugin\Customer\DisableCreateAccountButton;
+use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test disable Login button while captcha is loading
+ */
+class DisableCreateAccountButtonTest extends TestCase
+{
+    /**
+     * @var IsCaptchaEnabledInterface|MockObject
+     */
+    protected $isCaptchaEnabled;
+
+    /**
+     * @var CreateAccountButton|MockObject
+     */
+    protected $subject;
+
+    /**
+     * @var DisableCreateAccountButton
+     */
+    protected $plugin;
+
+    protected function setUp(): void
+    {
+        $this->isCaptchaEnabled = $this->getMockForAbstractClass(
+            IsCaptchaEnabledInterface::class
+        );
+        $this->subject = $this->createMock(CreateAccountButton::class);
+
+        $this->plugin = new DisableCreateAccountButton(
+            $this->isCaptchaEnabled
+        );
+    }
+
+    public function testAfterEnabled()
+    {
+        $key = 'customer_create';
+        $this->isCaptchaEnabled->expects($this->once())
+            ->method('isCaptchaEnabledFor')->with($key)->willReturn(true);
+        $this->assertEquals(true, $this->plugin->afterDisabled($this->subject));
+    }
+}

ReCaptchaCustomer/Test/Unit/Plugin/Customer/DisableLoginButtonTest.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptchaCustomer\Test\Unit\Plugin\Customer;
+
+use Magento\Customer\ViewModel\LoginButton;
+use Magento\ReCaptchaCustomer\Plugin\Customer\DisableLoginButton;
+use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test disable Login button while captcha is loading
+ */
+class DisableLoginButtonTest extends TestCase
+{
+    /**
+     * IsCaptcha Enabled mock
+     *
+     * @var IsCaptchaEnabledInterface|MockObject
+     */
+    protected $isCaptchaEnabled;
+
+    /**
+     * Subject LoginButton
+     *
+     * @var LoginButton|MockObject
+     */
+    protected $subject;
+
+    /**
+     * Tested plugin
+     *
+     * @var DisableLoginButtonTest
+     */
+    protected $plugin;
+
+    protected function setUp(): void
+    {
+        $this->isCaptchaEnabled = $this->getMockForAbstractClass(
+            IsCaptchaEnabledInterface::class
+        );
+        $this->subject = $this->createMock(LoginButton::class);
+
+        $this->plugin = new DisableLoginButton(
+            $this->isCaptchaEnabled
+        );
+    }
+
+    public function testAfterEnabled()
+    {
+        $key = 'customer_login';
+        $this->isCaptchaEnabled->expects($this->once())
+            ->method('isCaptchaEnabledFor')->with($key)->willReturn(true);
+        $this->assertEquals(true, $this->plugin->afterDisabled($this->subject));
+    }
+}

ReCaptchaCustomer/etc/frontend/di.xml

@@ -20,5 +20,12 @@
         <plugin sortOrder="1" name="inject_recaptcha_in_authentication_popup"
                 type="Magento\ReCaptchaCustomer\Plugin\Block\Account\InjectRecaptchaInAuthenticationPopup"/>
     </type>
-
+    <type name="Magento\Customer\ViewModel\LoginButton">
+        <plugin sortOrder="1" name="recaptcha_disable_login_button"
+                type="Magento\ReCaptchaCustomer\Plugin\Customer\DisableLoginButton"/>
+    </type>
+    <type name="Magento\Customer\ViewModel\CreateAccountButton">
+        <plugin sortOrder="1" name="recaptcha_disable_create_account_button"
+                type="Magento\ReCaptchaCustomer\Plugin\Customer\DisableCreateAccountButton"/>
+    </type>
 </config>

ReCaptchaFrontendUi/view/frontend/web/js/reCaptcha.js

@@ -174,6 +174,7 @@ define(
                 } else {
                     this.tokenField = null;
                 }
+                if ($('#send2').length > 0) {$('#send2').prop('disabled', false);}
             },
 
             /**

ReCaptchaFrontendUi/view/frontend/web/template/reCaptcha.html

@@ -20,7 +20,7 @@
                    class="required-captcha checkbox"
                    name="recaptcha-validate-"
                    data-validate="{required:true}"
-            />
+                   tabindex="-1">
         </div>
     </div>
     <!-- /ko -->