Merge pull request #1435 from algolia/update/MAGE-781

Update search-insights version to 2.9.0

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);
@@ -166,4 +170,5 @@ public function setUserToken(\Magento\Customer\Model\Customer $customer)
 
         return $userToken;
     }
+
 }

Observer/Insights/CustomerLogout.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Observer\Insights;
+
+use Algolia\AlgoliaSearch\Helper\InsightsHelper;
+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 CookieMetadataFactory
+     */
+    private $cookieMetadataFactory;
+
+    /**
+     * RefreshCustomerData constructor.
+     * @param PhpCookieManager $cookieManager
+     * @param CookieMetadataFactory $cookieMetadataFactory
+     */
+    public function __construct(
+        PhpCookieManager $cookieManager,
+        CookieMetadataFactory $cookieMetadataFactory
+    ) {
+        $this->cookieManager = $cookieManager;
+        $this->cookieMetadataFactory = $cookieMetadataFactory;
+    }
+
+    /**
+     * Check and clear session data if persistent session expired
+     *
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        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

@@ -23,4 +23,10 @@
     <event name="checkout_onepage_controller_success_action">
         <observer name="algoliasearch_insights_place_order_event" instance="Algolia\AlgoliaSearch\Observer\Insights\CheckoutOnepageControllerSuccessAction" />
     </event>
+    <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>

view/frontend/web/insights.js

@@ -44,8 +44,7 @@ define(
                 algoliaAnalytics.addAlgoliaAgent(userAgent);
 
                 var userToken = getCookie('aa-search');
-                if (userToken && userToken !== '') algoliaAnalytics.setUserToken(userToken);
-
+                if (userToken && userToken !== '') algoliaAnalytics.setAuthenticatedUserToken(userToken);
             },
 
             addSearchParameters: function () {
@@ -62,6 +61,7 @@ define(
                     if (algoliaConfig.personalization.enabled) {
                         allWidgetConfiguration.configure.enablePersonalization = true;
                         allWidgetConfiguration.configure.userToken = algoliaAnalytics.getUserToken();
+                        allWidgetConfiguration.configure.authenticatedUserToken = algoliaAnalytics.getUserToken();
                     }
 
                     return allWidgetConfiguration;
@@ -74,6 +74,7 @@ define(
                     if (algoliaConfig.personalization.enabled) {
                         options.enablePersonalization = true;
                         options.userToken = algoliaAnalytics.getUserToken();
+                        options.authenticatedUserToken = algoliaAnalytics.getUserToken();
                     }
                     return options;
                 });