MAGETWO-51068: Admin User session expired despite Session Lifetime

Renaming constant

Author: Igor Melnikov

lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php

@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\Session\SaveHandler\Redis;
 
-use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\App\State;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\State;
 
 /**
  * Redis session save handler
@@ -111,9 +111,9 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
     const XML_PATH_ADMIN_SESSION_LIFETIME = 'admin/security/session_lifetime';
 
     /**
-     * Max admin session lifetime
+     * Session max lifetime
      */
-    const ADMIN_SESSION_MAX_LIFETIME = 31536000;
+    const SESSION_MAX_LIFETIME = 31536000;
 
     /**
      * Deployment config
@@ -227,7 +227,7 @@ public function getMaxConcurrency()
      */
     public function getMaxLifetime()
     {
-        return self::ADMIN_SESSION_MAX_LIFETIME;
+        return self::SESSION_MAX_LIFETIME;
     }
 
     /**

lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/ConfigTest.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\Session\Test\Unit\SaveHandler\Redis;
 
+use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\Session\SaveHandler\Redis\Config;
 
 class ConfigTest extends \PHPUnit_Framework_TestCase
@@ -25,7 +26,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     private $scopeConfigMock;
 
     /**
-     * @var \Magento\Framework\Session\SaveHandler\Redis\Config
+     * @var Config
      */
     private $config;
 
@@ -37,7 +38,7 @@ public function setUp()
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->config = $objectManager->getObject(
-            \Magento\Framework\Session\SaveHandler\Redis\Config::class,
+            Config::class,
             [
                 'deploymentConfig' => $this->deploymentConfigMock,
                 'appState' => $this->appStateMock,
@@ -148,8 +149,7 @@ public function testGetMaxConcurrency()
 
     public function testGetMaxLifetime()
     {
-        $expected = 31536000;
-        $this->assertEquals($this->config->getMaxLifetime(), $expected);
+        $this->assertEquals($this->config->getMaxLifetime(), Config::SESSION_MAX_LIFETIME);
     }
 
     public function testGetMinLifetime()
@@ -225,7 +225,7 @@ public function testGetLifetimeAdmin()
             ->willReturn($areaCode);
         $this->scopeConfigMock->expects($this->once())
             ->method('getValue')
-            ->with(\Magento\Framework\Session\SaveHandler\Redis\Config::XML_PATH_ADMIN_SESSION_LIFETIME)
+            ->with(Config::XML_PATH_ADMIN_SESSION_LIFETIME)
             ->willReturn($expectedLifetime);
         $this->assertEquals($this->config->getLifetime(), $expectedLifetime);
     }
@@ -240,8 +240,8 @@ public function testGetLifetimeFrontend()
         $this->scopeConfigMock->expects($this->once())
             ->method('getValue')
             ->with(
-                \Magento\Framework\Session\SaveHandler\Redis\Config::XML_PATH_COOKIE_LIFETIME,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                Config::XML_PATH_COOKIE_LIFETIME,
+                ScopeInterface::SCOPE_STORE
             )
             ->willReturn($expectedLifetime);
         $this->assertEquals($this->config->getLifetime(), $expectedLifetime);