react-instantsearch 7.13.5 → 7.13.6

package/dist/umd/ReactInstantSearch.js

@@ -7,7 +7,7 @@
 
   var React__default = 'default' in React ? React['default'] : React;
 
-  var version = '7.13.5';
+  var version = '7.13.6';
 
   // Copyright Joyent, Inc. and other Node contributors.
   //
@@ -11059,6 +11059,22 @@
     return getCookie(ANONYMOUS_TOKEN_COOKIE_KEY);
   }
 
+  /**
+   * Create UUID according to
+   * https://www.ietf.org/rfc/rfc4122.txt.
+   *
+   * @returns Generated UUID.
+   */
+  function createUUID() {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+      /* eslint-disable no-bitwise */
+      var r = Math.random() * 16 | 0;
+      var v = c === 'x' ? r : r & 0x3 | 0x8;
+      /* eslint-enable */
+      return v.toString(16);
+    });
+  }
+
   function _typeof$l(obj) {
     "@babel/helpers - typeof";
 
@@ -11189,6 +11205,7 @@
       $$internal = _props$$$internal === void 0 ? false : _props$$$internal,
       _props$$$automatic = props.$$automatic,
       $$automatic = _props$$$automatic === void 0 ? false : _props$$$automatic;
+    var currentTokenType;
     var potentialInsightsClient = _insightsClient;
     if (!_insightsClient && _insightsClient !== null) {
       safelyRunOnBrowser(function (_ref) {
@@ -11232,6 +11249,7 @@
         _getAppIdAndApiKey2 = _slicedToArray$7(_getAppIdAndApiKey, 2),
         appId = _getAppIdAndApiKey2[0],
         apiKey = _getAppIdAndApiKey2[1];
+      var queuedInitParams = undefined;
       var queuedUserToken = undefined;
       var queuedAuthenticatedUserToken = undefined;
       var userTokenBeforeInit = undefined;
@@ -11248,7 +11266,7 @@
         // At this point, even though `search-insights` is not loaded yet,
         // we still want to read the token from the queue.
         // Otherwise, the first search call will be fired without the token.
-        var _map = ['setUserToken', 'setAuthenticatedUserToken'].map(function (key) {
+        var _map = ['setUserToken', 'setAuthenticatedUserToken', 'init'].map(function (key) {
           var _ref3 = find$1(queue.slice().reverse(), function (_ref5) {
               var _ref6 = _slicedToArray$7(_ref5, 1),
                 method = _ref6[0];
@@ -11258,9 +11276,10 @@
             value = _ref4[1];
           return value;
         });
-        var _map2 = _slicedToArray$7(_map, 2);
+        var _map2 = _slicedToArray$7(_map, 3);
         queuedUserToken = _map2[0];
         queuedAuthenticatedUserToken = _map2[1];
+        queuedInitParams = _map2[2];
       }
 
       // If user called `aa('setUserToken')` or `aa('setAuthenticatedUserToken')`
@@ -11311,6 +11330,23 @@
         started: function started() {
           insightsClient('addAlgoliaAgent', 'insights-middleware');
           helper = instantSearchInstance.mainHelper;
+          var queueAtStart = insightsClient.queue;
+          if (Array.isArray(queueAtStart)) {
+            var _map3 = ['setUserToken', 'setAuthenticatedUserToken', 'init'].map(function (key) {
+              var _ref7 = find$1(queueAtStart.slice().reverse(), function (_ref9) {
+                  var _ref10 = _slicedToArray$7(_ref9, 1),
+                    method = _ref10[0];
+                  return method === key;
+                }) || [],
+                _ref8 = _slicedToArray$7(_ref7, 2),
+                value = _ref8[1];
+              return value;
+            });
+            var _map4 = _slicedToArray$7(_map3, 3);
+            queuedUserToken = _map4[0];
+            queuedAuthenticatedUserToken = _map4[1];
+            queuedInitParams = _map4[2];
+          }
           initialParameters = {
             userToken: helper.state.userToken,
             clickAnalytics: helper.state.clickAnalytics
@@ -11326,8 +11362,9 @@
           if (!$$internal) {
             instantSearchInstance.scheduleSearch();
           }
-          var setUserTokenToSearch = function setUserTokenToSearch(userToken) {
-            var immediate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+          var setUserTokenToSearch = function setUserTokenToSearch(userToken, tokenType) {
+            var immediate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+            var unsetAuthenticatedUserToken = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
             var normalizedUserToken = normalizeUserToken(userToken);
             if (!normalizedUserToken) {
               return;
@@ -11340,6 +11377,13 @@
               if (existingToken && existingToken !== userToken) {
                 instantSearchInstance.scheduleSearch();
               }
+              currentTokenType = tokenType;
+            }
+
+            // the authenticated user token cannot be overridden by a user or anonymous token
+            // for instant search query requests
+            if (currentTokenType && currentTokenType === 'authenticated' && tokenType === 'default' && !unsetAuthenticatedUserToken) {
+              return;
             }
 
             // Delay the token application to the next render cycle
@@ -11349,14 +11393,8 @@
               applyToken();
             }
           };
-          var anonymousUserToken = getInsightsAnonymousUserTokenInternal();
-          if (anonymousUserToken) {
-            // When `aa('init', { ... })` is called, it creates an anonymous user token in cookie.
-            // We can set it as userToken.
-            setUserTokenToSearch(anonymousUserToken, true);
-          }
           function setUserToken(token, userToken, authenticatedUserToken) {
-            setUserTokenToSearch(token, true);
+            setUserTokenToSearch(token, authenticatedUserToken ? 'authenticated' : 'default', true);
             if (userToken) {
               insightsClient('setUserToken', userToken);
             }
@@ -11364,19 +11402,66 @@
               insightsClient('setAuthenticatedUserToken', authenticatedUserToken);
             }
           }
+          var anonymousUserToken = undefined;
+          var anonymousTokenFromInsights = getInsightsAnonymousUserTokenInternal();
+          if (anonymousTokenFromInsights) {
+            // When `aa('init', { ... })` is called, it creates an anonymous user token in cookie.
+            // We can set it as userToken on instantsearch and insights. If it's not set as an insights
+            // userToken before a sendEvent, insights automatically generates a new anonymous token,
+            // causing a state change and an unnecessary query on instantsearch.
+            anonymousUserToken = anonymousTokenFromInsights;
+          } else {
+            var token = "anonymous-".concat(createUUID());
+            anonymousUserToken = token;
+          }
+          var authenticatedUserTokenFromInit;
+          var userTokenFromInit;
+
+          // With SSR, the token could be be set on the state. We make sure
+          // that insights is in sync with that token since, there is no
+          // insights lib on the server.
+          var tokenFromSearchParameters = initialParameters.userToken;
+
+          // When the first query is sent, the token is possibly not yet be set by
+          // the insights onChange callbacks (if insights isn't yet loaded).
+          // It is explicitly being set here so that the first query has the
+          // initial tokens set and ensure a second query isn't automatically
+          // made when the onChange callback actually changes the state.
+          if (insightsInitParams) {
+            if (insightsInitParams.authenticatedUserToken) {
+              authenticatedUserTokenFromInit = insightsInitParams.authenticatedUserToken;
+            } else if (insightsInitParams.userToken) {
+              userTokenFromInit = insightsInitParams.userToken;
+            }
+          }
 
           // We consider the `userToken` or `authenticatedUserToken` before an
-          // `init` call of higher importance than one from the queue.
+          // `init` call of higher importance than one from the queue and ones set
+          // from the init props to be higher than that.
+          var tokenFromInit = authenticatedUserTokenFromInit || userTokenFromInit;
           var tokenBeforeInit = authenticatedUserTokenBeforeInit || userTokenBeforeInit;
-          var queuedToken = queuedAuthenticatedUserToken || queuedUserToken;
-          if (tokenBeforeInit) {
+          var tokenFromQueue = queuedAuthenticatedUserToken || queuedUserToken;
+          if (tokenFromInit) {
+            setUserToken(tokenFromInit, userTokenFromInit, authenticatedUserTokenFromInit);
+          } else if (tokenFromSearchParameters) {
+            setUserToken(tokenFromSearchParameters, tokenFromSearchParameters, undefined);
+          } else if (tokenBeforeInit) {
             setUserToken(tokenBeforeInit, userTokenBeforeInit, authenticatedUserTokenBeforeInit);
-          } else if (queuedToken) {
-            setUserToken(queuedToken, queuedUserToken, queuedAuthenticatedUserToken);
+          } else if (tokenFromQueue) {
+            setUserToken(tokenFromQueue, queuedUserToken, queuedAuthenticatedUserToken);
+          } else if (anonymousUserToken) {
+            var _queuedInitParams;
+            setUserToken(anonymousUserToken, anonymousUserToken, undefined);
+            if (insightsInitParams !== null && insightsInitParams !== void 0 && insightsInitParams.useCookie || (_queuedInitParams = queuedInitParams) !== null && _queuedInitParams !== void 0 && _queuedInitParams.useCookie) {
+              var _queuedInitParams2;
+              saveTokenAsCookie(anonymousUserToken, (insightsInitParams === null || insightsInitParams === void 0 ? void 0 : insightsInitParams.cookieDuration) || ((_queuedInitParams2 = queuedInitParams) === null || _queuedInitParams2 === void 0 ? void 0 : _queuedInitParams2.cookieDuration));
+            }
           }
 
           // This updates userToken which is set explicitly by `aa('setUserToken', userToken)`
-          insightsClient('onUserTokenChange', setUserTokenToSearch, {
+          insightsClient('onUserTokenChange', function (token) {
+            return setUserTokenToSearch(token, 'default', true);
+          }, {
             immediate: true
           });
 
@@ -11385,10 +11470,10 @@
             // If we're unsetting the `authenticatedUserToken`, we revert to the `userToken`
             if (!authenticatedUserToken) {
               insightsClient('getUserToken', null, function (_, userToken) {
-                setUserTokenToSearch(userToken);
+                setUserTokenToSearch(userToken, 'default', true, true);
               });
             }
-            setUserTokenToSearch(authenticatedUserToken);
+            setUserTokenToSearch(authenticatedUserToken, 'authenticated', true);
           }, {
             immediate: true
           });
@@ -11434,6 +11519,13 @@
       };
     };
   }
+  function saveTokenAsCookie(token, cookieDuration) {
+    var MONTH = 30 * 24 * 60 * 60 * 1000;
+    var d = new Date();
+    d.setTime(d.getTime() + (cookieDuration || MONTH * 6));
+    var expires = "expires=".concat(d.toUTCString());
+    document.cookie = "_ALGOLIA=".concat(token, ";").concat(expires, ";path=/");
+  }
 
   /**
    * Determines if a given insights `client` supports the optional call to `init`
@@ -13092,7 +13184,7 @@
     };
   }
 
-  var version$3 = '4.75.2';
+  var version$3 = '4.75.3';
 
   function _typeof$q(obj) {
     "@babel/helpers - typeof";