Merge pull request #79 from magento-cia/2.4.5-develop-2.4-develop-sync-05312022

Sync of 2.4.5-develop with 2.4-develop

Author: dvoskoboinikov

ReCaptchaCustomer/Plugin/Customer/DisableForgotPasswordButton.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\ForgotPasswordButton;
+
+/**
+ * Disable Forgot password button while captcha is loading
+ */
+class DisableForgotPasswordButton
+{
+    /**
+     * @var IsCaptchaEnabledInterface
+     */
+    private $isCaptchaEnabled;
+
+    /**
+     * @param IsCaptchaEnabledInterface $isCaptchaEnabled
+     */
+    public function __construct(
+        IsCaptchaEnabledInterface $isCaptchaEnabled
+    ) {
+        $this->isCaptchaEnabled = $isCaptchaEnabled;
+    }
+
+    /**
+     * Temporally disable Forgot password button while captcha is loading
+     *
+     * @param ForgotPasswordButton $subject
+     * @return bool
+     * @throws InputException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterDisabled(ForgotPasswordButton $subject): bool
+    {
+        $key = 'customer_forgot_password';
+        return $this->isCaptchaEnabled->isCaptchaEnabledFor($key);
+    }
+}

ReCaptchaCustomer/Test/Unit/Plugin/Customer/DisableForgotPasswordButtonTest.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\ForgotPasswordButton;
+use Magento\ReCaptchaCustomer\Plugin\Customer\DisableForgotPasswordButton;
+use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test disable Forgot password button while captcha is loading
+ */
+class DisableForgotPasswordButtonTest extends TestCase
+{
+    /**
+     * @var IsCaptchaEnabledInterface|MockObject
+     */
+    protected $isCaptchaEnabled;
+
+    /**
+     * @var ForgotPasswordButton|MockObject
+     */
+    protected $subject;
+
+    /**
+     * @var DisableForgotPasswordButton
+     */
+    protected $plugin;
+
+    protected function setUp(): void
+    {
+        $this->isCaptchaEnabled = $this->getMockForAbstractClass(
+            IsCaptchaEnabledInterface::class
+        );
+        $this->subject = $this->createMock(ForgotPasswordButton::class);
+
+        $this->plugin = new DisableForgotPasswordButton(
+            $this->isCaptchaEnabled
+        );
+    }
+
+    public function testAfterEnabled()
+    {
+        $key = 'customer_forgot_password';
+        $this->isCaptchaEnabled->expects($this->once())
+            ->method('isCaptchaEnabledFor')->with($key)->willReturn(true);
+        $this->assertEquals(true, $this->plugin->afterDisabled($this->subject));
+    }
+}

ReCaptchaCustomer/etc/frontend/di.xml

@@ -28,4 +28,8 @@
         <plugin sortOrder="1" name="recaptcha_disable_create_account_button"
                 type="Magento\ReCaptchaCustomer\Plugin\Customer\DisableCreateAccountButton"/>
     </type>
+    <type name="Magento\Customer\ViewModel\ForgotPasswordButton">
+        <plugin sortOrder="1" name="recaptcha_disable_forgot_password_button"
+                type="Magento\ReCaptchaCustomer\Plugin\Customer\DisableForgotPasswordButton"/>
+    </type>
 </config>

TwoFactorAuth/Observer/ControllerActionPredispatch.php

@@ -22,6 +22,7 @@
 use Magento\TwoFactorAuth\Api\UserConfigRequestManagerInterface;
 use Magento\TwoFactorAuth\Controller\Adminhtml\Tfa\Requestconfig;
 use Magento\TwoFactorAuth\Model\UserConfig\HtmlAreaTokenVerifier;
+use Magento\AdminAdobeIms\Service\ImsConfig;
 
 /**
  * Handle redirection to 2FA page if required
@@ -75,6 +76,11 @@ class ControllerActionPredispatch implements ObserverInterface
      */
     private $userContext;
 
+    /**
+     * @var ImsConfig
+     */
+    private ImsConfig $adminAdobeImsConfig;
+
     /**
      * @param TfaInterface $tfa
      * @param TfaSessionInterface $tfaSession
@@ -84,6 +90,7 @@ class ControllerActionPredispatch implements ObserverInterface
      * @param UrlInterface $url
      * @param AuthorizationInterface $authorization
      * @param UserContextInterface $userContext
+     * @param ImsConfig $adminAdobeImsConfig
      */
     public function __construct(
         TfaInterface $tfa,
@@ -93,7 +100,8 @@ public function __construct(
         ActionFlag $actionFlag,
         UrlInterface $url,
         AuthorizationInterface $authorization,
-        UserContextInterface $userContext
+        UserContextInterface $userContext,
+        ImsConfig $adminAdobeImsConfig
     ) {
         $this->tfa = $tfa;
         $this->tfaSession = $tfaSession;
@@ -103,6 +111,7 @@ public function __construct(
         $this->url = $url;
         $this->authorization = $authorization;
         $this->userContext = $userContext;
+        $this->adminAdobeImsConfig = $adminAdobeImsConfig;
     }
 
     /**
@@ -119,9 +128,13 @@ private function redirect(string $url): void
 
     /**
      * @inheritDoc
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute(Observer $observer)
     {
+        if ($this->adminAdobeImsConfig->enabled()) {
+            return;
+        }
         /** @var $controllerAction AbstractAction */
         $controllerAction = $observer->getEvent()->getData('controller_action');
         $this->action = $controllerAction;

TwoFactorAuth/composer.json

@@ -12,6 +12,7 @@
         "magento/module-ui": "*",
         "magento/module-user": "*",
         "magento/module-integration": "*",
+        "magento/module-admin-adobe-ims": "*",
         "christian-riesen/base32": "^1.3",
         "spomky-labs/otphp": "^10.0",
         "endroid/qr-code": "^4.3.5",