ACP2E-3813: Updating products using the Mass Action, resulted in an unexpected system logout

Author: dhorytskyi

app/design/adminhtml/Magento/backend/i18n/en_US.csv

@@ -549,4 +549,4 @@ Dashboard,Dashboard
 "Email to a Friend","Email to a Friend"
 "Invalid data type","Invalid data type"
 "Invalid value provided for attribute %1","Invalid value provided for attribute %1"
-
+"The current session size exceeds configured maximum session size, consider increasing the configured value.","The current session size exceeds configured maximum session size, consider increasing the configured value."

lib/internal/Magento/Framework/Session/SaveHandler.php

@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento\Framework\Session;
 
 use Magento\Framework\App\Area;
@@ -17,7 +16,6 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * Magento session save handler.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SaveHandler implements SaveHandlerInterface, ResetAfterRequestInterface
@@ -128,11 +126,22 @@ public function read($sessionId): string
         $sessionSize = $sessionData !== null ? strlen($sessionData) : 0;
 
         if ($sessionMaxSize !== null && $sessionMaxSize < $sessionSize) {
-            $sessionData = '';
-            if ($this->appState->getAreaCode() === Area::AREA_FRONTEND) {
-                $this->messageManager->addErrorMessage(
-                    __('There is an error. Please Contact store administrator.')
-                );
+            switch ($this->appState->getAreaCode()) {
+                case Area::AREA_ADMINHTML:
+                    $this->messageManager->addNoticeMessage(
+                        __(
+                            'The current session size exceeds configured maximum session size,'
+                            . ' consider increasing the configured value.'
+                        )
+                    );
+                    break;
+                case Area::AREA_FRONTEND:
+                    $this->messageManager->addErrorMessage(
+                        __('There is an error. Please Contact store administrator.')
+                    );
+                //clear session data for all areas other than adminhtml
+                default:
+                    $sessionData = '';
             }
         }
 

lib/internal/Magento/Framework/Session/Test/Unit/SaveHandlerTest.php

@@ -1,97 +1,88 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
-/**
- * Test class for \Magento\Framework\Session\SaveHandler
- */
-
 namespace Magento\Framework\Session\Test\Unit;
 
+use Magento\Framework\App\Area as AppArea;
+use Magento\Framework\App\State as AppState;
+use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\Session\Config\ConfigInterface;
 use Magento\Framework\Session\SaveHandler;
 use Magento\Framework\Session\SaveHandlerFactory;
 use Magento\Framework\Session\SaveHandlerInterface;
 use Magento\Framework\Session\SessionMaxSizeConfig;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SaveHandlerTest extends TestCase
 {
-    /**
-     * @var ObjectManager
-     */
-    protected $helper;
-
     /**
      * @var SaveHandler
      */
-    protected $saveHandler;
+    private $saveHandler;
 
     /**
      * @var SaveHandlerFactory|MockObject
      */
-    protected $saveHandlerFactoryMock;
+    private $saveHandlerFactoryMock;
 
     /**
      * @var SaveHandlerInterface|MockObject
      */
-    protected $saveHandlerAdapterMock;
+    private $saveHandlerAdapterMock;
 
     /**
      * @var ConfigInterface|MockObject
      */
-    protected $configMock;
+    private $configMock;
 
     /**
      * @var SessionMaxSizeConfig|MockObject
      */
-    protected $sessionMaxSizeConfigMock;
-
-    protected function setUp(): void
-    {
-        $this->configMock = $this->getMockBuilder(ConfigInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+    private $sessionMaxSizeConfigMock;
 
-        $this->sessionMaxSizeConfigMock = $this->getMockBuilder(SaveHandlerFactory::class)
-            ->disableOriginalConstructor()
-            ->addMethods(['getSessionMaxSize'])
-            ->getMock();
+    /**
+     * @var ManagerInterface|MockObject
+     */
+    private $messageManagerMock;
 
-        $this->saveHandlerAdapterMock = $this->getMockBuilder(SaveHandlerInterface::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['write'])
-            ->getMockForAbstractClass();
+    /**
+     * @var AppState|MockObject
+     */
+    private $appStateMock;
 
+    protected function setUp(): void
+    {
+        $this->configMock = $this->createMock(ConfigInterface::class);
+        $this->sessionMaxSizeConfigMock = $this->createMock(SessionMaxSizeConfig::class);
+        $this->saveHandlerAdapterMock = $this->createMock(SaveHandlerInterface::class);
         $this->saveHandlerAdapterMock->expects($this->any())
             ->method('write')
             ->willReturn(true);
-
-        $this->saveHandlerFactoryMock = $this->getMockBuilder(SaveHandlerFactory::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['create'])
-            ->getMock();
-
+        $this->saveHandlerFactoryMock = $this->createMock(SaveHandlerFactory::class);
         $this->saveHandlerFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->saveHandlerAdapterMock);
-
-        $this->helper = new ObjectManager($this);
-        $this->saveHandler = $this->helper->getObject(
-            SaveHandler::class,
-            [
-                'saveHandlerFactory' => $this->saveHandlerFactoryMock,
-                'sessionConfig' => $this->configMock,
-                'sessionMaxSizeConfig' => $this->sessionMaxSizeConfigMock,
-            ]
+        $loggerMock = $this->createMock(LoggerInterface::class);
+        $this->messageManagerMock = $this->createMock(ManagerInterface::class);
+        $this->appStateMock = $this->createMock(AppState::class);
+
+        $this->saveHandler = new SaveHandler(
+            $this->saveHandlerFactoryMock,
+            $this->configMock,
+            $loggerMock,
+            $this->sessionMaxSizeConfigMock,
+            SaveHandlerInterface::DEFAULT_HANDLER,
+            $this->messageManagerMock,
+            $this->appStateMock
         );
     }
 
@@ -146,7 +137,14 @@ public function testReadMoreThanSessionMaxSize(): void
             ->with('test_session_id')
             ->willReturn('test_session_data');
 
-        $this->assertEquals(null, $this->saveHandler->read("test_session_id"));
+        $this->appStateMock->expects($this->once())
+            ->method('getAreaCode')
+            ->willReturn(AppArea::AREA_FRONTEND);
+        $this->messageManagerMock->expects($this->once())
+            ->method('addErrorMessage')
+            ->willReturnSelf();
+
+        $this->assertEmpty($this->saveHandler->read('test_session_id'));
     }
 
     public function testReadSessionMaxZero(): void
@@ -162,6 +160,34 @@ public function testReadSessionMaxZero(): void
             ->with('test_session_id')
             ->willReturn('test_session_data');
 
-        $this->assertEquals(null, $this->saveHandler->read("test_session_id"));
+        $this->appStateMock->expects($this->once())
+            ->method('getAreaCode')
+            ->willReturn(AppArea::AREA_FRONTEND);
+        $this->messageManagerMock->expects($this->once())
+            ->method('addErrorMessage')
+            ->willReturnSelf();
+
+        $this->assertEmpty($this->saveHandler->read('test_session_id'));
+    }
+
+    public function testReadMoreThanSessionMaxSizeAdmin(): void
+    {
+        $this->sessionMaxSizeConfigMock->expects($this->once())
+            ->method('getSessionMaxSize')
+            ->willReturn(1);
+
+        $this->saveHandlerAdapterMock->expects($this->once())
+            ->method('read')
+            ->with('test_session_id')
+            ->willReturn('test_session_data');
+
+        $this->appStateMock->expects($this->once())
+            ->method('getAreaCode')
+            ->willReturn(AppArea::AREA_ADMINHTML);
+        $this->messageManagerMock->expects($this->once())
+            ->method('addNoticeMessage')
+            ->willReturnSelf();
+
+        $this->assertEquals('test_session_data', $this->saveHandler->read('test_session_id'));
     }
 }