AC-461: Add ReCaptcha support to coupon code

rizwankhgl · rizwankhgl · commit 8b053fd48722 · 2021-12-20T18:28:20.000+05:30
* Merge branch 'develop' into AC-461
diff --git a/ReCaptchaAdminUi/composer.json b/ReCaptchaAdminUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-admin-ui",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-config": "*",
         "magento/module-re-captcha-ui": "*",
diff --git a/ReCaptchaCheckout/Block/LayoutProcessor/Checkout/Onepage.php b/ReCaptchaCheckout/Block/LayoutProcessor/Checkout/Onepage.php
@@ -79,7 +79,8 @@ public function process($jsLayout)
             ['place-order-recaptcha']['settings'] = $this->captchaUiConfigResolver->get($key);
         } else {
             if (isset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
-                ['payment']['children']['beforeMethods']['children']['place-order-recaptcha'])) {
+                ['payment']['children']['beforeMethods']['children']['place-order-recaptcha-container']['children']
+                ['place-order-recaptcha'])) {
                 unset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
                     ['payment']['children']['beforeMethods']['children']['place-order-recaptcha-container']
                     ['children']['place-order-recaptcha']);
diff --git a/ReCaptchaCheckout/composer.json b/ReCaptchaCheckout/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-checkout",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-checkout": "*",
         "magento/module-re-captcha-ui": "*",
diff --git a/ReCaptchaContact/composer.json b/ReCaptchaContact/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-contact",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*"
     },
diff --git a/ReCaptchaCustomer/composer.json b/ReCaptchaCustomer/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-customer",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-customer": "*",
         "magento/module-re-captcha-ui": "*",
diff --git a/ReCaptchaFrontendUi/composer.json b/ReCaptchaFrontendUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-frontend-ui",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-re-captcha-ui": "*"
diff --git a/ReCaptchaMigration/composer.json b/ReCaptchaMigration/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-migration",
     "description": "Google reCAPTCHA config migration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-config": "*"
     },
diff --git a/ReCaptchaNewsletter/composer.json b/ReCaptchaNewsletter/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-newsletter",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*",
         "magento/module-re-captcha-validation-api": "*",
diff --git a/ReCaptchaPaypal/composer.json b/ReCaptchaPaypal/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-paypal",
     "description": "Google reCaptcha integration for Magento2 PayPal PayflowPro payment form",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*",
         "magento/module-re-captcha-validation-api": "*",
diff --git a/ReCaptchaReview/composer.json b/ReCaptchaReview/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-review",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*",
         "magento/module-re-captcha-validation-api": "*",
diff --git a/ReCaptchaSendFriend/composer.json b/ReCaptchaSendFriend/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-send-friend",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*",
         "magento/module-re-captcha-validation-api": "*",
diff --git a/ReCaptchaStorePickup/composer.json b/ReCaptchaStorePickup/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-store-pickup",
     "description": "Google reCaptcha integration for Magento2 Inventory Store Pickup shipping form",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-checkout": "*",
         "magento/module-re-captcha-ui": "*"
diff --git a/ReCaptchaUi/composer.json b/ReCaptchaUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-ui",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-re-captcha-validation-api": "*"
     },
diff --git a/ReCaptchaUser/composer.json b/ReCaptchaUser/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-user",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*",
         "magento/module-re-captcha-validation-api": "*"
diff --git a/ReCaptchaValidation/composer.json b/ReCaptchaValidation/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-validation",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-re-captcha-validation-api": "*",
         "google/recaptcha": "^1.2"
diff --git a/ReCaptchaValidationApi/composer.json b/ReCaptchaValidationApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-validation-api",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*"
     },
     "type": "magento2-module",
diff --git a/ReCaptchaVersion2Checkbox/composer.json b/ReCaptchaVersion2Checkbox/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-version-2-checkbox",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-re-captcha-ui": "*",
diff --git a/ReCaptchaVersion2Invisible/composer.json b/ReCaptchaVersion2Invisible/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-version-2-invisible",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-re-captcha-ui": "*",
diff --git a/ReCaptchaVersion3Invisible/composer.json b/ReCaptchaVersion3Invisible/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-version-3-invisible",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-re-captcha-ui": "*",
diff --git a/ReCaptchaWebapiApi/composer.json b/ReCaptchaWebapiApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-webapi-api",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-re-captcha-validation-api": "*"
     },
diff --git a/ReCaptchaWebapiGraphQl/composer.json b/ReCaptchaWebapiGraphQl/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-webapi-graph-ql",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-authorization": "*",
         "magento/module-re-captcha-validation-api": "*",
diff --git a/ReCaptchaWebapiRest/composer.json b/ReCaptchaWebapiRest/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-webapi-rest",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-authorization": "*",
         "magento/module-re-captcha-validation-api": "*",
diff --git a/ReCaptchaWebapiUi/composer.json b/ReCaptchaWebapiUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-webapi-ui",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-re-captcha-frontend-ui": "*"
     },
diff --git a/Securitytxt/Test/Mftf/Test/RedirectToNotFoundWhenSecurityTxtIsDisabled.xml b/Securitytxt/Test/Mftf/Test/RedirectToNotFoundWhenSecurityTxtIsDisabled.xml
@@ -16,6 +16,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="SECURITYTXT-1"/>
             <group value="securitytxt"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <magentoCLI command="config:set {{DisableSecurityTxt.path}} {{DisableSecurityTxt.value}}" stepKey="disableSecurityTxt"/>
diff --git a/Securitytxt/composer.json b/Securitytxt/composer.json
@@ -3,7 +3,7 @@
     "description": "Security.txt file for Magento 2 websites",
     "type": "magento2-module",
     "require": {
-        "php": "~7.4.0||~8.0.0",
+        "php": "~7.4.0||~8.0.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-config": "*",
         "magento/module-store": "*"
diff --git a/TwoFactorAuth/Model/Provider/Engine/Google.php b/TwoFactorAuth/Model/Provider/Engine/Google.php
@@ -7,8 +7,10 @@
 
 namespace Magento\TwoFactorAuth\Model\Provider\Engine;
 
-use Endroid\QrCode\ErrorCorrectionLevel;
-use Endroid\QrCode\Exception\ValidationException;
+use Base32\Base32;
+use Endroid\QrCode\Color\Color;
+use Endroid\QrCode\Encoding\Encoding;
+use Endroid\QrCode\ErrorCorrectionLevel\ErrorCorrectionLevelHigh;
 use Endroid\QrCode\QrCode;
 use Endroid\QrCode\Writer\PngWriter;
 use Exception;
@@ -17,11 +19,10 @@
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\TwoFactorAuth\Api\EngineInterface;
+use Magento\TwoFactorAuth\Api\UserConfigManagerInterface;
 use Magento\TwoFactorAuth\Model\Provider\Engine\Google\TotpFactory;
 use Magento\User\Api\Data\UserInterface;
-use Magento\TwoFactorAuth\Api\UserConfigManagerInterface;
-use Magento\TwoFactorAuth\Api\EngineInterface;
-use Base32\Base32;
 use OTPHP\TOTPInterface;
 
 /**
@@ -206,27 +207,26 @@ public function verify(UserInterface $user, DataObject $request): bool
      * Render TFA QrCode
      *
      * @param UserInterface $user
+     *
      * @return string
-     * @throws NoSuchEntityException
-     * @throws ValidationException
+     * @throws Exception
      */
     public function getQrCodeAsPng(UserInterface $user): string
     {
         // @codingStandardsIgnoreStart
         $qrCode = new QrCode($this->getProvisioningUrl($user));
         $qrCode->setSize(400);
         $qrCode->setMargin(0);
-        $qrCode->setErrorCorrectionLevel(ErrorCorrectionLevel::HIGH());
-        $qrCode->setForegroundColor(['r' => 0, 'g' => 0, 'b' => 0, 'a' => 0]);
-        $qrCode->setBackgroundColor(['r' => 255, 'g' => 255, 'b' => 255, 'a' => 0]);
-        $qrCode->setLabelFontSize(16);
-        $qrCode->setEncoding('UTF-8');
+        $qrCode->setErrorCorrectionLevel(new ErrorCorrectionLevelHigh());
+        $qrCode->setForegroundColor(new Color(0, 0, 0, 0));
+        $qrCode->setBackgroundColor(new Color(255, 255, 255, 0));
+        $qrCode->setEncoding(new Encoding('UTF-8'));
 
         $writer = new PngWriter();
-        $pngData = $writer->writeString($qrCode);
+        $pngData = $writer->write($qrCode);
         // @codingStandardsIgnoreEnd
 
-        return $pngData;
+        return $pngData->getString();
     }
 
     /**
diff --git a/TwoFactorAuth/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml b/TwoFactorAuth/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml
@@ -8,8 +8,8 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminCreateRoleActionGroup">
-        <waitForElementVisible stepKey="waitForTfaRole" selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" time="30" after="clickContentBlockCheckbox"/>
-        <conditionalClick visible="false" dependentSelector="{{AdminEditRoleInfoSection.uncheckedCheckboxByRole('Magento_TwoFactorAuth::tfa')}}" stepKey="clickCheckbox" selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" after="waitForTfaRole"/>
+        <waitForElementVisible stepKey="waitForTfaRole" selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" time="30" after="clickContentBlockCheckbox" />
+        <conditionalClick visible="true" dependentSelector="{{AdminEditRoleInfoSection.uncheckedCheckboxByRole('Magento_TwoFactorAuth::tfa')}}" stepKey="clickCheckbox" selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" after="waitForTfaRole"/>
     </actionGroup>
 </actionGroups>
 
diff --git a/TwoFactorAuth/Test/Mftf/ActionGroup/AdminCreateUserRoleWithReportsActionGroup.xml b/TwoFactorAuth/Test/Mftf/ActionGroup/AdminCreateUserRoleWithReportsActionGroup.xml
@@ -9,7 +9,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminCreateUserRoleWithReportsActionGroup">
         <waitForElementVisible stepKey="waitForTfaRole" selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" time="30" after="checkReports"/>
-        <conditionalClick visible="false" dependentSelector="{{AdminEditRoleInfoSection.uncheckedCheckboxByRole('Magento_TwoFactorAuth::tfa')}}" stepKey="clickCheckbox" selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" after="waitForTfaRole"/>
+        <conditionalClick visible="true" dependentSelector="{{AdminEditRoleInfoSection.uncheckedCheckboxByRole('Magento_TwoFactorAuth::tfa')}}" stepKey="clickCheckbox" selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" after="waitForTfaRole"/>
     </actionGroup>
 </actionGroups>
 
diff --git a/TwoFactorAuth/Test/Mftf/Section/AdminEditRoleInfoSection.xml b/TwoFactorAuth/Test/Mftf/Section/AdminEditRoleInfoSection.xml
@@ -7,7 +7,7 @@
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEditRoleInfoSection">
-        <element name="checkboxByRole" type="checkbox" selector="//*[@value='{{var}}']/parent::*//*[@class='jstree-checkbox']" parameterized="true"/>
-        <element name="uncheckedCheckboxByRole" type="checkbox" selector="//*[@data-id='{{var}}' and contains(@class, 'jstree-checked')]" parameterized="true"/>
+        <element name="checkboxByRole" type="checkbox" selector="//li[@data-id='{{var}}']/a/i[contains(@class, 'jstree-checkbox')]" parameterized="true"/>
+        <element name="uncheckedCheckboxByRole" type="checkbox" selector="//li[@data-id='{{var}}']/a[@aria-selected='false']/i[contains(@class, 'jstree-checkbox')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/TwoFactorAuth/Test/Mftf/Test/AdminBulkOperationsLogIsNotAccessibleForAdminUserWithLimitedAccessTest.xml b/TwoFactorAuth/Test/Mftf/Test/AdminBulkOperationsLogIsNotAccessibleForAdminUserWithLimitedAccessTest.xml
@@ -11,6 +11,7 @@
             <skip>
                 <issueId value="MQE-2126"/>
             </skip>
+            <group value="pr_exclude"/>
         </annotations>
     </test>
 </tests>
diff --git a/TwoFactorAuth/Test/Mftf/Test/AdminConfigurationPermissionTest.xml b/TwoFactorAuth/Test/Mftf/Test/AdminConfigurationPermissionTest.xml
@@ -11,6 +11,7 @@
             <skip>
                 <issueId value="MQE-2126"/>
             </skip>
+            <group value="pr_exclude"/>
         </annotations>
     </test>
 </tests>
diff --git a/TwoFactorAuth/Test/Mftf/Test/RestrictedAdminCatalogMassActionPermissionTest.xml b/TwoFactorAuth/Test/Mftf/Test/RestrictedAdminCatalogMassActionPermissionTest.xml
@@ -14,6 +14,7 @@
                 <issueId value="MQE-2126"/>
                 <issueId value="MC-34266"/>
             </skip>
+            <group value="pr_exclude"/>
         </annotations>
     </test>
 </tests>
diff --git a/TwoFactorAuth/Test/Mftf/Test/RestrictedUserRoleForProductRemovalTest.xml b/TwoFactorAuth/Test/Mftf/Test/RestrictedUserRoleForProductRemovalTest.xml
@@ -11,6 +11,7 @@
             <skip>
                 <issueId value="MQE-2126"/>
             </skip>
+            <group value="pr_exclude"/>
         </annotations>
     </test>
 </tests>
diff --git a/TwoFactorAuth/Test/Mftf/Test/RestrictedUserRoleProductAttributeTest.xml b/TwoFactorAuth/Test/Mftf/Test/RestrictedUserRoleProductAttributeTest.xml
@@ -11,6 +11,7 @@
             <skip>
                 <issueId value="MQE-2126"/>
             </skip>
+            <group value="pr_exclude"/>
         </annotations>
     </test>
 </tests>
diff --git a/TwoFactorAuth/Test/Mftf/Test/StorefrontGiftWrappingCanBeAppliedOnOrderLevelAndOrderItemForAdditionalWebsiteTest.xml b/TwoFactorAuth/Test/Mftf/Test/StorefrontGiftWrappingCanBeAppliedOnOrderLevelAndOrderItemForAdditionalWebsiteTest.xml
@@ -11,6 +11,7 @@
             <skip>
                 <issueId value="MQE-2129"/>
             </skip>
+            <group value="pr_exclude"/>
         </annotations>
     </test>
 </tests>
diff --git a/TwoFactorAuth/Test/Mftf/Test/StorefrontInvoiceFilterTest.xml b/TwoFactorAuth/Test/Mftf/Test/StorefrontInvoiceFilterTest.xml
@@ -11,6 +11,7 @@
             <skip>
                 <issueId value="MC-34291"/>
             </skip>
+            <group value="pr_exclude"/>
         </annotations>
     </test>
 </tests>
diff --git a/TwoFactorAuth/Test/Unit/Model/Provider/Engine/GoogleTest.php b/TwoFactorAuth/Test/Unit/Model/Provider/Engine/GoogleTest.php
diff --git a/TwoFactorAuth/composer.json b/TwoFactorAuth/composer.json
