MC-15006: Incorrect Prolong responses

- check if session already exists in prolong action

Author: krissyhiserote

setup/src/Magento/Setup/Controller/Session.php

@@ -52,23 +52,28 @@ public function prolongAction()
         try {
             if ($this->serviceManager->get(\Magento\Framework\App\DeploymentConfig::class)->isAvailable()) {
                 $objectManager = $this->objectManagerProvider->get();
-                /** @var \Magento\Framework\App\State $adminAppState */
-                $adminAppState = $objectManager->get(\Magento\Framework\App\State::class);
-                $adminAppState->setAreaCode(\Magento\Framework\App\Area::AREA_ADMINHTML);
-                $sessionConfig = $objectManager->get(\Magento\Backend\Model\Session\AdminConfig::class);
-                /** @var \Magento\Backend\Model\Url $backendUrl */
-                $backendUrl = $objectManager->get(\Magento\Backend\Model\Url::class);
-                $urlPath = parse_url($backendUrl->getBaseUrl(), PHP_URL_PATH);
-                $cookiePath = $urlPath . 'setup';
-                $sessionConfig->setCookiePath($cookiePath);
                 /* @var \Magento\Backend\Model\Auth\Session $session */
-                $session = $objectManager->create(
-                    \Magento\Backend\Model\Auth\Session::class,
-                    [
-                        'sessionConfig' => $sessionConfig,
-                        'appState' => $adminAppState
-                    ]
-                );
+                $session = $objectManager->get(\Magento\Backend\Model\Auth\Session::class);
+                // check if session was already set in \Magento\Setup\Mvc\Bootstrap\InitParamListener::authPreDispatch
+                if (!$session->isSessionExists()) {
+                    /** @var \Magento\Framework\App\State $adminAppState */
+                    $adminAppState = $objectManager->get(\Magento\Framework\App\State::class);
+                    $adminAppState->setAreaCode(\Magento\Framework\App\Area::AREA_ADMINHTML);
+                    $sessionConfig = $objectManager->get(\Magento\Backend\Model\Session\AdminConfig::class);
+                    /** @var \Magento\Backend\Model\Url $backendUrl */
+                    $backendUrl = $objectManager->get(\Magento\Backend\Model\Url::class);
+                    $urlPath = parse_url($backendUrl->getBaseUrl(), PHP_URL_PATH);
+                    $cookiePath = $urlPath . 'setup';
+                    $sessionConfig->setCookiePath($cookiePath);
+                    /* @var \Magento\Backend\Model\Auth\Session $session */
+                    $session = $objectManager->create(
+                        \Magento\Backend\Model\Auth\Session::class,
+                        [
+                            'sessionConfig' => $sessionConfig,
+                            'appState' => $adminAppState
+                        ]
+                    );
+                }
                 $session->prolong();
                 return new \Zend\View\Model\JsonModel(['success' => true]);
             }

setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php

@@ -48,6 +48,12 @@ public function testUnloginAction()
             $this->createPartialMock(\Magento\Framework\App\DeploymentConfig::class, ['isAvailable']);
         $deployConfigMock->expects($this->once())->method('isAvailable')->will($this->returnValue(true));
 
+        $sessionMock = $this->createPartialMock(
+            \Magento\Backend\Model\Auth\Session::class,
+            ['prolong', 'isSessionExists']
+        );
+        $sessionMock->expects($this->once())->method('isSessionExists')->will($this->returnValue(false));
+
         $stateMock = $this->createPartialMock(\Magento\Framework\App\State::class, ['setAreaCode']);
         $stateMock->expects($this->once())->method('setAreaCode');
 
@@ -57,6 +63,7 @@ public function testUnloginAction()
         $urlMock = $this->createMock(\Magento\Backend\Model\Url::class);
 
         $returnValueMap = [
+            [\Magento\Backend\Model\Auth\Session::class, $sessionMock],
             [\Magento\Framework\App\State::class, $stateMock],
             [\Magento\Backend\Model\Session\AdminConfig::class, $sessionConfigMock],
             [\Magento\Backend\Model\Url::class, $urlMock]
@@ -68,7 +75,6 @@ public function testUnloginAction()
             ->method('get')
             ->will($this->returnValueMap($returnValueMap));
 
-        $sessionMock = $this->createPartialMock(\Magento\Backend\Model\Auth\Session::class, ['prolong']);
         $this->objectManager->expects($this->once())
             ->method('create')
             ->will($this->returnValue($sessionMock));
@@ -87,4 +93,29 @@ public function testIndexAction()
         $viewModel = $controller->unloginAction();
         $this->assertInstanceOf(\Zend\View\Model\ViewModel::class, $viewModel);
     }
+
+    /**
+     * @covers \Magento\Setup\Controller\SystemConfig::prolongAction
+     */
+    public function testProlongActionWithExistingSession()
+    {
+        $this->objectManagerProvider->expects($this->once())->method('get')->will(
+            $this->returnValue($this->objectManager)
+        );
+        $deployConfigMock =
+            $this->createPartialMock(\Magento\Framework\App\DeploymentConfig::class, ['isAvailable']);
+        $deployConfigMock->expects($this->once())->method('isAvailable')->will($this->returnValue(true));
+        $sessionMock = $this->createPartialMock(
+            \Magento\Backend\Model\Auth\Session::class,
+            ['prolong', 'isSessionExists']
+        );
+        $sessionMock->expects($this->once())->method('isSessionExists')->will($this->returnValue(true));
+
+        $this->serviceManager->expects($this->once())->method('get')->will($this->returnValue($deployConfigMock));
+        $this->objectManager->expects($this->once())
+            ->method('get')
+            ->will($this->returnValue($sessionMock));
+        $controller = new Session($this->serviceManager, $this->objectManagerProvider);
+        $this->assertEquals(new \Zend\View\Model\JsonModel(['success' => true]), $controller->prolongAction());
+    }
 }