Merge pull request #1153 from magento-troll/MAGETWO-65236

[Troll] MAGETWO-65236: Expiration date of PHPSESSID cookie is not updated

Author: kandy

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

@@ -7,6 +7,8 @@
 
 /**
  * @magentoAppArea adminhtml
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation enabled
  */
 class SessionTest extends \PHPUnit_Framework_TestCase
 {
@@ -34,6 +36,7 @@ protected function setUp()
         $this->auth = $this->objectManager->create(\Magento\Backend\Model\Auth::class);
         $this->authSession = $this->objectManager->create(\Magento\Backend\Model\Auth\Session::class);
         $this->auth->setAuthStorage($this->authSession);
+        $this->auth->logout();
     }
 
     protected function tearDown()

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

@@ -188,6 +188,7 @@ public function start()
             $this->setSessionId($this->sidResolver->getSid($this));
             session_start();
             $this->validator->validate($this);
+            $this->renewCookie();
 
             register_shutdown_function([$this, 'writeClose']);
 
@@ -198,6 +199,35 @@ public function start()
         return $this;
     }
 
+    /**
+     * Renew session cookie to prolong session
+     *
+     * @return $this
+     */
+    private function renewCookie()
+    {
+        if (!$this->getCookieLifetime()) {
+            return $this;
+        }
+        $cookieValue = $this->cookieManager->getCookie($this->getName());
+        if ($cookieValue) {
+            $metadata = $this->cookieMetadataFactory->createPublicCookieMetadata();
+            $metadata->setPath($this->sessionConfig->getCookiePath());
+            $metadata->setDomain($this->sessionConfig->getCookieDomain());
+            $metadata->setDuration($this->sessionConfig->getCookieLifetime());
+            $metadata->setSecure($this->sessionConfig->getCookieSecure());
+            $metadata->setHttpOnly($this->sessionConfig->getCookieHttpOnly());
+
+            $this->cookieManager->setPublicCookie(
+                $this->getName(),
+                $cookieValue,
+                $metadata
+            );
+        }
+
+        return $this;
+    }
+
     /**
      * Register save handler
      *