Merge remote-tracking branch 'origin/MAGETWO-52593' into BUGS

Author: slavvka

app/code/Magento/Customer/CustomerData/Plugin/SessionChecker.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\CustomerData\Plugin;
+
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Response\Http;
+use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
+use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
+
+class SessionChecker
+{
+    /**
+     * @var PhpCookieManager
+     */
+    private $cookieManager;
+
+    /**
+     * @var CookieMetadataFactory
+     */
+    private $cookieMetadataFactory;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @param PhpCookieManager $cookieManager
+     * @param CookieMetadataFactory $cookieMetadataFactory
+     * @param Session $session
+     */
+    public function __construct(
+        PhpCookieManager $cookieManager,
+        CookieMetadataFactory $cookieMetadataFactory,
+        Session $session
+    ) {
+        $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
+     */
+    public function beforeSendVary(Http $response)
+    {
+        if (!$this->session->isLoggedIn()) {
+            $metadata = $this->cookieMetadataFactory->createCookieMetadata();
+            $metadata->setPath('/');
+            $this->cookieManager->deleteCookie('mage-cache-sessid', $metadata);
+        }
+    }
+}

app/code/Magento/Customer/Test/Unit/CustomerData/Plugin/SessionCheckerTest.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Test\Unit\CustomerData\Plugin;
+
+use Magento\Customer\CustomerData\Plugin\SessionChecker;
+
+class SessionCheckerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var SessionChecker
+     */
+    protected $plugin;
+
+    /**
+     * @var \Magento\Framework\Stdlib\Cookie\PhpCookieManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $cookieManager;
+
+    /**
+     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $metadataFactory;
+
+    /**
+     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadata|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $metadata;
+
+    /**
+     * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $session;
+
+    /**
+     * @var \Magento\Framework\App\Response\Http|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $response;
+
+    public function setUp()
+    {
+        $this->cookieManager = $this->getMockBuilder('Magento\Framework\Stdlib\Cookie\PhpCookieManager')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->metadataFactory = $this->getMockBuilder('Magento\Framework\Stdlib\Cookie\CookieMetadataFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->metadata = $this->getMockBuilder('Magento\Framework\Stdlib\Cookie\CookieMetadata')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->session = $this->getMockBuilder('Magento\Customer\Model\Session')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->response = $this->getMockBuilder('Magento\Framework\App\Response\Http')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->plugin = new SessionChecker($this->cookieManager, $this->metadataFactory, $this->session);
+    }
+
+    /**
+     * @param bool $result
+     * @param string $callCount
+     * @return void
+     * @dataProvider testAfterIsLoggedInDataProvider
+     */
+    public function testBeforeSendVary($result, $callCount)
+    {
+        $this->session->expects($this->once())
+            ->method('isLoggedIn')
+            ->willReturn($result);
+
+        $this->metadataFactory->expects($this->{$callCount}())
+            ->method('createCookieMetadata')
+            ->willReturn($this->metadata);
+        $this->metadata->expects($this->{$callCount}())
+            ->method('setPath')
+            ->with('/');
+        $this->cookieManager->expects($this->{$callCount}())
+            ->method('deleteCookie')
+            ->with('mage-cache-sessid', $this->metadata);
+        $this->plugin->beforeSendVary($this->response);
+    }
+
+    public function testAfterIsLoggedInDataProvider()
+    {
+        return [
+            [false, 'once'],
+            [true, 'never']
+        ];
+    }
+}

app/code/Magento/Customer/etc/frontend/di.xml

@@ -57,4 +57,7 @@
     <type name="Magento\Checkout\Block\Cart\Sidebar">
         <plugin name="customer_cart" type="\Magento\Customer\Model\Cart\ConfigPlugin" />
     </type>
+    <type name="Magento\Framework\App\Response\Http">
+        <plugin name="session_checker" type="Magento\Customer\CustomerData\Plugin\SessionChecker" />
+    </type>
 </config>