Merge pull request #176 from adobe-commerce-tier-4/PR-31-10-2024

[Support Tier-4 abukatar] 10-31-2024 Regular delivery of bugfixes and improvements

Author: internal-magento-queue-manager[bot]

ReCaptchaUser/Observer/LoginObserver.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -56,6 +56,8 @@ class LoginObserver implements ObserverInterface
 
     /**
      * @var string
+     * @deprecated
+     * @see no actuall usage in the class
      */
     private $loginActionName;
 
@@ -117,9 +119,7 @@ public function __construct(
     public function execute(Observer $observer): void
     {
         $key = 'user_login';
-        if ($this->isCaptchaEnabled->isCaptchaEnabledFor($key)
-            && $this->request->getFullActionName() === $this->loginActionName
-        ) {
+        if ($this->isCaptchaEnabled->isCaptchaEnabledFor($key)) {
             $validationConfig = $this->validationConfigResolver->get($key);
             try {
                 $reCaptchaResponse = $this->captchaResponseResolver->resolve($this->request);

ReCaptchaUser/Test/Integration/LoginFormTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -156,6 +156,36 @@ public function testPostRequestIfReCaptchaParameterIsMissed(): void
         $this->checkFailedPostResponse();
     }
 
+    /**
+     * @magentoAdminConfigFixture admin/security/use_form_key 0
+     * @magentoAdminConfigFixture admin/captcha/enable 0
+     * @magentoAdminConfigFixture recaptcha_backend/type_invisible/public_key test_public_key
+     * @magentoAdminConfigFixture recaptcha_backend/type_invisible/private_key test_private_key
+     * @magentoAdminConfigFixture recaptcha_backend/type_for/user_login invisible
+     */
+    public function testPostRequestIfReCaptchaParameterIsMissedWithRef(): void
+    {
+        $postValues = [];
+        $this->getRequest()
+            ->setMethod(Http::METHOD_POST)
+            ->setPostValue(array_replace_recursive(
+                [
+                    'form_key' => $this->formKey->getFormKey(),
+                    'login' => [
+                        'username' => Bootstrap::ADMIN_NAME,
+                        'password' => Bootstrap::ADMIN_PASSWORD,
+                    ],
+                ],
+                $postValues
+            ));
+        $this->dispatch('backend/admin/dashboard/index');
+        $this->assertSessionMessages(
+            self::equalTo(['Something went wrong with reCAPTCHA. Please contact the store owner.']),
+            MessageInterface::TYPE_ERROR
+        );
+        self::assertFalse($this->auth->isLoggedIn());
+    }
+
     /**
      * @magentoAdminConfigFixture admin/security/use_form_key 0
      * @magentoAdminConfigFixture admin/captcha/enable 0