Merge pull request #116 from magento-gl/Sync-2.4.7-beta1-develop

Sync 2.4.7 beta1 develop

Author: sidolov

ReCaptchaVersion3Invisible/Model/Config.php

@@ -8,11 +8,12 @@
 
 namespace Magento\ReCaptchaVersion3Invisible\Model;
 
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\ReCaptchaValidationApi\Api\Data\ValidationConfigInterface;
 use Magento\ReCaptchaVersion3Invisible\Model\Frontend\UiConfigProvider;
 use Magento\ReCaptchaVersion3Invisible\Model\Frontend\ValidationConfigProvider;
 
-class Config
+class Config implements ResetAfterRequestInterface
 {
     /**
      * @var string|null
@@ -161,4 +162,14 @@ private function getUiConfig(): array
         }
         return $this->uiConfig;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->websiteKey = null;
+        $this->uiConfig = [];
+        $this->validationConfig = null;
+    }
 }

ReCaptchaWebapiGraphQl/Model/Resolver/ReCaptchaV3.php

@@ -12,11 +12,12 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\ReCaptchaFrontendUi\Model\CaptchaTypeResolver;
 use Magento\ReCaptchaFrontendUi\Model\ErrorMessageConfig;
 use Magento\ReCaptchaVersion3Invisible\Model\Config;
 
-class ReCaptchaV3 implements ResolverInterface
+class ReCaptchaV3 implements ResolverInterface, ResetAfterRequestInterface
 {
     private const RECAPTCHA_TYPE = 'recaptcha_v3';
 
@@ -128,4 +129,12 @@ public function getFailureMessage(): string
         }
         return $this->failureMessage;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->isEnabled = null;
+    }
 }