Merge branch '2.4-develop' into MCP-648

Author: vzabaznov

app/code/Magento/Security/Model/AdminSessionsManager.php

@@ -8,7 +8,7 @@
 namespace Magento\Security\Model;
 
 use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
-use \Magento\Security\Model\ResourceModel\AdminSessionInfo\CollectionFactory;
+use Magento\Security\Model\ResourceModel\AdminSessionInfo\CollectionFactory;
 
 /**
  * Admin Sessions Manager Model
@@ -174,8 +174,15 @@ public function processLogout()
     public function getCurrentSession()
     {
         if (!$this->currentSession) {
+            $adminSessionInfoId = $this->authSession->getAdminSessionInfoId();
+            if (!$adminSessionInfoId) {
+                $this->createNewSession();
+                $adminSessionInfoId = $this->authSession->getAdminSessionInfoId();
+                $this->logoutOtherUserSessions();
+            }
+
             $this->currentSession = $this->adminSessionInfoFactory->create();
-            $this->currentSession->load($this->authSession->getAdminSessionInfoId(), 'id');
+            $this->currentSession->load($adminSessionInfoId, 'id');
         }
 
         return $this->currentSession;

app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php

@@ -335,9 +335,32 @@ public function testCleanExpiredSessions()
      */
     public function testGetLogoutReasonMessage($expectedResult, $sessionStatus)
     {
-        $this->adminSessionInfoFactoryMock->expects($this->once())
+        $this->adminSessionInfoFactoryMock->expects($this->exactly(2))
             ->method('create')
             ->willReturn($this->currentSessionMock);
+        $this->authSessionMock->expects($this->any())
+            ->method('getUser')
+            ->willReturn($this->userMock);
+        $this->currentSessionMock->expects($this->once())
+            ->method('setData')
+            ->willReturn($this->currentSessionMock);
+        $this->currentSessionMock->expects($this->once())
+            ->method('save')
+            ->willReturn($this->currentSessionMock);
+        $this->adminSessionInfoCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->adminSessionInfoCollectionMock);
+        $this->adminSessionInfoCollectionMock->expects($this->once())->method('filterByUser')
+            ->willReturnSelf();
+        $this->adminSessionInfoCollectionMock->expects($this->once())
+            ->method('filterExpiredSessions')
+            ->willReturnSelf();
+        $this->adminSessionInfoCollectionMock->expects($this->once())
+            ->method('loadData')
+            ->willReturnSelf();
+        $this->adminSessionInfoCollectionMock->expects($this->once())
+            ->method('setDataToAll')
+            ->willReturnSelf();
         $this->currentSessionMock->expects($this->once())
             ->method('getStatus')
             ->willReturn($sessionStatus);

dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php

@@ -39,6 +39,7 @@ protected function setUp(): void
             ->setCurrentScope(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
         $this->auth = $this->objectManager->create(\Magento\Backend\Model\Auth::class);
         $this->authSession = $this->objectManager->create(\Magento\Backend\Model\Auth\Session::class);
+        $this->authSession->setUser($this->objectManager->create(\Magento\User\Model\User::class));
         $this->auth->setAuthStorage($this->authSession);
         $this->auth->logout();
     }