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

Author: mohitalgolia

Helper/InsightsHelper.php

@@ -5,7 +5,9 @@
 use Algolia\AlgoliaSearch\Helper\Configuration\PersonalizationHelper;
 use Algolia\AlgoliaSearch\Insights\UserInsightsClient;
 use Algolia\AlgoliaSearch\InsightsClient;
+use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\CookieManagerInterface;
 
@@ -48,12 +50,14 @@ class InsightsHelper
     public function __construct(
         ConfigHelper $configHelper,
         PersonalizationHelper $personalizationHelper,
+        SessionManagerInterface $sessionManager,
         CookieManagerInterface $cookieManager,
         CookieMetadataFactory $cookieMetadataFactory,
         CustomerSession $customerSession
     ) {
         $this->configHelper = $configHelper;
         $this->personalizationHelper = $personalizationHelper;
+        $this->sessionManager = $sessionManager;
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
         $this->customerSession = $customerSession;
@@ -142,11 +146,11 @@ private function getUserToken()
     }
 
     /**
-     * @param \Magento\Customer\Model\Customer $customer
+     * @param Customer $customer
      *
      * @return string
      */
-    public function setUserToken(\Magento\Customer\Model\Customer $customer)
+    public function setUserToken(Customer $customer)
     {
         $userToken = base64_encode('customer-' . $customer->getEmail() . '-' . $customer->getId());
         $userToken = 'aa-' . preg_replace('/[^A-Za-z0-9\-]/', '', $userToken);
@@ -171,6 +175,20 @@ public function setUserToken(\Magento\Customer\Model\Customer $customer)
      * @return string|null
      */
     public function getUserAllowedSavedCookie() {
-        return $this->configHelper->isCookieRestrictionModeEnabled() ? !!$this->cookieManager->getCookie('user_allowed_save_cookie') : true;
+        return $this->configHelper->isCookieRestrictionModeEnabled() ? !!$this->cookieManager->getCookie($this->configHelper->getDefaultConsentCookieName()) : true;
+    }
+
+    /**
+     * @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);
+        }
     }
 }