MAGETWO-52593: Minicart does not clean when customer session is over

Oleksandr Karpenko · Oleksandr Karpenko · commit 7e4c607d45fe · 2016-05-27T17:19:43.000+03:00
diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php
@@ -42,6 +42,16 @@ class LoginPost extends \Magento\Customer\Controller\AbstractAccount
      */
     private $scopeConfig;
 
+    /**
+     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
+     */
+    private $cookieMetadataFactory;
+
+    /**
+     * @var \Magento\Framework\Stdlib\Cookie\PhpCookieManager
+     */
+    private $cookieMetadataManager;
+
     /**
      * @param Context $context
      * @param Session $customerSession
@@ -76,13 +86,45 @@ private function getScopeConfig()
     {
         if (!($this->scopeConfig instanceof \Magento\Framework\App\Config\ScopeConfigInterface)) {
             return \Magento\Framework\App\ObjectManager::getInstance()->get(
-                'Magento\Framework\App\Config\ScopeConfigInterface'
+                \Magento\Framework\App\Config\ScopeConfigInterface::class
             );
         } else {
             return $this->scopeConfig;
         }
     }
 
+    /**
+     * Retrieve cookie manager
+     *
+     * @deprecated
+     * @return \Magento\Framework\Stdlib\Cookie\PhpCookieManager
+     */
+    private function getCookieManager()
+    {
+        if (!$this->cookieMetadataManager) {
+            $this->cookieMetadataManager = \Magento\Framework\App\ObjectManager::getInstance()->get(
+                \Magento\Framework\Stdlib\Cookie\PhpCookieManager::class
+            );
+        }
+        return $this->cookieMetadataManager;
+    }
+
+    /**
+     * Retrieve cookie metadata factory
+     *
+     * @deprecated
+     * @return \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
+     */
+    private function getCookieMetadataFactory()
+    {
+        if (!$this->cookieMetadataFactory) {
+            $this->cookieMetadataFactory = \Magento\Framework\App\ObjectManager::getInstance()->get(
+                \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory::class
+            );
+        }
+        return $this->cookieMetadataFactory;
+    }
+
     /**
      * Login post action
      *
@@ -105,6 +147,11 @@ public function execute()
                     $customer = $this->customerAccountManagement->authenticate($login['username'], $login['password']);
                     $this->session->setCustomerDataAsLoggedIn($customer);
                     $this->session->regenerateId();
+                    if ($this->getCookieManager()->getCookie('mage-cache-sessid')) {
+                        $metadata = $this->getCookieMetadataFactory()->createCookieMetadata();
+                        $metadata->setPath('/');
+                        $this->getCookieManager()->deleteCookie('mage-cache-sessid', $metadata);
+                    }
                     $redirectUrl = $this->accountRedirect->getRedirectCookie();
                     if (!$this->getScopeConfig()->getValue('customer/startup/redirect_dashboard') && $redirectUrl) {
                         $this->accountRedirect->clearRedirectCookie();
diff --git a/app/code/Magento/Customer/Controller/Account/Logout.php b/app/code/Magento/Customer/Controller/Account/Logout.php
@@ -8,6 +8,9 @@
 
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
+use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
 
 class Logout extends \Magento\Customer\Controller\AbstractAccount
 {
@@ -16,6 +19,16 @@ class Logout extends \Magento\Customer\Controller\AbstractAccount
      */
     protected $session;
 
+    /**
+     * @var CookieMetadataFactory
+     */
+    private $cookieMetadataFactory;
+
+    /**
+     * @var PhpCookieManager
+     */
+    private $cookieMetadataManager;
+
     /**
      * @param Context $context
      * @param Session $customerSession
@@ -28,6 +41,34 @@ public function __construct(
         parent::__construct($context);
     }
 
+    /**
+     * Retrieve cookie manager
+     *
+     * @deprecated
+     * @return PhpCookieManager
+     */
+    private function getCookieManager()
+    {
+        if (!$this->cookieMetadataManager) {
+            $this->cookieMetadataManager = ObjectManager::getInstance()->get(PhpCookieManager::class);
+        }
+        return $this->cookieMetadataManager;
+    }
+
+    /**
+     * Retrieve cookie metadata factory
+     *
+     * @deprecated
+     * @return CookieMetadataFactory
+     */
+    private function getCookieMetadataFactory()
+    {
+        if (!$this->cookieMetadataFactory) {
+            $this->cookieMetadataFactory = ObjectManager::getInstance()->get(CookieMetadataFactory::class);
+        }
+        return $this->cookieMetadataFactory;
+    }
+
     /**
      * Customer logout action
      *
@@ -38,6 +79,11 @@ public function execute()
         $lastCustomerId = $this->session->getId();
         $this->session->logout()->setBeforeAuthUrl($this->_redirect->getRefererUrl())
             ->setLastCustomerId($lastCustomerId);
+        if ($this->getCookieManager()->getCookie('mage-cache-sessid')) {
+            $metadata = $this->getCookieMetadataFactory()->createCookieMetadata();
+            $metadata->setPath('/');
+            $this->getCookieManager()->deleteCookie('mage-cache-sessid', $metadata);
+        }
 
         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
diff --git a/app/code/Magento/Customer/CustomerData/Plugin/SessionChecker.php b/app/code/Magento/Customer/CustomerData/Plugin/SessionChecker.php
@@ -5,8 +5,7 @@
  */
 namespace Magento\Customer\CustomerData\Plugin;
 
-use Magento\Customer\Model\Session;
-use Magento\Framework\App\Response\Http;
+use \Magento\Framework\Session\SessionManager;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
 
@@ -22,36 +21,28 @@ class SessionChecker
      */
     private $cookieMetadataFactory;
 
-    /**
-     * @var Session
-     */
-    private $session;
-
     /**
      * @param PhpCookieManager $cookieManager
      * @param CookieMetadataFactory $cookieMetadataFactory
-     * @param Session $session
      */
     public function __construct(
         PhpCookieManager $cookieManager,
-        CookieMetadataFactory $cookieMetadataFactory,
-        Session $session
+        CookieMetadataFactory $cookieMetadataFactory
     ) {
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
-        $this->session = $session;
     }
 
     /**
      * Delete frontend session cookie if customer session is expired
      *
-     * @param Http $response
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @return void
+     * @param SessionManager $sessionManager
      */
-    public function beforeSendVary(Http $response)
+    public function beforeStart(SessionManager $sessionManager)
     {
-        if (!$this->session->isLoggedIn()) {
+        if (!$this->cookieManager->getCookie($sessionManager->getName())
+            && $this->cookieManager->getCookie('mage-cache-sessid')
+        ) {
             $metadata = $this->cookieMetadataFactory->createCookieMetadata();
             $metadata->setPath('/');
             $this->cookieManager->deleteCookie('mage-cache-sessid', $metadata);
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php
@@ -299,6 +299,18 @@ public function testExecuteSuccessCustomRedirect()
             ->method('getRedirect')
             ->willReturn($this->resultRedirect);
 
+        $cookieMetadataManager = $this->getMockBuilder(\Magento\Framework\Stdlib\Cookie\PhpCookieManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cookieMetadataManager->expects($this->once())
+            ->method('getCookie')
+            ->with('mage-cache-sessid')
+            ->willReturn(false);
+        $refClass = new \ReflectionClass(LoginPost::class);
+        $refProperty = $refClass->getProperty('cookieMetadataManager');
+        $refProperty->setAccessible(true);
+        $refProperty->setValue($this->controller, $cookieMetadataManager);
+
         $this->assertSame($this->resultRedirect, $this->controller->execute());
     }
 
@@ -352,6 +364,38 @@ public function testExecuteSuccess()
             ->method('getRedirect')
             ->willReturn($this->resultRedirect);
 
+        $cookieMetadataManager = $this->getMockBuilder(\Magento\Framework\Stdlib\Cookie\PhpCookieManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cookieMetadataManager->expects($this->once())
+            ->method('getCookie')
+            ->with('mage-cache-sessid')
+            ->willReturn(true);
+        $cookieMetadataFactory = $this->getMockBuilder(\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cookieMetadata = $this->getMockBuilder(\Magento\Framework\Stdlib\Cookie\CookieMetadata::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cookieMetadataFactory->expects($this->once())
+            ->method('createCookieMetadata')
+            ->willReturn($cookieMetadata);
+        $cookieMetadata->expects($this->once())
+            ->method('setPath')
+            ->with('/');
+        $cookieMetadataManager->expects($this->once())
+            ->method('deleteCookie')
+            ->with('mage-cache-sessid', $cookieMetadata);
+
+        $refClass = new \ReflectionClass(LoginPost::class);
+        $cookieMetadataManagerProperty = $refClass->getProperty('cookieMetadataManager');
+        $cookieMetadataManagerProperty->setAccessible(true);
+        $cookieMetadataManagerProperty->setValue($this->controller, $cookieMetadataManager);
+
+        $cookieMetadataFactoryProperty = $refClass->getProperty('cookieMetadataFactory');
+        $cookieMetadataFactoryProperty->setAccessible(true);
+        $cookieMetadataFactoryProperty->setValue($this->controller, $cookieMetadataFactory);
+
         $this->assertSame($this->resultRedirect, $this->controller->execute());
     }
 
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/LogoutTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/LogoutTest.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Test\Unit\Controller\Account;
+
+use Magento\Customer\Controller\Account\Logout;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\Result\RedirectFactory;
+use Magento\Framework\Stdlib\Cookie\CookieMetadata;
+use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
+use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
+
+class LogoutTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var Logout */
+    protected $controller;
+
+    /** @var \Magento\Framework\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject */
+    protected $contextMock;
+
+    /** @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
+    protected $sessionMock;
+
+    /** @var CookieMetadataFactory|\PHPUnit_Framework_MockObject_MockObject */
+    protected $cookieMetadataFactory;
+
+    /** @var PhpCookieManager|\PHPUnit_Framework_MockObject_MockObject */
+    protected $cookieManager;
+
+    /** @var CookieMetadata|\PHPUnit_Framework_MockObject_MockObject */
+    protected $cookieMetadata;
+
+    /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject */
+    protected $resultRedirect;
+
+    /** @var RedirectFactory|\PHPUnit_Framework_MockObject_MockObject */
+    protected $redirectFactory;
+
+    /** @var RedirectInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $redirect;
+
+    protected function setUp()
+    {
+        $this->contextMock = $this->getMockBuilder('Magento\Framework\App\Action\Context')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->sessionMock = $this->getMockBuilder('Magento\Customer\Model\Session')
+            ->disableOriginalConstructor()
+            ->setMethods(['getId', 'logout', 'setBeforeAuthUrl', 'setLastCustomerId'])
+            ->getMock();
+
+        $this->cookieMetadataFactory = $this->getMockBuilder(CookieMetadataFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->cookieManager = $this->getMockBuilder(PhpCookieManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->cookieMetadata = $this->getMockBuilder(CookieMetadata::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->redirectFactory = $this->getMockBuilder(RedirectFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resultRedirect = $this->getMockBuilder(Redirect::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->contextMock->expects($this->once())
+            ->method('getResultRedirectFactory')
+            ->willReturn($this->redirectFactory);
+
+        $this->redirect = $this->getMockBuilder(RedirectInterface::class)
+            ->getMockForAbstractClass();
+        $this->contextMock->expects($this->once())
+            ->method('getRedirect')
+            ->willReturn($this->redirect);
+
+        $this->controller = new Logout($this->contextMock, $this->sessionMock);
+
+        $refClass = new \ReflectionClass(Logout::class);
+        $cookieMetadataManagerProperty = $refClass->getProperty('cookieMetadataManager');
+        $cookieMetadataManagerProperty->setAccessible(true);
+        $cookieMetadataManagerProperty->setValue($this->controller, $this->cookieManager);
+
+        $cookieMetadataFactoryProperty = $refClass->getProperty('cookieMetadataFactory');
+        $cookieMetadataFactoryProperty->setAccessible(true);
+        $cookieMetadataFactoryProperty->setValue($this->controller, $this->cookieMetadataFactory);
+
+
+    }
+
+    public function testExecute()
+    {
+        $customerId = 1;
+        $refererUrl = 'http://referer.url';
+
+        $this->sessionMock->expects($this->once())
+            ->method('getId')
+            ->willReturn($customerId);
+        $this->sessionMock->expects($this->once())
+            ->method('logout')
+            ->willReturnSelf();
+        $this->redirect->expects($this->once())
+            ->method('getRefererUrl')
+            ->willReturn($refererUrl);
+        $this->sessionMock->expects($this->once())
+            ->method('setBeforeAuthUrl')
+            ->with($refererUrl)
+            ->willReturnSelf();
+        $this->sessionMock->expects($this->once())
+            ->method('setLastCustomerId')
+            ->with($customerId);
+
+        $this->cookieManager->expects($this->once())
+            ->method('getCookie')
+            ->with('mage-cache-sessid')
+            ->willReturn(true);
+        $this->cookieMetadataFactory->expects($this->once())
+            ->method('createCookieMetadata')
+            ->willReturn($this->cookieMetadata);
+        $this->cookieMetadata->expects($this->once())
+            ->method('setPath')
+            ->with('/');
+        $this->cookieManager->expects($this->once())
+            ->method('deleteCookie')
+            ->with('mage-cache-sessid', $this->cookieMetadata);
+        $this->redirectFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($this->resultRedirect);
+        $this->resultRedirect->expects($this->once())
+            ->method('setPath')
+            ->with('*/*/logoutSuccess');
+        $this->assertSame($this->resultRedirect, $this->controller->execute());
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/CustomerData/Plugin/SessionCheckerTest.php b/app/code/Magento/Customer/Test/Unit/CustomerData/Plugin/SessionCheckerTest.php
diff --git a/app/code/Magento/Customer/etc/frontend/di.xml b/app/code/Magento/Customer/etc/frontend/di.xml
