From 38720ea0920622b8b66e2b576ea7d630ff9294c1 Mon Sep 17 00:00:00 2001
From: Roman Strilenko <strell@strelldev.com>
Date: Fri, 15 Dec 2017 14:22:12 +0100
Subject: [PATCH] #9453 - ported down c2e5d77a9516c8305585e819c2f0a0629648cc14 
 - MAGETWO-70322: [2.1.x][GitHub] SID in URL even if disabled #9453

---
 .../Framework/Session/SidResolverTest.php     | 41 +++++++++++++++++--
 .../Magento/Framework/Session/SidResolver.php | 20 +++++----
 2 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
index 5af3e52420f11..2cfb8b47da7c3 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
@@ -112,6 +112,7 @@ public function testGetSid($sid, $useFrontedSid, $isOwnOriginUrl, $testSid)
             $this->request->getQuery()->set($this->model->getSessionIdQueryParam($this->session), $testSid);
         }
         $this->assertEquals($sid, $this->model->getSid($this->session));
+        $this->assertEquals($useFrontedSid, $this->model->getUseSessionInUrl());
     }
 
     /**
@@ -150,10 +151,42 @@ public function testSetGetUseSessionVar()
         $this->assertTrue($this->model->getUseSessionVar());
     }
 
-    public function testSetGetUseSessionInUrl()
+    /**
+     * Variations of Use SID on frontend value.
+     *
+     * @return array
+     */
+    public function dataProviderSessionInUrl()
+    {
+        return [
+            [true],
+            [false],
+        ];
+    }
+
+    /**
+     * Testing "Use SID in URLs" flag.
+     * Checking that the method returns config value if not explicitly
+     * overridden.
+     *
+     * @param bool $configValue Use SID on frontend config value.
+     * @dataProvider dataProviderSessionInUrl
+     */
+    public function testSetGetUseSessionInUrl($configValue)
     {
-        $this->assertTrue($this->model->getUseSessionInUrl());
-        $this->model->setUseSessionInUrl(false);
-        $this->assertFalse($this->model->getUseSessionInUrl());
+        $this->scopeConfig->expects(
+            $this->any()
+        )->method(
+            'getValue'
+        )->with(
+            \Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        )->will(
+            $this->returnValue($configValue)
+        );
+
+        $this->assertEquals($configValue, $this->model->getUseSessionInUrl());
+        $this->model->setUseSessionInUrl(!$configValue);
+        $this->assertEquals(!$configValue, $this->model->getUseSessionInUrl());
     }
 }
diff --git a/lib/internal/Magento/Framework/Session/SidResolver.php b/lib/internal/Magento/Framework/Session/SidResolver.php
index 40d985614a3c6..18f6138b661bf 100644
--- a/lib/internal/Magento/Framework/Session/SidResolver.php
+++ b/lib/internal/Magento/Framework/Session/SidResolver.php
@@ -44,10 +44,10 @@ class SidResolver implements SidResolverInterface
     /**
      * Use session in URL flag
      *
-     * @var bool
+     * @var bool|null
      * @see \Magento\Framework\UrlInterface
      */
-    protected $_useSessionInUrl = true;
+    protected $_useSessionInUrl;
 
     /**
      * @var string
@@ -82,10 +82,7 @@ public function __construct(
     public function getSid(SessionManagerInterface $session)
     {
         $sidKey = null;
-        $useSidOnFrontend = $this->scopeConfig->getValue(
-            self::XML_PATH_USE_FRONTEND_SID,
-            $this->_scopeType
-        );
+        $useSidOnFrontend = $this->getUseSessionInUrl();
         if ($useSidOnFrontend && $this->request->getQuery(
             $this->getSessionIdQueryParam($session),
             false
@@ -147,13 +144,22 @@ public function setUseSessionInUrl($flag = true)
     }
 
     /**
-     * Retrieve use session in URL flag
+     * Retrieve use session in URL flag.
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
     public function getUseSessionInUrl()
     {
+        if ($this->_useSessionInUrl === null) {
+            //Using config value by default, can be overridden by using the
+            //setter.
+            $this->_useSessionInUrl = (bool)$this->scopeConfig->getValue(
+                self::XML_PATH_USE_FRONTEND_SID,
+                $this->_scopeType
+            );
+        }
+
         return $this->_useSessionInUrl;
     }
 }