MAGE-787 Fixed issue with cookies not cleared when customer logs out

Author: mohitalgolia

Helper/InsightsHelper.php

@@ -171,17 +171,4 @@ public function setUserToken(Customer $customer)
         return $userToken;
     }
 
-    /**
-     * @param Customer $customer
-     * @return void
-     */
-    public function unsetUserToken(Customer $customer)
-    {
-        if ($this->cookieManager->getCookie(self::ALGOLIA_CUSTOMER_USER_TOKEN_COOKIE_NAME)) {
-            $metadata = $this->cookieMetadataFactory->createCookieMetadata()
-                ->setPath($this->sessionManager->getCookiePath());
-            return $this->cookieManager->deleteCookie(
-                self::ALGOLIA_CUSTOMER_USER_TOKEN_COOKIE_NAME,$metadata);
-        }
-    }
 }

Observer/Insights/CustomerLogout.php

@@ -3,37 +3,48 @@
 namespace Algolia\AlgoliaSearch\Observer\Insights;
 
 use Algolia\AlgoliaSearch\Helper\InsightsHelper;
-use Magento\Customer\Model\Customer;
-use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
+use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
 
 class CustomerLogout implements ObserverInterface
 {
+    /**
+     * @var PhpCookieManager
+     */
+    private $cookieManager;
 
-    /** @var InsightsHelper */
-    protected $insightsHelper;
+    /**
+     * @var CookieMetadataFactory
+     */
+    private $cookieMetadataFactory;
 
     /**
-     * @param InsightsHelper $insightsHelper
+     * RefreshCustomerData constructor.
+     * @param PhpCookieManager $cookieManager
+     * @param CookieMetadataFactory $cookieMetadataFactory
      */
     public function __construct(
-        InsightsHelper $insightsHelper
-    )
-    {
-        $this->insightsHelper = $insightsHelper;
+        PhpCookieManager $cookieManager,
+        CookieMetadataFactory $cookieMetadataFactory
+    ) {
+        $this->cookieManager = $cookieManager;
+        $this->cookieMetadataFactory = $cookieMetadataFactory;
     }
 
     /**
-     * @param Observer $observer
-     * ['customer' => $customer]
+     * Check and clear session data if persistent session expired
+     *
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function execute(Observer $observer)
+    public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        /** @var Customer $customer */
-        $customer = $observer->getEvent()->getCustomer();
-
-        if ($this->insightsHelper->getConfigHelper()->isClickConversionAnalyticsEnabled($customer->getStoreId()) || $this->insightsHelper->getPersonalizationHelper()->isPersoEnabled($customer->getStoreId())) {
-            $this->insightsHelper->unsetUserToken($customer);
+        if ($this->cookieManager->getCookie(InsightsHelper::ALGOLIA_CUSTOMER_USER_TOKEN_COOKIE_NAME)) {
+            $metadata = $this->cookieMetadataFactory->createCookieMetadata();
+            $metadata->setPath('/');
+            $this->cookieManager->deleteCookie(InsightsHelper::ALGOLIA_CUSTOMER_USER_TOKEN_COOKIE_NAME, $metadata);
         }
     }
-}
+}

etc/frontend/events.xml

@@ -26,4 +26,7 @@
     <event name="customer_logout">
         <observer name="algoliasearch_personalization_unset_user_token" instance="Algolia\AlgoliaSearch\Observer\Insights\CustomerLogout" />
     </event>
+    <event name="persistent_session_expired">
+        <observer name="refresh_customer_data" instance="Algolia\AlgoliaSearch\Observer\Insights\CustomerLogout" />
+    </event>
 </config>