Merge pull request #6477 from magento-tsg/MC-39985

[Arrows] MC-39985: Request error when displaying content on CMS page of second website

Author: zakdma

app/code/Magento/Store/Model/StoreSwitcher/HashProcessor.php

@@ -96,39 +96,41 @@ public function __construct(
      */
     public function switch(StoreInterface $fromStore, StoreInterface $targetStore, string $redirectUrl): string
     {
-        $timestamp = (int) $this->request->getParam('time_stamp');
-        $signature = (string) $this->request->getParam('signature');
-        $data = (string) $this->request->getParam('data');
-        $context = $this->contextFactory->create(
-            [
-                'fromStore' => $fromStore,
-                'targetStore' => $targetStore,
-                'redirectUrl' => $redirectUrl
-            ]
-        );
-        $redirectDataObject = $this->dataFactory->create(
-            [
-                'signature' => $signature,
-                'timestamp' => $timestamp,
-                'data' => $data
-            ]
-        );
+        if ($this->request->getParam('data') !== null) {
+            $timestamp = (int) $this->request->getParam('time_stamp');
+            $signature = (string) $this->request->getParam('signature');
+            $data = (string) $this->request->getParam('data');
+            $context = $this->contextFactory->create(
+                [
+                    'fromStore' => $fromStore,
+                    'targetStore' => $targetStore,
+                    'redirectUrl' => $redirectUrl
+                ]
+            );
+            $redirectDataObject = $this->dataFactory->create(
+                [
+                    'signature' => $signature,
+                    'timestamp' => $timestamp,
+                    'data' => $data
+                ]
+            );
 
-        try {
-            if ($redirectUrl && $this->dataValidator->validate($context, $redirectDataObject)) {
-                $this->postprocessor->process($context, $this->dataSerializer->unserialize($data));
-            } else {
-                throw new LocalizedException(
-                    __('The requested store cannot be found. Please check the request and try again.')
+            try {
+                if ($redirectUrl && $this->dataValidator->validate($context, $redirectDataObject)) {
+                    $this->postprocessor->process($context, $this->dataSerializer->unserialize($data));
+                } else {
+                    throw new LocalizedException(
+                        __('The requested store cannot be found. Please check the request and try again.')
+                    );
+                }
+            } catch (LocalizedException $exception) {
+                $this->messageManager->addErrorMessage($exception->getMessage());
+            } catch (\Throwable $exception) {
+                $this->logger->error($exception);
+                $this->messageManager->addErrorMessage(
+                    __('Something went wrong.')
                 );
             }
-        } catch (LocalizedException $exception) {
-            $this->messageManager->addErrorMessage($exception->getMessage());
-        } catch (\Throwable $exception) {
-            $this->logger->error($exception);
-            $this->messageManager->addErrorMessage(
-                __('Something went wrong.')
-            );
         }
 
         return $redirectUrl;

app/code/Magento/Store/Test/Unit/Model/StoreSwitcher/HashProcessorTest.php

@@ -128,12 +128,22 @@ function ($arg) {
         $this->postprocessor->expects($this->once())
             ->method('process')
             ->with($this->isInstanceOf(ContextInterface::class), ['customer_id' => 1]);
+        $this->messageManager->expects($this->never())
+            ->method('addErrorMessage');
         $this->assertEquals($redirectUrl, $this->model->switch($this->store1, $this->store2, $redirectUrl));
     }
 
     public function testShouldNotProcessIfDataValidationFailed(): void
     {
         $redirectUrl = '/category-1/category-1.1.html';
+        $this->request->method('getParam')
+            ->willReturnMap(
+                [
+                    ['time_stamp', null, time() - 1],
+                    ['data', null, '{"customer_id":1}'],
+                    ['signature', null, 'randomstring'],
+                ]
+            );
         $this->dataValidator->method('validate')
             ->willReturn(false);
         $this->postprocessor->expects($this->never())
@@ -148,6 +158,14 @@ public function testShouldNotProcessIfDataValidationFailed(): void
     public function testShouldNotProcessIfDataUnserializationFailed(): void
     {
         $redirectUrl = '/category-1/category-1.1.html';
+        $this->request->method('getParam')
+            ->willReturnMap(
+                [
+                    ['time_stamp', null, time() - 1],
+                    ['data', null, '{"customer_id":1}'],
+                    ['signature', null, 'randomstring'],
+                ]
+            );
         $this->dataValidator->method('validate')
             ->willReturn(true);
         $this->dataSerializer->method('unserialize')
@@ -160,4 +178,16 @@ public function testShouldNotProcessIfDataUnserializationFailed(): void
 
         $this->assertEquals($redirectUrl, $this->model->switch($this->store1, $this->store2, $redirectUrl));
     }
+
+    public function testShouldNotProcessIfDataIsNotPresentInTheRequest(): void
+    {
+        $redirectUrl = '/category-1/category-1.1.html';
+        $this->dataValidator->expects($this->never())
+            ->method('validate');
+        $this->postprocessor->expects($this->never())
+            ->method('process');
+        $this->messageManager->expects($this->never())
+            ->method('addErrorMessage');
+        $this->assertEquals($redirectUrl, $this->model->switch($this->store1, $this->store2, $redirectUrl));
+    }
 }