Merge pull request #76 from magento-south/BUGS

[South] Bugfixes

app/code/Magento/Backend/etc/adminhtml/di.xml

@@ -133,4 +133,9 @@
         </arguments>
     </type>
     <preference for="Magento\Framework\App\Router\PathConfigInterface" type="Magento\Backend\Model\AdminPathConfig" />
+    <type name="Magento\Framework\View\Page\Config">
+        <arguments>
+            <argument name="isIncludesAvailable" xsi:type="boolean">false</argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/Customer/Controller/Account/CreatePost.php

@@ -82,6 +82,16 @@ class CreatePost extends \Magento\Customer\Controller\AbstractAccount
      */
     private $accountRedirect;
 
+    /**
+     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
+     */
+    private $cookieMetadataFactory;
+
+    /**
+     * @var \Magento\Framework\Stdlib\Cookie\PhpCookieManager
+     */
+    private $cookieMetadataManager;
+
     /**
      * @param Context $context
      * @param Session $customerSession
@@ -144,6 +154,38 @@ public function __construct(
         parent::__construct($context);
     }
 
+    /**
+     * 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;
+    }
+
     /**
      * Add address to customer during create account
      *
@@ -267,6 +309,12 @@ public function execute()
                 }
                 $resultRedirect = $this->accountRedirect->getRedirect();
             }
+            if ($this->getCookieManager()->getCookie('mage-cache-sessid')) {
+                $metadata = $this->getCookieMetadataFactory()->createCookieMetadata();
+                $metadata->setPath('/');
+                $this->getCookieManager()->deleteCookie('mage-cache-sessid', $metadata);
+            }
+
             return $resultRedirect;
         } catch (StateException $e) {
             $url = $this->urlModel->getUrl('customer/account/forgotpassword');

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();

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();

app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php

@@ -77,16 +77,14 @@ public function execute()
             $id = $this->getRequest()->getParam('id');
             $resultRedirect = $this->resultRedirectFactory->create();
             try {
+                $customerGroupCode = (string)$this->getRequest()->getParam('code');
                 if ($id !== null) {
                     $customerGroup = $this->groupRepository->getById((int)$id);
+                    $customerGroupCode = $customerGroupCode ?: $customerGroup->getCode();
                 } else {
                     $customerGroup = $this->groupDataFactory->create();
                 }
-                $customerGroupCode = (string)$this->getRequest()->getParam('code');
-                if (empty($customerGroupCode)) {
-                    $customerGroupCode = null;
-                }
-                $customerGroup->setCode($customerGroupCode);
+                $customerGroup->setCode(!empty($customerGroupCode) ? $customerGroupCode : null);
                 $customerGroup->setTaxClassId($taxClass);
 
                 $this->groupRepository->save($customerGroup);

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);

app/code/Magento/Customer/Model/AccountManagement.php

@@ -717,8 +717,15 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
         }
         try {
             foreach ($customerAddresses as $address) {
-                $address->setCustomerId($customer->getId());
-                $this->addressRepository->save($address);
+                 if ($address->getId()) {
+                    $newAddress = clone $address;
+                    $newAddress->setId(null);
+                    $newAddress->setCustomerId($customer->getId());
+                    $this->addressRepository->save($newAddress);
+                 } else {
+                    $address->setCustomerId($customer->getId());
+                    $this->addressRepository->save($address);
+                }
             }
         } catch (InputException $e) {
             $this->customerRepository->delete($customer);