Merge pull request #88 from magento-cia/2.4.6-develop-2.4-develop-sync-081122

Sync of 2.4.6-develop with 2.4-develop

Author: dvoskoboinikov

ReCaptchaCheckout/view/frontend/requirejs-config.js

@@ -9,7 +9,11 @@ var config = {
         mixins: {
             'Magento_Checkout/js/model/place-order': {
                 'Magento_ReCaptchaCheckout/js/model/place-order-mixin': true
+            },
+            'Magento_ReCaptchaWebapiUi/js/webapiReCaptchaRegistry': {
+                'Magento_ReCaptchaCheckout/js/webapiReCaptchaRegistry-mixin': true
             }
         }
     }
 };
+

ReCaptchaCheckout/view/frontend/web/js/model/place-order-mixin.js

@@ -30,7 +30,8 @@ define([
                 });
                 //Trigger ReCaptcha validation
                 recaptchaRegistry.triggers['recaptcha-checkout-place-order']();
-
+                //remove listener so that place order action is only triggered by the 'Place Order' button
+                recaptchaRegistry.removeListener('recaptcha-checkout-place-order');
                 return recaptchaDeferred;
             }
 

ReCaptchaCheckout/view/frontend/web/js/webapiReCaptchaRegistry-mixin.js

@@ -0,0 +1,20 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([], function () {
+    'use strict';
+
+    return function (originalFunction) {
+        /**
+         * {@inheritDoc}
+         */
+       originalFunction.addListener = function (id , func) {
+            this._listeners[id] = func;
+       };
+
+        return originalFunction;
+    };
+
+});

ReCaptchaCheckoutSalesRule/view/frontend/web/js/checkout-sales-rule.js

@@ -58,11 +58,20 @@ define(
                     headers['X-ReCaptcha'] = xRecaptchaValue;
                 });
 
+                if (self.getIsInvisibleRecaptcha()) {
+                    grecaptcha.execute(widgetId);
+                    self.validateReCaptcha(true);
+                }
                 //Refresh reCaptcha after failed request.
                 setCouponCodeAction.registerFailCallback(function () {
-                    self.validateReCaptcha(false);
-                    grecaptcha.reset(widgetId);
-                    $('#' + captchaId).show();
+                    if (self.getIsInvisibleRecaptcha()) {
+                        grecaptcha.execute(widgetId);
+                        self.validateReCaptcha(true);
+                    } else {
+                        self.validateReCaptcha(false);
+                        grecaptcha.reset(widgetId);
+                        $('#' + captchaId).show();
+                    }
                 });
                 //Hide captcha when a coupon has been applied.
                 setCouponCodeAction.registerSuccessCallback(function () {

ReCaptchaUser/Command/DisableReCaptchaForUserForgotPasswordCommand.php

@@ -7,6 +7,7 @@
 
 namespace Magento\ReCaptchaUser\Command;
 
+use Magento\Framework\Console\Cli;
 use Magento\ReCaptchaUser\Model\DisableReCaptchaForUserForgotPassword;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -47,5 +48,7 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->disableReCaptchaForUserForgotPassword->execute();
+
+        return Cli::RETURN_SUCCESS;
     }
 }

ReCaptchaUser/Command/DisableReCaptchaForUserLoginCommand.php

@@ -7,6 +7,7 @@
 
 namespace Magento\ReCaptchaUser\Command;
 
+use Magento\Framework\Console\Cli;
 use Magento\ReCaptchaUser\Model\DisableReCaptchaForUserLogin;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -47,5 +48,7 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->disableReCaptchaForUserLogin->execute();
+
+        return Cli::RETURN_SUCCESS;
     }
 }

ReCaptchaWebapiUi/view/frontend/web/js/webapiReCaptchaRegistry.js

@@ -37,6 +37,15 @@ define([], function () {
             } else {
                 this._listeners[id] = func;
             }
+        },
+
+        /**
+         * Remove a listener
+         *
+         * @param id
+         */
+        removeListener: function (id) {
+            this._listeners[id] = undefined;
         }
     };
 });

TwoFactorAuth/Command/GoogleSecret.php

@@ -7,6 +7,7 @@
 
 namespace Magento\TwoFactorAuth\Command;
 
+use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\TwoFactorAuth\Api\UserConfigManagerInterface;
 use Magento\TwoFactorAuth\Model\Provider\Engine\Google;
@@ -68,8 +69,8 @@ protected function configure()
         $this->setName('security:tfa:google:set-secret');
         $this->setDescription('Set the secret used for Google OTP generation.');
 
-        $this->addArgument('user', InputArgument::REQUIRED, __('Username'));
-        $this->addArgument('secret', InputArgument::REQUIRED, __('Secret'));
+        $this->addArgument('user', InputArgument::REQUIRED, __('Username')->render());
+        $this->addArgument('secret', InputArgument::REQUIRED, __('Secret')->render());
 
         parent::configure();
     }
@@ -104,5 +105,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         );
 
         $output->writeln((string)__('Google OTP secret has been set'));
+
+        return Cli::RETURN_SUCCESS;
     }
 }

TwoFactorAuth/Command/TfaReset.php

@@ -69,8 +69,8 @@ protected function configure()
         $this->setName('security:tfa:reset');
         $this->setDescription('Reset configuration for one user');
 
-        $this->addArgument('user', InputArgument::REQUIRED, __('Username'));
-        $this->addArgument('provider', InputArgument::REQUIRED, __('Provider code'));
+        $this->addArgument('user', InputArgument::REQUIRED, __('Username')->render());
+        $this->addArgument('provider', InputArgument::REQUIRED, __('Provider code')->render());
 
         parent::configure();
     }

dev/tests/js/jasmine/tests/app/code/Magento/ReCaptchaCheckout/frontend/js/model/place-order-mixin.test.js

@@ -0,0 +1,101 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define(['squire'
+], function (Squire) {
+    'use strict';
+
+    var injector = new Squire(),
+
+        defaultContext = require.s.contexts._,
+        mixin,
+        registry;
+
+    beforeEach(function (done) {
+        window.checkoutConfig = {
+            defaultSuccessPageUrl: ''
+        };
+
+        injector.require([
+            'Magento_ReCaptchaCheckout/js/model/place-order-mixin',
+            'Magento_ReCaptchaWebapiUi/js/webapiReCaptchaRegistry'
+        ], function (Mixin, Registry) {
+            mixin = Mixin;
+            registry = Registry;
+            done();
+        });
+    });
+
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {}
+    });
+
+    describe('Magento_ReCaptchaCheckout/js/model/place-order-mixin', function () {
+        it('mixin is applied to Magento_Checkout/js/model/place-order', function () {
+            var placeOrderMixins = defaultContext.config.config.mixins['Magento_Checkout/js/model/place-order'];
+
+            expect(placeOrderMixins['Magento_ReCaptchaCheckout/js/model/place-order-mixin']).toBe(true);
+        });
+
+        it('Magento_Checkout/js/action/redirect-on-success is called', function () {
+            let recaptchaId = 'recaptcha-checkout-place-order',
+                messageContainer = jasmine.createSpy('messageContainer'),
+                payload = {},
+                serviceUrl = 'test',
+
+                /**
+                 * Order place action mock
+                 *
+                 * @returns {{fail: fail, done: (function(Function): *)}}
+                 */
+                action =  function () {
+                    return {
+                        /**
+                         * Success result for request
+                         *
+                         * @param {Function} handler
+                         * @returns {*}
+                         */
+                        done: function (handler) {
+                            handler();
+                            return this;
+                        },
+
+                        /**
+                         * Fail result for request
+                         */
+                        fail: function () {}
+                    };
+                };
+
+            /**
+             * Triggers declared listener
+             *
+             * @returns {*}
+             */
+            registry.triggers[recaptchaId] = function () {
+                if (registry._listeners[recaptchaId] !== undefined) {
+                    return registry._listeners[recaptchaId]('token');
+                }
+            };
+
+            /**
+             * Registers a listener
+             *
+             * @param id
+             * @param func
+             */
+            registry.addListener = function (id, func) {
+                registry._listeners[id] = func;
+            };
+            registry.removeListener = jasmine.createSpy();
+            mixin()(action, serviceUrl, payload, messageContainer);
+            expect(registry.removeListener).toHaveBeenCalledWith(recaptchaId);
+        });
+    });
+});