MC-32243: [Magento Cloud] - "Invalid Form Key. Please refresh the page." not being translated

Author: tsviklinskyi

dev/tests/integration/testsuite/Magento/Customer/Controller/Account/LoginPostTest.php

@@ -11,6 +11,7 @@
 use Magento\Customer\Model\Url;
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\Phrase;
 use Magento\Framework\Url\EncoderInterface;
 use Magento\TestFramework\TestCase\AbstractController;
 
@@ -151,6 +152,28 @@ public function testLoginWithRedirectToDashboard(): void
         $this->assertRedirect($this->stringContains('customer/account/'));
     }
 
+    /**
+     * @magentoConfigFixture current_store customer/startup/redirect_dashboard 1
+     * @magentoConfigFixture current_store customer/captcha/enable 0
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     *
+     * @return void
+     */
+    public function testNoFormKeyLoginPostAction(): void
+    {
+        $this->prepareRequest('customer@example.com', 'password');
+        $this->getRequest()->setPostValue('form_key', null);
+        $this->getRequest()->setParam(Url::REFERER_QUERY_PARAM_NAME, $this->urlEncoder->encode('test_redirect'));
+        $this->dispatch('customer/account/loginPost');
+        $this->assertFalse($this->session->isLoggedIn());
+        $this->assertRedirect($this->stringContains('customer/account/'));
+        $this->assertSessionMessages(
+            $this->equalTo([new Phrase('Invalid Form Key. Please refresh the page.')]),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
     /**
      * Prepare request
      *

dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php

@@ -16,6 +16,7 @@
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Data\Form\FormKey;
 use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\Phrase;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Stdlib\CookieManagerInterface;
 use Magento\Store\Model\StoreManager;
@@ -227,6 +228,10 @@ public function testNoFormKeyCreatePostAction()
 
         $this->assertNull($this->getCustomerByEmail('test1@email.com'));
         $this->assertRedirect($this->stringEndsWith('customer/account/create/'));
+        $this->assertSessionMessages(
+            $this->equalTo([new Phrase('Invalid Form Key. Please refresh the page.')]),
+            MessageInterface::TYPE_ERROR
+        );
     }
 
     /**
@@ -612,6 +617,10 @@ public function testWrongConfirmationEditPostAction()
      *
      * @magentoDataFixture Magento/Customer/_files/customer_confirmation_config_enable.php
      * @return void
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Stdlib\Cookie\FailureToSendException
      */
     public function testRegisterCustomerWithEmailConfirmation(): void
     {
@@ -725,6 +734,10 @@ public function testConfirmationEmailWithSpecialCharacters(): void
      * @magentoConfigFixture current_store customer/captcha/enable 0
      *
      * @return void
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\State\InputMismatchException
      */
     public function testResetPasswordWhenEmailChanged(): void
     {

lib/internal/Magento/Framework/App/FrontController.php

@@ -5,14 +5,15 @@
  */
 namespace Magento\Framework\App;
 
+use Magento\Framework\App\Action\AbstractAction;
+use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\App\Request\InvalidRequestException;
-use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\App\Request\ValidatorInterface as RequestValidator;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Message\ManagerInterface as MessageManager;
-use Magento\Framework\App\Action\AbstractAction;
 use Psr\Log\LoggerInterface;
-use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * Front controller responsible for dispatching application requests
@@ -51,19 +52,33 @@ class FrontController implements FrontControllerInterface
      */
     private $validatedRequest = false;
 
+    /**
+     * @var State
+     */
+    private $appState;
+
+    /**
+     * @var AreaList
+     */
+    private $areaList;
+
     /**
      * @param RouterListInterface $routerList
      * @param ResponseInterface $response
      * @param RequestValidator|null $requestValidator
      * @param MessageManager|null $messageManager
      * @param LoggerInterface|null $logger
+     * @param State $appState
+     * @param AreaList $areaList
      */
     public function __construct(
         RouterListInterface $routerList,
         ResponseInterface $response,
         ?RequestValidator $requestValidator = null,
         ?MessageManager $messageManager = null,
-        ?LoggerInterface $logger = null
+        ?LoggerInterface $logger = null,
+        ?State $appState = null,
+        ?AreaList $areaList = null
     ) {
         $this->_routerList = $routerList;
         $this->response = $response;
@@ -73,6 +88,10 @@ public function __construct(
             ?? ObjectManager::getInstance()->get(MessageManager::class);
         $this->logger = $logger
             ?? ObjectManager::getInstance()->get(LoggerInterface::class);
+        $this->appState = $appState
+            ?? ObjectManager::getInstance()->get(State::class);
+        $this->areaList = $areaList
+            ?? ObjectManager::getInstance()->get(AreaList::class);
     }
 
     /**
@@ -81,6 +100,7 @@ public function __construct(
      * @param RequestInterface|HttpRequest $request
      * @return ResponseInterface|ResultInterface
      * @throws \LogicException
+     * @throws LocalizedException
      */
     public function dispatch(RequestInterface $request)
     {
@@ -120,9 +140,10 @@ public function dispatch(RequestInterface $request)
      *
      * @param HttpRequest $request
      * @param ActionInterface $actionInstance
-     * @throws NotFoundException
-     *
      * @return ResponseInterface|ResultInterface
+     * @throws LocalizedException
+     *
+     * @throws NotFoundException
      */
     private function processRequest(
         HttpRequest $request,
@@ -147,6 +168,9 @@ private function processRequest(
                     ["exception" => $exception]
                 );
                 $result = $exception->getReplaceResult();
+                $area = $this->areaList->getArea($this->appState->getAreaCode());
+                $area->load(Area::PART_DESIGN);
+                $area->load(Area::PART_TRANSLATE);
                 if ($messages = $exception->getMessages()) {
                     foreach ($messages as $message) {
                         $this->messages->addErrorMessage($message);

lib/internal/Magento/Framework/App/Test/Unit/FrontControllerTest.php

@@ -6,8 +6,12 @@
 
 namespace Magento\Framework\App\Test\Unit;
 
+use Magento\Framework\App\Area;
+use Magento\Framework\App\AreaInterface;
+use Magento\Framework\App\AreaList;
 use Magento\Framework\App\Request\InvalidRequestException;
 use Magento\Framework\App\Request\ValidatorInterface;
+use Magento\Framework\App\State;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Message\ManagerInterface as MessageManager;
 use Psr\Log\LoggerInterface;
@@ -57,6 +61,21 @@ class FrontControllerTest extends \PHPUnit\Framework\TestCase
      */
     private $logger;
 
+    /**
+     * @var \PHPUnit\Framework\MockObject\MockObject|AreaList
+     */
+    private $areaListMock;
+
+    /**
+     * @var \PHPUnit\Framework\MockObject\MockObject|State
+     */
+    private $appStateMock;
+
+    /**
+     * @var \PHPUnit\Framework\MockObject\MockObject|AreaInterface
+     */
+    private $areaMock;
+
     protected function setUp()
     {
         $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
@@ -70,12 +89,19 @@ protected function setUp()
         $this->requestValidator = $this->createMock(ValidatorInterface::class);
         $this->messages = $this->createMock(MessageManager::class);
         $this->logger = $this->createMock(LoggerInterface::class);
+        $this->appStateMock  = $this->getMockBuilder(State::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->areaListMock = $this->createMock(AreaList::class);
+        $this->areaMock = $this->createMock(AreaInterface::class);
         $this->model = new \Magento\Framework\App\FrontController(
             $this->routerList,
             $this->response,
             $this->requestValidator,
             $this->messages,
-            $this->logger
+            $this->logger,
+            $this->appStateMock,
+            $this->areaListMock
         );
     }
 
@@ -114,6 +140,10 @@ public function testAddingValidationFailureMessageToDebugLog()
         $exceptionMessage = 'exception_message';
         $exception = new InvalidRequestException($exceptionMessage);
 
+        $this->appStateMock->expects($this->any())->method('getAreaCode')->willReturn('frontend');
+        $this->areaMock->expects($this->at(0))->method('load')->with(Area::PART_DESIGN)->willReturnSelf();
+        $this->areaMock->expects($this->at(1))->method('load')->with(Area::PART_TRANSLATE)->willReturnSelf();
+        $this->areaListMock->expects($this->any())->method('getArea')->will($this->returnValue($this->areaMock));
         $this->routerList->expects($this->any())
             ->method('valid')
             ->will($this->returnValue(true));