Merge remote-tracking branch 'origin/MAGETWO-70638' into 2.3-develop-pr1

Author: zakdma

dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php

@@ -9,6 +9,8 @@
 }
 
 namespace Magento\Framework\Session {
+
+    use Magento\Framework\App\State;
     // @codingStandardsIgnoreEnd
 
     /**
@@ -59,6 +61,16 @@ class SessionManagerTest extends \PHPUnit\Framework\TestCase
          */
         protected $objectManager;
 
+        /**
+         * @var \Magento\Framework\App\RequestInterface
+         */
+        private $request;
+
+        /**
+         * @var State|\PHPUnit_Framework_MockObject_MockObject
+         */
+        private $appState;
+
         protected function setUp()
         {
             $this->sessionName = 'frontEndSession';
@@ -69,7 +81,18 @@ protected function setUp()
             $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
             /** @var \Magento\Framework\Session\SidResolverInterface $sidResolver */
-            $this->_sidResolver = $this->objectManager->get(\Magento\Framework\Session\SidResolverInterface::class);
+            $this->appState = $this->getMockBuilder(State::class)
+                ->setMethods(['getAreaCode'])
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            /** @var \Magento\Framework\Session\SidResolver $sidResolver */
+            $this->_sidResolver = $this->objectManager->create(
+                \Magento\Framework\Session\SidResolver::class,
+                [
+                    'appState' => $this->appState,
+                ]
+            );
 
             $this->request = $this->objectManager->get(\Magento\Framework\App\RequestInterface::class);
 
@@ -144,6 +167,9 @@ public function testDestroy()
         public function testSetSessionId()
         {
             $sessionId = $this->_model->getSessionId();
+            $this->appState->expects($this->atLeastOnce())
+                ->method('getAreaCode')
+                ->willReturn(\Magento\Framework\App\Area::AREA_FRONTEND);
             $this->_model->setSessionId($this->_sidResolver->getSid($this->_model));
             $this->assertEquals($sessionId, $this->_model->getSessionId());
 
@@ -156,6 +182,9 @@ public function testSetSessionId()
          */
         public function testSetSessionIdFromParam()
         {
+            $this->appState->expects($this->atLeastOnce())
+                ->method('getAreaCode')
+                ->willReturn(\Magento\Framework\App\Area::AREA_FRONTEND);
             $this->assertNotEquals('test_id', $this->_model->getSessionId());
             $this->request->getQuery()->set($this->_sidResolver->getSessionIdQueryParam($this->_model), 'test-id');
             $this->_model->setSessionId($this->_sidResolver->getSid($this->_model));

dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\Session;
 
+use Magento\Framework\App\State;
 use Zend\Stdlib\Parameters;
 
 class SidResolverTest extends \PHPUnit\Framework\TestCase
@@ -49,6 +50,11 @@ class SidResolverTest extends \PHPUnit\Framework\TestCase
      */
     protected $request;
 
+    /**
+     * @var State|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $appState;
+
     protected function setUp()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -70,13 +76,19 @@ protected function setUp()
 
         $this->request = $objectManager->get(\Magento\Framework\App\RequestInterface::class);
 
+        $this->appState = $this->getMockBuilder(State::class)
+            ->setMethods(['getAreaCode'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->model = $objectManager->create(
             \Magento\Framework\Session\SidResolver::class,
             [
                 'scopeConfig' => $this->scopeConfig,
                 'urlBuilder' => $this->urlBuilder,
                 'sidNameMap' => [$this->customSessionName => $this->customSessionQueryParam],
                 'request' => $this->request,
+                'appState' => $this->appState,
             ]
         );
     }
@@ -95,6 +107,10 @@ public function tearDown()
      */
     public function testGetSid($sid, $useFrontedSid, $isOwnOriginUrl, $testSid)
     {
+        $this->appState->expects($this->atLeastOnce())
+            ->method('getAreaCode')
+            ->willReturn(\Magento\Framework\App\Area::AREA_FRONTEND);
+
         $this->scopeConfig->expects(
             $this->any()
         )->method(

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

@@ -7,6 +7,8 @@
  */
 namespace Magento\Framework\Session;
 
+use Magento\Framework\App\State;
+
 class SidResolver implements SidResolverInterface
 {
     /**
@@ -54,34 +56,47 @@ class SidResolver implements SidResolverInterface
      */
     protected $_scopeType;
 
+    /**
+     * @var State
+     */
+    private $appState;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Framework\App\RequestInterface $request
      * @param string $scopeType
      * @param array $sidNameMap
+     * @param State|null $appState
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Framework\App\RequestInterface $request,
         $scopeType,
-        array $sidNameMap = []
+        array $sidNameMap = [],
+        State $appState = null
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->urlBuilder = $urlBuilder;
         $this->request = $request;
         $this->sidNameMap = $sidNameMap;
         $this->_scopeType = $scopeType;
+        $this->appState = $appState ?: \Magento\Framework\App\ObjectManager::getInstance()->get(State::class);
     }
 
     /**
      * @param SessionManagerInterface $session
-     * @return string
+     * @return string|null
      */
     public function getSid(SessionManagerInterface $session)
     {
+        if ($this->appState->getAreaCode() !== \Magento\Framework\App\Area::AREA_FRONTEND) {
+            return null;
+        }
+
         $sidKey = null;
+
         $useSidOnFrontend = $this->getUseSessionInUrl();
         if ($useSidOnFrontend && $this->request->getQuery(
             $this->getSessionIdQueryParam($session),

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

@@ -22,7 +22,7 @@ interface SidResolverInterface
      * Get SID
      *
      * @param \Magento\Framework\Session\SessionManagerInterface $session
-     * @return string
+     * @return string|null
      */
     public function getSid(\Magento\Framework\Session\SessionManagerInterface $session);