2.2 develop-update branch

app/code/Magento/Backup/Controller/Adminhtml/Index.php

@@ -19,7 +19,7 @@ abstract class Index extends \Magento\Backend\App\Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Backend::backup';
+    const ADMIN_RESOURCE = 'Magento_Backup::backup';
 
     /**
      * Core registry

app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php

@@ -7,9 +7,14 @@
 namespace Magento\Captcha\Model\Customer\Plugin;
 
 use Magento\Captcha\Helper\Data as CaptchaHelper;
-use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Customer\Controller\Ajax\Login;
+use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Session\SessionManagerInterface;
 
+/**
+ * The plugin for ajax login controller.
+ */
 class AjaxLogin
 {
     /**
@@ -61,14 +66,14 @@ public function __construct(
     }
 
     /**
-     * @param \Magento\Customer\Controller\Ajax\Login $subject
+     * Validates captcha during request execution.
+     *
+     * @param Login $subject
      * @param \Closure $proceed
      * @return $this
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function aroundExecute(
-        \Magento\Customer\Controller\Ajax\Login $subject,
+        Login $subject,
         \Closure $proceed
     ) {
         $captchaFormIdField = 'captcha_form_id';
@@ -93,26 +98,31 @@ public function aroundExecute(
         foreach ($this->formIds as $formId) {
             if ($formId === $loginFormId) {
                 $captchaModel = $this->helper->getCaptcha($formId);
+
                 if ($captchaModel->isRequired($username)) {
-                    $captchaModel->logAttempt($username);
                     if (!$captchaModel->isCorrect($captchaString)) {
                         $this->sessionManager->setUsername($username);
-                        return $this->returnJsonError(__('Incorrect CAPTCHA'));
+                        $captchaModel->logAttempt($username);
+                        return $this->returnJsonError(__('Incorrect CAPTCHA'), true);
                     }
                 }
+
+                $captchaModel->logAttempt($username);
             }
         }
         return $proceed();
     }
 
     /**
+     * Gets Json response.
      *
      * @param \Magento\Framework\Phrase $phrase
-     * @return \Magento\Framework\Controller\Result\Json
+     * @param bool $isCaptchaRequired
+     * @return Json
      */
-    private function returnJsonError(\Magento\Framework\Phrase $phrase): \Magento\Framework\Controller\Result\Json
+    private function returnJsonError(\Magento\Framework\Phrase $phrase, bool $isCaptchaRequired = false): Json
     {
         $resultJson = $this->resultJsonFactory->create();
-        return $resultJson->setData(['errors' => true, 'message' => $phrase]);
+        return $resultJson->setData(['errors' => true, 'message' => $phrase, 'captcha' => $isCaptchaRequired]);
     }
 }

app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php

@@ -149,7 +149,7 @@ public function testAroundExecuteIncorrectCaptcha()
         $this->resultJsonMock
             ->expects($this->once())
             ->method('setData')
-            ->with(['errors' => true, 'message' => __('Incorrect CAPTCHA')])
+            ->with(['errors' => true, 'message' => __('Incorrect CAPTCHA'), 'captcha' => true])
             ->will($this->returnSelf());
 
         $closure = function () {

app/code/Magento/Captcha/etc/di.xml

@@ -27,7 +27,7 @@
         </arguments>
     </type>
     <type name="Magento\Customer\Controller\Ajax\Login">
-        <plugin name="configurable_product" type="Magento\Captcha\Model\Customer\Plugin\AjaxLogin" sortOrder="50" />
+        <plugin name="captcha_validation" type="Magento\Captcha\Model\Customer\Plugin\AjaxLogin" sortOrder="50" />
     </type>
     <type name="Magento\Captcha\Model\Customer\Plugin\AjaxLogin">
         <arguments>

app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js

@@ -17,7 +17,7 @@ define([
             imageSource: ko.observable(captchaData.imageSrc),
             visibility: ko.observable(false),
             captchaValue: ko.observable(null),
-            isRequired: captchaData.isRequired,
+            isRequired: ko.observable(captchaData.isRequired),
             isCaseSensitive: captchaData.isCaseSensitive,
             imageHeight: captchaData.imageHeight,
             refreshUrl: captchaData.refreshUrl,
@@ -41,7 +41,7 @@ define([
              * @return {Boolean}
              */
             getIsVisible: function () {
-                return this.visibility;
+                return this.visibility();
             },
 
             /**
@@ -55,14 +55,14 @@ define([
              * @return {Boolean}
              */
             getIsRequired: function () {
-                return this.isRequired;
+                return this.isRequired();
             },
 
             /**
              * @param {Boolean} flag
              */
             setIsRequired: function (flag) {
-                this.isRequired = flag;
+                this.isRequired(flag);
             },
 
             /**

app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js

@@ -89,6 +89,13 @@ define([
             return this.currentCaptcha !== null ? this.currentCaptcha.getIsRequired() : false;
         },
 
+        /**
+         * @param {Boolean} flag
+         */
+        setIsRequired: function (flag) {
+            this.currentCaptcha.setIsRequired(flag);
+        },
+
         /**
          * @return {Boolean}
          */

app/code/Magento/Captcha/view/frontend/web/js/view/checkout/loginCaptcha.js

@@ -4,34 +4,44 @@
  */
 
 define([
-    'Magento_Captcha/js/view/checkout/defaultCaptcha',
-    'Magento_Captcha/js/model/captchaList',
-    'Magento_Customer/js/action/login'
-],
-function (defaultCaptcha, captchaList, loginAction) {
-    'use strict';
-
-    return defaultCaptcha.extend({
-        /** @inheritdoc */
-        initialize: function () {
-            var self = this,
-                currentCaptcha;
-
-            this._super();
-            currentCaptcha = captchaList.getCaptchaByFormId(this.formId);
-
-            if (currentCaptcha != null) {
-                currentCaptcha.setIsVisible(true);
-                this.setCurrentCaptcha(currentCaptcha);
-
-                loginAction.registerLoginCallback(function (loginData) {
-                    if (loginData['captcha_form_id'] &&
-                        loginData['captcha_form_id'] == self.formId //eslint-disable-line eqeqeq
-                    ) {
+        'underscore',
+        'Magento_Captcha/js/view/checkout/defaultCaptcha',
+        'Magento_Captcha/js/model/captchaList',
+        'Magento_Customer/js/action/login'
+    ],
+    function (_, defaultCaptcha, captchaList, loginAction) {
+        'use strict';
+
+        return defaultCaptcha.extend({
+            /** @inheritdoc */
+            initialize: function () {
+                var self = this,
+                    currentCaptcha;
+
+                this._super();
+                currentCaptcha = captchaList.getCaptchaByFormId(this.formId);
+
+                if (currentCaptcha != null) {
+                    currentCaptcha.setIsVisible(true);
+                    this.setCurrentCaptcha(currentCaptcha);
+
+                    loginAction.registerLoginCallback(function (loginData, response) {
+                        if (!loginData['captcha_form_id'] || loginData['captcha_form_id'] !== self.formId) {
+                            return;
+                        }
+
+                        if (_.isUndefined(response) || !response.errors) {
+                            return;
+                        }
+
+                        // check if captcha should be required after login attempt
+                        if (!self.isRequired() && response.captcha && self.isRequired() !== response.captcha) {
+                            self.setIsRequired(response.captcha);
+                        }
+
                         self.refresh();
-                    }
-                });
+                    });
+                }
             }
-        }
+        });
     });
-});

app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html

@@ -4,12 +4,14 @@
  * See COPYING.txt for license details.
  */
 -->
+<!-- ko if: (getIsVisible())-->
+<input name="captcha_form_id" type="hidden" data-bind="value: formId,  attr: {'data-scope': dataScope}" />
+<!-- /ko -->
 <!-- ko if: (isRequired() && getIsVisible())-->
 <div class="field captcha required" data-bind="blockLoader: getIsLoading()">
     <label data-bind="attr: {for: 'captcha_' + formId}" class="label"><span data-bind="i18n: 'Please type the letters and numbers below'"></span></label>
     <div class="control captcha">
-        <input name="captcha_string" type="text" class="input-text required-entry" data-bind="value: captchaValue(), attr: {id: 'captcha_' + formId, 'data-scope': dataScope}" autocomplete="off"/>
-        <input name="captcha_form_id" type="hidden" data-bind="value: formId,  attr: {'data-scope': dataScope}" />
+        <input name="captcha_string" type="text" class="input-text required-entry" data-bind="value: captchaValue(), attr: {'data-scope': dataScope}" autocomplete="off"/>
         <div class="nested">
             <div class="field captcha no-label">
                 <div class="control captcha-image">

app/code/Magento/Catalog/Helper/Data.php

@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
@@ -269,7 +270,8 @@ public function setStoreId($store)
 
     /**
      * Return current category path or get it from current category
-     * and creating array of categories|product paths for breadcrumbs
+     *
+     * Creating array of categories|product paths for breadcrumbs
      *
      * @return array
      */
@@ -378,6 +380,7 @@ public function getLastViewedUrl()
 
     /**
      * Split SKU of an item by dashes and spaces
+     *
      * Words will not be broken, unless this length is greater than $length
      *
      * @param string $sku
@@ -406,14 +409,15 @@ public function getAttributeHiddenFields()
     /**
      * Retrieve Catalog Price Scope
      *
-     * @return int
+     * @return int|null
      */
     public function getPriceScope()
     {
-        return $this->scopeConfig->getValue(
+        $priceScope = $this->scopeConfig->getValue(
             self::XML_PATH_PRICE_SCOPE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
+        return isset($priceScope) ? (int)$priceScope : null;
     }
 
     /**
@@ -449,7 +453,7 @@ public function isUrlDirectivesParsingAllowed()
     {
         return $this->scopeConfig->isSetFlag(
             self::CONFIG_PARSE_URL_DIRECTIVES,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $this->_storeId
         );
     }
@@ -466,19 +470,22 @@ public function getPageTemplateProcessor()
 
     /**
      * Whether to display items count for each filter option
+     *
      * @param int $storeId Store view ID
      * @return bool
      */
     public function shouldDisplayProductCountOnLayer($storeId = null)
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_DISPLAY_PRODUCT_COUNT,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $storeId
         );
     }
 
     /**
+     * Convert tax address array to address data object with country id and postcode
+     *
      * @param array $taxAddress
      * @return \Magento\Customer\Api\Data\AddressInterface|null
      */

app/code/Magento/Catalog/Model/Design.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Model;
 
+use \Magento\Framework\TranslateInterface;
+
 /**
  * Catalog Custom Category design Model
  *
@@ -31,6 +33,11 @@ class Design extends \Magento\Framework\Model\AbstractModel
      */
     protected $_localeDate;
 
+    /**
+     * @var TranslateInterface
+     */
+    private $translator;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -47,10 +54,13 @@ public function __construct(
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        TranslateInterface $translator = null
     ) {
         $this->_localeDate = $localeDate;
         $this->_design = $design;
+        $this->translator = $translator ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(TranslateInterface::class);
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
@@ -63,6 +73,7 @@ public function __construct(
     public function applyCustomDesign($design)
     {
         $this->_design->setDesignTheme($design);
+        $this->translator->loadData(null, true);
         return $this;
     }