MC-30896: Move PayPalRecaptcha module to Magento Security Extension

naydav · viktym · commit eb527cd89217 · 2020-03-31T19:25:27.000-05:00
diff --git a/ReCaptchaAdminUi/etc/di.xml b/ReCaptchaAdminUi/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">
-    <virtualType name="Magento\ReCaptchaApi\Model\OptionSource\Type"
+    <virtualType name="Magento\ReCaptchaAdminUi\Model\OptionSource\Type"
                  type="Magento\ReCaptchaAdminUi\Model\OptionSource">
         <arguments>
             <argument name="options" xsi:type="array">
diff --git a/ReCaptchaCheckout/view/frontend/layout/checkout_index_index.xml b/ReCaptchaCheckout/view/frontend/layout/checkout_index_index.xml
@@ -28,7 +28,6 @@
                                                                     <item name="displayArea" xsi:type="string">additional-login-form-fields</item>
                                                                     <item name="configSource" xsi:type="string">checkoutConfig</item>
                                                                     <item name="reCaptchaId" xsi:type="string">recaptcha-checkout-inline-login</item>
-                                                                    <item name="zone" xsi:type="string">login</item>
                                                                 </item>
                                                             </item>
                                                         </item>
@@ -47,7 +46,6 @@
                                                                     <item name="displayArea" xsi:type="string">additional-login-form-fields</item>
                                                                     <item name="configSource" xsi:type="string">checkoutConfig</item>
                                                                     <item name="reCaptchaId" xsi:type="string">recaptcha-checkout-inline-login-billing</item>
-                                                                    <item name="zone" xsi:type="string">login</item>
                                                                 </item>
                                                             </item>
                                                         </item>
diff --git a/ReCaptchaContact/etc/adminhtml/system.xml b/ReCaptchaContact/etc/adminhtml/system.xml
@@ -13,7 +13,7 @@
                 <field id="contact" translate="label" type="select" sortOrder="140" showInDefault="1"
                        showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Enable for Contact Us</label>
-                    <source_model>Magento\ReCaptchaApi\Model\OptionSource\Type</source_model>
+                    <source_model>Magento\ReCaptchaAdminUi\Model\OptionSource\Type</source_model>
                 </field>
             </group>
         </section>
diff --git a/ReCaptchaCustomer/etc/adminhtml/system.xml b/ReCaptchaCustomer/etc/adminhtml/system.xml
@@ -13,17 +13,17 @@
                 <field id="customer_login" translate="label" type="select" sortOrder="110" showInDefault="1"
                        showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Enable for Customer Login</label>
-                    <source_model>Magento\ReCaptchaApi\Model\OptionSource\Type</source_model>
+                    <source_model>Magento\ReCaptchaAdminUi\Model\OptionSource\Type</source_model>
                 </field>
                 <field id="customer_forgot_password" translate="label" type="select" sortOrder="120" showInDefault="1"
                        showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Enable for Forgot Password</label>
-                    <source_model>Magento\ReCaptchaApi\Model\OptionSource\Type</source_model>
+                    <source_model>Magento\ReCaptchaAdminUi\Model\OptionSource\Type</source_model>
                 </field>
                 <field id="customer_create" translate="label" type="select" sortOrder="130" showInDefault="1"
                        showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Enable for Create New Customer Account</label>
-                    <source_model>Magento\ReCaptchaApi\Model\OptionSource\Type</source_model>
+                    <source_model>Magento\ReCaptchaAdminUi\Model\OptionSource\Type</source_model>
                 </field>
             </group>
         </section>
diff --git a/ReCaptchaNewsletter/etc/adminhtml/system.xml b/ReCaptchaNewsletter/etc/adminhtml/system.xml
@@ -14,7 +14,7 @@
                        showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Enable Invisible reCAPTCHA in Newsletter Subscription</label>
                     <comment>If enabled, a badge will be displayed in every page.</comment>
-                    <source_model>Magento\ReCaptchaApi\Model\OptionSource\Type</source_model>
+                    <source_model>Magento\ReCaptchaAdminUi\Model\OptionSource\Type</source_model>
                 </field>
             </group>
         </section>
diff --git a/ReCaptchaPaypal/Block/LayoutProcessor/Checkout/Onepage.php b/ReCaptchaPaypal/Block/LayoutProcessor/Checkout/Onepage.php
@@ -8,6 +8,7 @@
 namespace Magento\ReCaptchaPaypal\Block\LayoutProcessor\Checkout;
 
 use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
+use Magento\Framework\Exception\InputException;
 use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
 use Magento\ReCaptchaUi\Model\UiConfigResolverInterface;
 
@@ -39,10 +40,11 @@ public function __construct(
     }
 
     /**
-     * Process js Layout of block
+     * {@inheritdoc}
      *
      * @param array $jsLayout
      * @return array
+     * @throws InputException
      */
     public function process($jsLayout)
     {
diff --git a/ReCaptchaPaypal/Observer/PayPalObserver.php b/ReCaptchaPaypal/Observer/PayPalObserver.php
@@ -103,13 +103,21 @@ public function execute(Observer $observer): void
             $request = $controller->getRequest();
             $response = $controller->getResponse();
 
+            $validationConfig = $this->validationConfigResolver->get($key);
+
             try {
                 $reCaptchaResponse = $this->captchaResponseResolver->resolve($request);
             } catch (InputException $e) {
-                $reCaptchaResponse = '';
                 $this->logger->error($e);
+
+                $jsonPayload = $this->serializer->serialize([
+                    'success' => false,
+                    'error' => true,
+                    'error_messages' => $validationConfig->getValidationFailureMessage(),
+                ]);
+                $response->representJson($jsonPayload);
+                return;
             }
-            $validationConfig = $this->validationConfigResolver->get($key);
 
             $validationResult = $this->captchaValidator->isValid($reCaptchaResponse, $validationConfig);
             if (false === $validationResult->isValid()) {
diff --git a/ReCaptchaPaypal/composer.json b/ReCaptchaPaypal/composer.json
@@ -4,7 +4,7 @@
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/module-re-captcha-frontend-ui": "*",
-        "magento/module-paypal-captcha": "*"
+        "magento/module-re-captcha-validation-api": "*"
     },
     "type": "magento2-module",
     "license": "OSL-3.0",
diff --git a/ReCaptchaPaypal/etc/adminhtml/system.xml b/ReCaptchaPaypal/etc/adminhtml/system.xml
@@ -13,7 +13,7 @@
                 <field id="paypal_payflowpro" translate="label" type="select" sortOrder="200" showInDefault="1"
                        showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Enable for PayPal PayflowPro payment form</label>
-                    <source_model>Magento\ReCaptchaApi\Model\OptionSource\Type</source_model>
+                    <source_model>Magento\ReCaptchaAdminUi\Model\OptionSource\Type</source_model>
                 </field>
             </group>
         </section>
diff --git a/ReCaptchaPaypal/view/frontend/layout/checkout_index_index.xml b/ReCaptchaPaypal/view/frontend/layout/checkout_index_index.xml
@@ -29,7 +29,6 @@
                                                                             <item name="displayArea" xsi:type="string">additional-payment-fields</item>
                                                                             <item name="configSource" xsi:type="string">checkoutConfig</item>
                                                                             <item name="reCaptchaId" xsi:type="string">recaptcha-checkout-paypal-form</item>
-                                                                            <item name="zone" xsi:type="string">paypal</item>
                                                                         </item>
                                                                     </item>
                                                                 </item>
diff --git a/ReCaptchaReview/etc/adminhtml/system.xml b/ReCaptchaReview/etc/adminhtml/system.xml
@@ -13,7 +13,7 @@
                 <field id="product_review" translate="label" type="select" sortOrder="150" showInDefault="1"
                        showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Enable for Product Review</label>
-                    <source_model>Magento\ReCaptchaApi\Model\OptionSource\Type</source_model>
+                    <source_model>Magento\ReCaptchaAdminUi\Model\OptionSource\Type</source_model>
                 </field>
             </group>
         </section>
diff --git a/ReCaptchaSendFriend/etc/adminhtml/system.xml b/ReCaptchaSendFriend/etc/adminhtml/system.xml
@@ -13,7 +13,7 @@
                 <field id="sendfriend" translate="label" type="select" sortOrder="170" showInDefault="1"
                        showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Enable for Send To Friend</label>
-                    <source_model>Magento\ReCaptchaApi\Model\OptionSource\Type</source_model>
+                    <source_model>Magento\ReCaptchaAdminUi\Model\OptionSource\Type</source_model>
                 </field>
             </group>
         </section>
diff --git a/ReCaptchaUser/etc/adminhtml/system.xml b/ReCaptchaUser/etc/adminhtml/system.xml
@@ -13,13 +13,13 @@
                 <field id="user_login" translate="label" type="select" sortOrder="100" showInDefault="1"
                        showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Enable for Login</label>
-                    <source_model>Magento\ReCaptchaApi\Model\OptionSource\Type</source_model>
+                    <source_model>Magento\ReCaptchaAdminUi\Model\OptionSource\Type</source_model>
                 </field>
 
                 <field id="user_forgot_password" translate="label" type="select" sortOrder="110" showInDefault="1"
                        showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Enable for Forgot Password</label>
-                    <source_model>Magento\ReCaptchaApi\Model\OptionSource\Type</source_model>
+                    <source_model>Magento\ReCaptchaAdminUi\Model\OptionSource\Type</source_model>
                 </field>
             </group>
         </section>
diff --git a/ReCaptchaVersion2Checkbox/etc/di.xml b/ReCaptchaVersion2Checkbox/etc/di.xml
@@ -23,7 +23,7 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Magento\ReCaptchaApi\Model\OptionSource\Type">
+    <virtualType name="Magento\ReCaptchaAdminUi\Model\OptionSource\Type">
         <arguments>
             <argument name="options" xsi:type="array">
                 <item name="recaptcha" xsi:type="array">
diff --git a/ReCaptchaVersion2Invisible/etc/di.xml b/ReCaptchaVersion2Invisible/etc/di.xml
@@ -23,7 +23,7 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Magento\ReCaptchaApi\Model\OptionSource\Type">
+    <virtualType name="Magento\ReCaptchaAdminUi\Model\OptionSource\Type">
         <arguments>
             <argument name="options" xsi:type="array">
                 <item name="invisible" xsi:type="array">
diff --git a/ReCaptchaVersion3Invisible/etc/di.xml b/ReCaptchaVersion3Invisible/etc/di.xml
@@ -23,7 +23,7 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Magento\ReCaptchaApi\Model\OptionSource\Type">
+    <virtualType name="Magento\ReCaptchaAdminUi\Model\OptionSource\Type">
         <arguments>
             <argument name="options" xsi:type="array">
                 <item name="recaptcha_v3" xsi:type="array">

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`namespace Magento\ReCaptchaPaypal\Block\LayoutProcessor\Checkout;`
`9`	`9`
`10`	`10`	`use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;`
	`11`	`+use Magento\Framework\Exception\InputException;`
`11`	`12`	`use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;`
`12`	`13`	`use Magento\ReCaptchaUi\Model\UiConfigResolverInterface;`
`13`	`14`
`@@ -39,10 +40,11 @@ public function __construct(`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`/**`
`42`		`- * Process js Layout of block`
	`43`	`+ * {@inheritdoc}`
`43`	`44`	`*`
`44`	`45`	`* @param array $jsLayout`
`45`	`46`	`* @return array`
	`47`	`+ * @throws InputException`
`46`	`48`	`*/`
`47`	`49`	`public function process($jsLayout)`
`48`	`50`	`{`