[Backport] Fix meta title property

app/code/Magento/Backend/App/AbstractAction.php

@@ -217,6 +217,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
             $this->_view->loadLayout(['default', 'adminhtml_denied'], true, true, false);
             $this->_view->renderLayout();
             $this->_request->setDispatched(true);
+
             return $this->_response;
         }
 
@@ -226,6 +227,11 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
 
         $this->_processLocaleSettings();
 
+        // Need to preload isFirstPageAfterLogin (see https://github.com/magento/magento2/issues/15510)
+        if ($this->_auth->isLoggedIn()) {
+            $this->_auth->getAuthStorage()->isFirstPageAfterLogin();
+        }
+
         return parent::dispatch($request);
     }
 

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php

@@ -68,10 +68,7 @@ public function __construct(
         $this->_storeManager = $storeManager;
         $this->_currencyLocator = $currencyLocator;
         $this->_localeCurrency = $localeCurrency;
-        $defaultBaseCurrencyCode = $this->_scopeConfig->getValue(
-            \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
-            'default'
-        );
+        $defaultBaseCurrencyCode = $currencyLocator->getDefaultCurrency($this->_request);
         $this->_defaultBaseCurrency = $currencyFactory->create()->load($defaultBaseCurrencyCode);
     }
 

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php

@@ -17,7 +17,7 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op
     /**
      * @var string
      */
-    protected $_template = 'product/composite/fieldset/options/type/checkbox.phtml';
+    protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/checkbox.phtml';
 
     /**
      * @param  string $elementId

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php

@@ -17,7 +17,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     /**
      * @var string
      */
-    protected $_template = 'product/composite/fieldset/options/type/multi.phtml';
+    protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/multi.phtml';
 
     /**
      * @param  string $elementId

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php

@@ -17,7 +17,7 @@ class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     /**
      * @var string
      */
-    protected $_template = 'product/composite/fieldset/options/type/radio.phtml';
+    protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/radio.phtml';
 
     /**
      * @param  string $elementId

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php

@@ -17,7 +17,7 @@ class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Opti
     /**
      * @var string
      */
-    protected $_template = 'product/composite/fieldset/options/type/select.phtml';
+    protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/select.phtml';
 
     /**
      * @param  string $elementId

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php

@@ -20,7 +20,7 @@ class Bundle extends \Magento\Backend\Block\Widget implements \Magento\Backend\B
     /**
      * @var string
      */
-    protected $_template = 'product/edit/bundle.phtml';
+    protected $_template = 'Magento_Bundle::product/edit/bundle.phtml';
 
     /**
      * Core registry

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php

@@ -26,7 +26,7 @@ class Option extends \Magento\Backend\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'product/edit/bundle/option.phtml';
+    protected $_template = 'Magento_Bundle::product/edit/bundle/option.phtml';
 
     /**
      * Core registry

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php

@@ -15,7 +15,7 @@ class Search extends \Magento\Backend\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'product/edit/bundle/option/search.phtml';
+    protected $_template = 'Magento_Bundle::product/edit/bundle/option/search.phtml';
 
     /**
      * @return void

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php

@@ -15,7 +15,7 @@ class Selection extends \Magento\Backend\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'product/edit/bundle/option/selection.phtml';
+    protected $_template = 'Magento_Bundle::product/edit/bundle/option/selection.phtml';
 
     /**
      * Catalog data

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php

@@ -16,5 +16,5 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/view/type/bundle/option/checkbox.phtml';
+    protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/checkbox.phtml';
 }

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php

@@ -16,7 +16,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/view/type/bundle/option/multi.phtml';
+    protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/multi.phtml';
 
     /**
      * @inheritdoc

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php

@@ -16,5 +16,5 @@ class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/view/type/bundle/option/radio.phtml';
+    protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/radio.phtml';
 }

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php

@@ -16,5 +16,5 @@ class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Opti
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/view/type/bundle/option/select.phtml';
+    protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/select.phtml';
 }

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

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Captcha\Model\Customer\Plugin;
 
 use Magento\Captcha\Helper\Data as CaptchaHelper;
@@ -81,27 +82,37 @@ public function aroundExecute(
         if ($content) {
             $loginParams = $this->serializer->unserialize($content);
         }
-        $username = isset($loginParams['username']) ? $loginParams['username'] : null;
-        $captchaString = isset($loginParams[$captchaInputName]) ? $loginParams[$captchaInputName] : null;
-        $loginFormId = isset($loginParams[$captchaFormIdField]) ? $loginParams[$captchaFormIdField] : null;
+        $username = $loginParams['username'] ?? null;
+        $captchaString = $loginParams[$captchaInputName] ?? null;
+        $loginFormId = $loginParams[$captchaFormIdField] ?? null;
 
-        foreach ($this->formIds as $formId) {
-            $captchaModel = $this->helper->getCaptcha($formId);
-            if ($captchaModel->isRequired($username) && !in_array($loginFormId, $this->formIds)) {
-                $resultJson = $this->resultJsonFactory->create();
-                return $resultJson->setData(['errors' => true, 'message' => __('Provided form does not exist')]);
-            }
+        if (!in_array($loginFormId, $this->formIds) && $this->helper->getCaptcha($loginFormId)->isRequired($username)) {
+            return $this->returnJsonError(__('Provided form does not exist'));
+        }
 
-            if ($formId == $loginFormId) {
-                $captchaModel->logAttempt($username);
-                if (!$captchaModel->isCorrect($captchaString)) {
-                    $this->sessionManager->setUsername($username);
-                    /** @var \Magento\Framework\Controller\Result\Json $resultJson */
-                    $resultJson = $this->resultJsonFactory->create();
-                    return $resultJson->setData(['errors' => true, 'message' => __('Incorrect CAPTCHA')]);
+        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'));
+                    }
                 }
             }
         }
         return $proceed();
     }
+
+    /**
+     *
+     * @param \Magento\Framework\Phrase $phrase
+     * @return \Magento\Framework\Controller\Result\Json
+     */
+    private function returnJsonError(\Magento\Framework\Phrase $phrase): \Magento\Framework\Controller\Result\Json
+    {
+        $resultJson = $this->resultJsonFactory->create();
+        return $resultJson->setData(['errors' => true, 'message' => $phrase]);
+    }
 }

app/code/Magento/Captcha/Model/DefaultModel.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Captcha\Model;
 
+use Magento\Captcha\Helper\Data;
+
 /**
  * Implementation of \Zend\Captcha\Image
  *
@@ -29,7 +31,7 @@ class DefaultModel extends \Zend\Captcha\Image implements \Magento\Captcha\Model
     const DEFAULT_WORD_LENGTH_TO = 5;
 
     /**
-     * @var \Magento\Captcha\Helper\Data
+     * @var Data
      * @since 100.2.0
      */
     protected $captchaData;
@@ -125,8 +127,8 @@ public function getBlockName()
      */
     public function isRequired($login = null)
     {
-        if ($this->isUserAuth()
-            && !$this->isShownToLoggedInUser()
+        if (($this->isUserAuth()
+                && !$this->isShownToLoggedInUser())
             || !$this->isEnabled()
             || !in_array(
                 $this->formId,
@@ -431,12 +433,14 @@ public function getWordLen()
      */
     private function isShowAlways()
     {
-        if ((string)$this->captchaData->getConfig('mode') == \Magento\Captcha\Helper\Data::MODE_ALWAYS) {
+        $captchaMode = (string)$this->captchaData->getConfig('mode');
+
+        if ($captchaMode === Data::MODE_ALWAYS) {
             return true;
         }
 
-        if ((string)$this->captchaData->getConfig('mode') == \Magento\Captcha\Helper\Data::MODE_AFTER_FAIL
-            && $this->getAllowedAttemptsForSameLogin() == 0
+        if ($captchaMode === Data::MODE_AFTER_FAIL
+            && $this->getAllowedAttemptsForSameLogin() === 0
         ) {
             return true;
         }

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

@@ -3,22 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Captcha\Test\Unit\Model\Customer\Plugin;
 
 class AjaxLoginTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Checkout\Model\Session
      */
     protected $sessionManagerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Captcha\Helper\Data
      */
     protected $captchaHelperMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Controller\Result\JsonFactory
      */
     protected $jsonFactoryMock;
 
@@ -38,12 +39,12 @@ class AjaxLoginTest extends \PHPUnit\Framework\TestCase
     protected $requestMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Customer\Controller\Ajax\Login
      */
     protected $loginControllerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Serialize\Serializer\Json
      */
     protected $serializerMock;
 
@@ -72,8 +73,12 @@ protected function setUp()
 
         $this->loginControllerMock->expects($this->any())->method('getRequest')
             ->will($this->returnValue($this->requestMock));
-        $this->captchaHelperMock->expects($this->once())->method('getCaptcha')
-            ->with('user_login')->will($this->returnValue($this->captchaMock));
+
+        $this->captchaHelperMock
+            ->expects($this->exactly(1))
+            ->method('getCaptcha')
+            ->will($this->returnValue($this->captchaMock));
+
         $this->formIds = ['user_login'];
         $this->serializerMock = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
 
@@ -103,11 +108,18 @@ public function testAroundExecute()
         $this->captchaMock->expects($this->once())->method('logAttempt')->with($username);
         $this->captchaMock->expects($this->once())->method('isCorrect')->with($captchaString)
             ->will($this->returnValue(true));
-        $this->serializerMock->expects(($this->once()))->method('unserialize')->will($this->returnValue($requestData));
+        $this->serializerMock->expects($this->once())->method('unserialize')->will($this->returnValue($requestData));
 
         $closure = function () {
             return 'result';
         };
+
+        $this->captchaHelperMock
+            ->expects($this->exactly(1))
+            ->method('getCaptcha')
+            ->with('user_login')
+            ->will($this->returnValue($this->captchaMock));
+
         $this->assertEquals('result', $this->model->aroundExecute($this->loginControllerMock, $closure));
     }
 
@@ -128,18 +140,21 @@ public function testAroundExecuteIncorrectCaptcha()
         $this->captchaMock->expects($this->once())->method('logAttempt')->with($username);
         $this->captchaMock->expects($this->once())->method('isCorrect')
             ->with($captchaString)->will($this->returnValue(false));
-        $this->serializerMock->expects(($this->once()))->method('unserialize')->will($this->returnValue($requestData));
+        $this->serializerMock->expects($this->once())->method('unserialize')->will($this->returnValue($requestData));
 
         $this->sessionManagerMock->expects($this->once())->method('setUsername')->with($username);
         $this->jsonFactoryMock->expects($this->once())->method('create')
             ->will($this->returnValue($this->resultJsonMock));
 
-        $this->resultJsonMock->expects($this->once())->method('setData')
-            ->with(['errors' => true, 'message' => __('Incorrect CAPTCHA')])->will($this->returnValue('response'));
+        $this->resultJsonMock
+            ->expects($this->once())
+            ->method('setData')
+            ->with(['errors' => true, 'message' => __('Incorrect CAPTCHA')])
+            ->will($this->returnSelf());
 
         $closure = function () {
         };
-        $this->assertEquals('response', $this->model->aroundExecute($this->loginControllerMock, $closure));
+        $this->assertEquals($this->resultJsonMock, $this->model->aroundExecute($this->loginControllerMock, $closure));
     }
 
     /**
@@ -151,7 +166,7 @@ public function testAroundExecuteCaptchaIsNotRequired($username, $requestContent
     {
         $this->requestMock->expects($this->once())->method('getContent')
             ->will($this->returnValue(json_encode($requestContent)));
-        $this->serializerMock->expects(($this->once()))->method('unserialize')
+        $this->serializerMock->expects($this->once())->method('unserialize')
             ->will($this->returnValue($requestContent));
 
         $this->captchaMock->expects($this->once())->method('isRequired')->with($username)
@@ -168,16 +183,39 @@ public function testAroundExecuteCaptchaIsNotRequired($username, $requestContent
     /**
      * @return array
      */
-    public function aroundExecuteCaptchaIsNotRequired()
+    public function aroundExecuteCaptchaIsNotRequired(): array
     {
         return [
             [
                 'username' => 'name',
                 'requestData' => ['username' => 'name', 'captcha_string' => 'string'],
             ],
+            [
+                'username' => 'name',
+                'requestData' =>
+                    [
+                        'username' => 'name',
+                        'captcha_string' => 'string',
+                        'captcha_form_id' => $this->formIds[0]
+                    ],
+            ],
             [
                 'username' => null,
-                'requestData' => ['captcha_string' => 'string'],
+                'requestData' =>
+                    [
+                        'username' => null,
+                        'captcha_string' => 'string',
+                        'captcha_form_id' => $this->formIds[0]
+                    ],
+            ],
+            [
+                'username' => 'name',
+                'requestData' =>
+                    [
+                        'username' => 'name',
+                        'captcha_string' => 'string',
+                        'captcha_form_id' => null
+                    ],
             ],
         ];
     }