MC-38984: Merge all ReCaptcha web API coverage stories

Author: ogorkun

ReCaptchaWebapiGraphQl/Plugin/GraphQlValidator.php

@@ -11,10 +11,13 @@
 use Magento\Framework\GraphQl\Config\ConfigElementInterface;
 use Magento\Framework\GraphQl\Config\Element\TypeInterface;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\Formatter\Fields;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\ReCaptchaValidationApi\Api\ValidatorInterface;
 use Magento\ReCaptchaWebapiApi\Api\WebapiValidationConfigProviderInterface;
 use Magento\ReCaptchaWebapiApi\Model\Data\EndpointFactory;
+use Magento\Framework\GraphQl\Config\Element\Field;
 
 /**
  * Validate ReCaptcha for GraphQl mutations.
@@ -62,35 +65,39 @@ public function __construct(
     /**
      * Validate ReCaptcha for mutations if needed.
      *
-     * @param Fields $subject
-     * @param ConfigElementInterface $configElement
+     * @param ResolverInterface $subject
+     * @param Field $fieldInfo
+     * @param mixed $context
+     * @param ResolveInfo $resolveInfo
      * @throws GraphQlInputException
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeFormat(
-        Fields $subject,
-        ConfigElementInterface $configElement
+    public function beforeResolve(
+        ResolverInterface $subject,
+        Field $fieldInfo,
+        $context,
+        ResolveInfo $resolveInfo
     ): void {
-        if ($configElement->getName() === 'Mutation' && $configElement instanceof TypeInterface) {
-            foreach ($configElement->getFields() as $field) {
-                $reCaptchaConfig = $this->configProvider->getConfigFor(
-                    $this->endpointFactory->create([
-                        'class' => ltrim($field->getResolver(), '\\'),
-                        'method' => 'resolve',
-                        'name' => $field->getName()
-                    ])
-                );
-                if ($reCaptchaConfig
-                    && !$this->validator->isValid(
-                        (string)$this->request->getHeader('X-ReCaptcha'),
-                        $reCaptchaConfig
-                    )->isValid()
-                ) {
-                    throw new GraphQlInputException(__('ReCaptcha validation failed, please try again'));
-                }
-            }
+        if ($resolveInfo->operation->operation !== 'mutation') {
+            return;
+        }
+
+        $reCaptchaConfig = $this->configProvider->getConfigFor(
+            $this->endpointFactory->create([
+                'class' => ltrim($fieldInfo->getResolver(), '\\'),
+                'method' => 'resolve',
+                'name' => $fieldInfo->getName()
+            ])
+        );
+        if ($reCaptchaConfig
+            && !$this->validator->isValid(
+                (string)$this->request->getHeader('X-ReCaptcha'),
+                $reCaptchaConfig
+            )->isValid()
+        ) {
+            throw new GraphQlInputException(__('ReCaptcha validation failed, please try again'));
         }
     }
 }

ReCaptchaWebapiGraphQl/etc/di.xml

@@ -7,7 +7,7 @@
 -->
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\Formatter\Fields">
+    <type name="Magento\Framework\GraphQl\Query\ResolverInterface">
         <plugin name="graphql_recaptcha_validation" type="Magento\ReCaptchaWebapiGraphQl\Plugin\GraphQlValidator" />
     </type>
 </config>