@livechat/customer-sdk 3.1.3 → 3.1.5

package/dist/customer-sdk.js

@@ -105,125 +105,43 @@
 
   var _ref = {},
     hasOwnProperty = _ref.hasOwnProperty;
-  /**
-   * returns true or false depending if the provided property is present inside the provided object
-   * @example
-   * hasOwn('a', { a: 1, b: 2 })
-   * // returns true
-   */
   function hasOwn(prop, obj) {
     return hasOwnProperty.call(obj, prop);
   }
 
-  /**
-   * returns a new array formed by applying a given callback function to each element of the array, and then flattening the result by one level
-   * @example
-   * const arr = [{ a: [1, 2] }, { a: [3, 4] }, { a: [5, 6] }]
-   * flatMap(el => el.a, arr)
-   * // returns [1, 2, 3, 4, 5, 6]
-   */
   function flatMap(iteratee, arr) {
     var _ref;
     return (_ref = []).concat.apply(_ref, arr.map(iteratee));
   }
 
-  /**
-   * determines whether provided value is an array
-   * @example
-   * isArray([1, 2])
-   * // returns true
-   * isArray('hello')
-   * // returns false
-   */
-  function isArray(arr) {
-    return Array.isArray(arr);
-  }
+  var isArray = Array.isArray;
 
-  /**
-   * returns true or false depending if the provided value is an object
-   * @example
-   * isObject({ a: 1 })
-   * // returns true
-   * isObject([1, 2])
-   * // returns false
-   */
   // eslint-disable-next-line @typescript-eslint/ban-types
   function isObject(obj) {
     return typeof obj === 'object' && obj !== null && !isArray(obj);
   }
 
-  /**
-   * returns an array of the provided object keys
-   * @example
-   * keys({ a: 1, b: 2, c: 3 })
-   * // returns ['a', 'b', 'c']
-   */
-  function keys(obj) {
-    if ('keys' in Object && typeof Object.keys === 'function') {
-      return Object.keys(obj);
-    }
-    var keysArray = [];
-    for (var property in obj) {
-      if (Object.prototype.hasOwnProperty.call(obj, property)) {
-        keysArray.push(property);
-      }
-    }
-    return keysArray;
-  }
-
-  /**
-   * maps values of the provided object
-   * @example
-   * mapValues(val => val.toUpperCase(), { a: 'foo', b: 'bar' })
-   * // returns { a: 'FOO', b: 'BAR' }
-   */
   function mapValues(mapper, obj) {
-    return keys(obj).reduce(function (acc, key) {
+    return Object.keys(obj).reduce(function (acc, key) {
       acc[key] = mapper(obj[key]);
       return acc;
     }, {});
   }
 
-  /**
-   * returns the provided value
-   * @example
-   * identity('hello')
-   * // returns 'hello'
-   */
   function identity(value) {
     return value;
   }
 
-  /**
-   * generates a random id
-   * @example
-   * generateRandomId()
-   * // returns 'd1rjknhhch8'
-   */
   function generateRandomId() {
     return Math.random().toString(36).substring(2);
   }
 
-  /**
-   * generates an unique id based on the provided object keys
-   * @example
-   * generateUniqueId({ xuvarw8cao: 1, b837g2nba1d: 2 })
-   * // returns 'd1rjknhhch8'
-   */
   function generateUniqueId(map) {
     var id = generateRandomId();
     return hasOwn(id, map) ? generateUniqueId(map) : id;
   }
 
-  /**
-   * returns the value from the specififed path from the provided object
-   * @example
-   * const obj = { a: { b: [1, 2, 3] } }
-   * get('a.b.1', obj)
-   * // returns 2
-   * get(['a', 'b', '1'], obj)
-   * // returns 2
-   */
+  // based on https://github.com/developit/dlv/blob/d7ec976d12665f1c25dec2acf955dfc2e8757a9c/index.js
   function get(propPath, obj) {
     var arrPath = typeof propPath === 'string' ? propPath.split('.') : propPath;
     var pathPartIndex = 0;
@@ -234,40 +152,14 @@
     return result;
   }
 
-  /**
-   * returns true or false depending if the provided value is present inside the provided array or string
-   * @example
-   * includes('a', ['a', 'b', 'c'])
-   * // returns true
-   * includes('d', 'abc')
-   * // returns false
-   */
-
   function includes(value, arrOrStr) {
     return arrOrStr.indexOf(value) !== -1;
   }
 
-  /**
-   * returns true or false depending if the provided value is an empty object or an empty array
-   * @example
-   * isEmpty({})
-   * // returns true
-   */
   function isEmpty(collection) {
     return (isArray(collection) ? collection : Object.keys(collection)).length === 0;
   }
 
-  /**
-   * constructs an object from the provided array of objects, grouped by the value of the specified key
-   * @example
-   * const arr = [
-   * 	{ a: 'foo', b: 'bar' },
-   * 	{ a: 'foo', b: 'baz' },
-   * 	{ a: 'test', b: 'bab' },
-   * ]
-   * keyBy('a', arr)
-   * // returns { foo: { a: 'foo', b: 'baz' }, test: { a: 'test', b: 'bab' } }
-   */
   function keyBy(prop, arr) {
     return arr.reduce(function (acc, el) {
       acc[el[prop]] = el;
@@ -275,47 +167,20 @@
     }, {});
   }
 
-  /**
-   * returns the last element of the provided array or undefined when array is empty
-   * @example
-   * last([1, 2, 3])
-   * // returns 3
-   */
+  // TODO: this  should return `T | undefined` to match native behavior
   function last(arr) {
-    return arr.length > 0 ? arr[arr.length - 1] : undefined;
+    return arr.length > 0 ? arr[arr.length - 1] : null;
   }
 
-  /**
-   * does literally nothing
-   * @example
-   * somethingAsyncAndDangerous().catch(noop)
-   */
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   function noop() {}
 
-  /**
-   * returns an array of values of the provided object
-   * @example
-   * values({ a: 1, b: 2, c: 3 })
-   * // returns [1, 2, 3]
-   */
   function values(obj) {
-    return keys(obj).map(function (key) {
+    return Object.keys(obj).map(function (key) {
       return obj[key];
     });
   }
 
-  /**
-   * sorts values of the provided object or array based on the provided mapping function or the provided prop string
-   * @example
-   * const obj = {
-   * 	a: { chats: 1 },
-   * 	b: { chats: 3 },
-   * 	c: { chats: 2 },
-   * }
-   * numericSortBy(el => el.chats * -1, obj)
-   * // returns [{ chats: 3 }, { chats: 2 }, { chats: 1 }]
-   */
   function numericSortBy(propOrMapper, collection) {
     var mapper = typeof propOrMapper === 'function' ? propOrMapper : function (element) {
       return get(propOrMapper, element);
@@ -325,25 +190,13 @@
     });
   }
 
-  /**
-   * picks specified properties from the object
-   * @example
-   * pick(['b'], { a: 1, b: 2 })
-   * // returns { b: 2 }
-   */
-  function pick(keys, obj) {
-    return keys.reduce(function (acc, prop) {
+  function pick(props, obj) {
+    return props.reduce(function (acc, prop) {
       acc[prop] = obj[prop];
       return acc;
     }, {});
   }
 
-  /**
-   * picks specified props only if they exist on the provided object
-   * @example
-   * pickOwn(['b'], { a: 1, b: 2 })
-   * // returns { b: 2 }
-   */
   function pickOwn(props, obj) {
     return props.reduce(function (acc, prop) {
       if (hasOwn(prop, obj)) {
@@ -353,41 +206,19 @@
     }, {});
   }
 
-  /**
-   * returns an array of derived from the provided object key-value tuples
-   * @example
-   * toPairs({ a: 1, b: 2 })
-   * // returns [['a', 1], ['b', 2]]
-   */
-  function toPairs(obj) {
-    return keys(obj).map(function (key) {
+  var toPairs = function toPairs(obj) {
+    return Object.keys(obj).map(function (key) {
       return [key, obj[key]];
     });
-  }
+  };
 
-  /**
-   * returns 0 for matching strings
-   * return -1 for string with lower char code at some position
-   * return 1 for string with greater char code at some position
-   * @example
-   * stringCompare('abc', 'abc')
-   * // returns 0
-   * stringCompare('abc', 'abd')
-   * // returns -1
-   */
-  function stringCompare(strA, strB) {
+  var stringCompare = function stringCompare(strA, strB) {
     if (strA === strB) {
       return 0;
     }
     return strA < strB ? -1 : 1;
-  }
+  };
 
-  /**
-   * returns an array with all the duplicates from the provided array removed based on the iteratee function
-   * @example
-   * uniqBy(el => el.toString(), [1, '1', 2, '3', 3])
-   * // returns [1, 2, '3']
-   */
   function uniqBy(iteratee, arr) {
     // with polyfills this could be just: return Array.from(new Set(arr.map(iteratee)))
     var seen = [];
@@ -478,18 +309,25 @@
     });
   }
 
-  var ACCOUNTS_URL = "https://accounts.livechatinc.com";
-  var buildPath = function buildPath(_ref) {
-    var uniqueGroups = _ref.uniqueGroups,
-      organizationId = _ref.organizationId,
-      groupId = _ref.groupId;
-    return "" + (uniqueGroups ? "/v2/customer/" + organizationId + "/" + groupId + "/token" : '/v2/customer/token');
-  };
-  var buildRequestUrl = function buildRequestUrl(config, env) {
-    var url = env === 'production' ? ACCOUNTS_URL : ACCOUNTS_URL.replace('accounts.', "accounts." + env + ".");
-    var path = buildPath(config);
-    return "" + url + path;
-  };
+  function getRoot() {
+    return new Promise(function (resolve) {
+      var next = function next() {
+        if (!document.body) {
+          setTimeout(next, 100);
+          return;
+        }
+        resolve(document.body);
+      };
+      next();
+    });
+  }
+
+  function removeNode(node) {
+    var parentNode = node.parentNode;
+    if (parentNode) {
+      parentNode.removeChild(node);
+    }
+  }
 
   var createError = function createError(_ref) {
     var code = _ref.code,
@@ -499,7 +337,7 @@
     return err;
   };
 
-  var parseTokenResponse = function parseTokenResponse(token, organizationId) {
+  var parseTokenResponse = function parseTokenResponse(token, licenseId) {
     if ('identity_exception' in token) {
       throw createError({
         code: 'SSO_IDENTITY_EXCEPTION',
@@ -518,33 +356,119 @@
       expiresIn: token.expires_in * 1000,
       tokenType: token.token_type,
       creationDate: Date.now(),
-      organizationId: organizationId
+      licenseId: licenseId
+    };
+  };
+
+  var ACCOUNTS_URL = "https://accounts.livechatinc.com";
+  var buildPath = function buildPath(_ref) {
+    var uniqueGroups = _ref.uniqueGroups,
+      licenseId = _ref.licenseId,
+      groupId = _ref.groupId;
+    return (uniqueGroups ? "/licence/g" + licenseId + "_" + groupId : '') + "/customer";
+  };
+  var buildRequestUrl = function buildRequestUrl(config, env) {
+    var url = env === 'production' ? ACCOUNTS_URL : ACCOUNTS_URL.replace('accounts.', "accounts." + env + ".");
+    var path = buildPath(config);
+    return "" + url + path;
+  };
+
+  var POST_MESSAGE_ORIGIN = 'https://accounts.livechatinc.com';
+  var CUSTOMER_AUTH_FOOTPRINT = '@livechat/customer-auth';
+  var getPostMessageOrigin = function getPostMessageOrigin(env) {
+    return env === 'production' ? POST_MESSAGE_ORIGIN : POST_MESSAGE_ORIGIN.replace('accounts.', "accounts." + env + ".");
+  };
+  var buildParams = function buildParams(_ref, redirectUri) {
+    var clientId = _ref.clientId,
+      licenseId = _ref.licenseId;
+    return {
+      license_id: String(licenseId),
+      flow: 'button',
+      response_type: 'token',
+      client_id: clientId,
+      redirect_uri: redirectUri,
+      post_message_uri: redirectUri,
+      state: CUSTOMER_AUTH_FOOTPRINT
     };
   };
+  var buildIframe = function buildIframe(config, env) {
+    var redirectUri = getOrigin(String(window.location)) + window.location.pathname;
+    var params = buildParams(config, redirectUri);
+    var iframe = document.createElement('iframe');
+    iframe.style.display = 'none';
+    iframe.setAttribute('src', buildRequestUrl(config, env) + "?" + buildQueryString(params));
+    return iframe;
+  };
+  var isTokenResponse = function isTokenResponse(data) {
+    return data && data.state === CUSTOMER_AUTH_FOOTPRINT;
+  };
+  function fetchUsingIframe(config, env) {
+    var licenseId = config.licenseId;
+    var postMessageOrigin = getPostMessageOrigin(env);
+    return new Promise(function (resolve, reject) {
+      var iframe = buildIframe(config, env);
+      var cleanup = function cleanup() {
+        removeNode(iframe);
+        // eslint-disable-next-line no-use-before-define
+        window.removeEventListener('message', listener, false);
+      };
+      var timeoutId = setTimeout(function () {
+        cleanup();
+        reject(createError({
+          message: 'Request timed out.',
+          code: 'REQUEST_TIMEOUT'
+        }));
+      }, 15 * 1000);
+      var listener = function listener(_ref2) {
+        var origin = _ref2.origin,
+          data = _ref2.data;
+        if (origin !== postMessageOrigin) {
+          return;
+        }
+        if (!isTokenResponse(data)) {
+          return;
+        }
+        clearTimeout(timeoutId);
+        cleanup();
+        try {
+          resolve(parseTokenResponse(data, licenseId));
+        } catch (err) {
+          reject(err);
+        }
+      };
+      window.addEventListener('message', listener, false);
+      getRoot().then(function (body) {
+        body.appendChild(iframe);
+      });
+    });
+  }
 
   var fetchToken = function fetchToken(config, env) {
-    return unfetch("" + buildRequestUrl(config, env), {
+    if (config.uniqueGroups) {
+      return fetchUsingIframe(config, env);
+    }
+    return unfetch(buildRequestUrl(config, env) + "/token", {
       method: 'POST',
       credentials: 'include',
       body: JSON.stringify({
         response_type: 'token',
         grant_type: 'cookie',
         client_id: config.clientId,
-        organization_id: config.organizationId,
+        license_id: config.licenseId,
         redirect_uri: getOrigin(String(window.location)) + window.location.pathname
       })
     }).then(function (res) {
       return res.json();
     }).then(function (token) {
-      return parseTokenResponse(token, config.organizationId);
+      return parseTokenResponse(token, config.licenseId);
     });
   };
 
   var validateConfig = function validateConfig(_ref) {
-    var organizationId = _ref.organizationId,
+    var licenseId = _ref.licenseId,
       clientId = _ref.clientId;
-    if (typeof organizationId !== 'string' || typeof clientId !== 'string') {
-      throw new Error('You need to pass valid configuration object: { organizationId, clientId }.');
+    if (typeof licenseId !== 'number' || typeof clientId !== 'string') {
+      throw new Error('You need to pass valid configuration object: { licenseId, clientId }.');
     }
   };
 
@@ -553,39 +477,25 @@
       expiresIn = _ref.expiresIn;
     return Date.now() >= creationDate + expiresIn;
   };
-  var createAuth = function createAuth(config, licenseId, env) {
+  var createAuth = function createAuth(config, env) {
     validateConfig(config);
-    var tokenStoragePrefix = config.tokenStoragePrefix || "@@lc_auth_token:";
-    var oldCacheKey = "" + tokenStoragePrefix + licenseId + (config.uniqueGroups ? ":" + config.groupId : '');
-    var newCacheKey = "" + tokenStoragePrefix + config.organizationId + (config.uniqueGroups ? ":" + config.groupId : '');
+    var cacheKey = "" + "@@lc_auth_token:" + config.licenseId + (config.uniqueGroups ? ":" + config.groupId : '');
     var pendingTokenRequest = null;
     var cachedToken = null;
-    var retrievingToken = storage.getItem(oldCacheKey).then(function (token) {
+    var retrievingToken = storage.getItem(cacheKey).then(function (token) {
       if (retrievingToken === null) {
         return;
       }
       retrievingToken = null;
       if (!token) {
-        storage.removeItem(oldCacheKey).then(function () {
-          return storage.getItem(newCacheKey).then(function (newKeyToken) {
-            if (!newKeyToken) {
-              return;
-            }
-            cachedToken = JSON.parse(newKeyToken);
-          });
-        });
         return;
       }
-      storage.setItem(newCacheKey, token).then(function () {
-        storage.removeItem(oldCacheKey).then(function () {
-          cachedToken = JSON.parse(token);
-        });
-      });
+      cachedToken = JSON.parse(token);
     });
     var getFreshToken = function getFreshToken() {
       pendingTokenRequest = fetchToken(config, env).then(function (token) {
         pendingTokenRequest = null;
-        storage.setItem(newCacheKey, JSON.stringify(token));
+        storage.setItem(cacheKey, JSON.stringify(token));
         cachedToken = token;
         return token;
       }, function (err) {
@@ -615,7 +525,7 @@
     var invalidate = function invalidate() {
       cachedToken = null;
       retrievingToken = null;
-      return storage.removeItem(newCacheKey);
+      return storage.removeItem(cacheKey);
     };
     return {
       getFreshToken: getFreshToken,
@@ -1184,62 +1094,13 @@
     return sideEffectsMiddleware;
   };
 
-  var createBackoff = function createBackoff(_ref) {
-    var _ref$min = _ref.min,
-      min = _ref$min === void 0 ? 1000 : _ref$min,
-      _ref$max = _ref.max,
-      max = _ref$max === void 0 ? 5000 : _ref$max,
-      _ref$jitter = _ref.jitter,
-      jitter = _ref$jitter === void 0 ? 0.5 : _ref$jitter;
-    var attempts = 0;
-    return {
-      duration: function duration() {
-        var ms = min * Math.pow(2, attempts++);
-        if (jitter) {
-          var rand = Math.random();
-          var deviation = Math.floor(rand * jitter * ms);
-          ms = (Math.floor(rand * 10) & 1) === 0 ? ms - deviation : ms + deviation;
-        }
-        return Math.min(ms, max) | 0;
-      },
-      reset: function reset() {
-        attempts = 0;
-      }
-    };
-  };
-
-  /**
-   * promiseTry allows us to move success / error handling to be promise based so we will handle both synchronous and asynchronous execution failures and success properly.
-   * @param anyFunction - function to be called
-   * @returns promise that resolves to the return value of the function
-   * @example
-   * const promise = promiseTry(() => 1)
-   * promise.then(value => console.log(value)) // 1
-   */
-
-  function promiseTry(anyFunction) {
-    return new Promise(function (resolve) {
-      resolve(anyFunction());
-    });
-  }
-
-  /**
-   * Creates a deferred object that can be resolved or rejected later.
-   * @returns A deferred object with a promise and resolve and reject functions.
-   * @example
-   * const def = promiseDeferred()
-   * const promise = def.promise
-   * def.resolve(1)
-   * return promise.then(res => console.log(res)) // 1
-   */
-
-  function promiseDeferred() {
-    var deferred = {};
-    deferred.promise = new Promise(function (resolve, reject) {
-      deferred.resolve = resolve;
-      deferred.reject = reject;
+  function deferred() {
+    var def = {};
+    def.promise = new Promise(function (resolve, reject) {
+      def.resolve = resolve;
+      def.reject = reject;
     });
-    return deferred;
+    return def;
   }
 
   var createReducer = function createReducer(initialState, reducersMap) {
@@ -1263,8 +1124,6 @@
   var AGENT = 'agent';
   var CUSTOMER = 'customer';
 
-  var LIVECHAT_ORGANIZATION_ID = 'feaf6c0e-9f43-48ff-9ad0-8e24e0350932';
-
   var getAllRequests = function getAllRequests(state) {
     return state.requests;
   };
@@ -1288,9 +1147,9 @@
     return getConnectionStatus(state) === DESTROYED;
   };
   var getEnvPart = function getEnvPart(_ref) {
-    var organizationId = _ref.organizationId,
+    var licenseId = _ref.licenseId,
       env = _ref.env;
-    if (organizationId === LIVECHAT_ORGANIZATION_ID) {
+    if (licenseId === 1520) {
       return '.staging';
     }
     if (env === 'production') {
@@ -1304,12 +1163,12 @@
     return "https://api" + regionPart + getEnvPart(state) + ".livechatinc.com";
   };
   var getServerUrl = function getServerUrl(state) {
-    return getApiOrigin(state) + "/v3.4/customer";
+    return getApiOrigin(state) + "/v3.3/customer";
   };
   var createInitialState = function createInitialState(initialStateData) {
     var _initialStateData$app = initialStateData.application,
       application = _initialStateData$app === void 0 ? {} : _initialStateData$app,
-      organizationId = initialStateData.organizationId,
+      licenseId = initialStateData.licenseId,
       _initialStateData$gro = initialStateData.groupId,
       groupId = _initialStateData$gro === void 0 ? null : _initialStateData$gro,
       env = initialStateData.env,
@@ -1326,9 +1185,9 @@
     return {
       application: _extends({}, application, {
         name: "customer_sdk",
-        version: "3.1.3"
+        version: "3.1.5"
       }),
-      organizationId: organizationId,
+      licenseId: licenseId,
       env: env,
       groupId: groupId,
       chats: {},
@@ -1782,10 +1641,10 @@
   // TODO: this thing is not really well typed and should be improved
   var sendRequestAction = function sendRequestAction(store, action) {
     action.payload.id = generateUniqueId(store.getState().requests);
-    var _promiseDeferred = promiseDeferred(),
-      resolve = _promiseDeferred.resolve,
-      reject = _promiseDeferred.reject,
-      promise = _promiseDeferred.promise;
+    var _deferred = deferred(),
+      resolve = _deferred.resolve,
+      reject = _deferred.reject,
+      promise = _deferred.promise;
     action.payload.promise = promise;
     action.payload.resolve = resolve;
     action.payload.reject = reject;
@@ -1793,44 +1652,59 @@
     return promise;
   };
 
+  var promiseTry = (function (fn) {
+    return new Promise(function (resolve) {
+      resolve(fn());
+    });
+  });
+
+  var createBackoff = function createBackoff(_ref) {
+    var _ref$min = _ref.min,
+      min = _ref$min === void 0 ? 1000 : _ref$min,
+      _ref$max = _ref.max,
+      max = _ref$max === void 0 ? 5000 : _ref$max,
+      _ref$jitter = _ref.jitter,
+      jitter = _ref$jitter === void 0 ? 0.5 : _ref$jitter;
+    var attempts = 0;
+    return {
+      duration: function duration() {
+        var ms = min * Math.pow(2, attempts++);
+        if (jitter) {
+          var rand = Math.random();
+          var deviation = Math.floor(rand * jitter * ms);
+          ms = (Math.floor(rand * 10) & 1) === 0 ? ms - deviation : ms + deviation;
+        }
+        return Math.min(ms, max) | 0;
+      },
+      reset: function reset() {
+        attempts = 0;
+      }
+    };
+  };
+
   var AUTHENTICATION = 'AUTHENTICATION';
   var CUSTOMER_BANNED$1 = 'CUSTOMER_BANNED';
   var USERS_LIMIT_REACHED = 'USERS_LIMIT_REACHED';
   var WRONG_PRODUCT_VERSION = 'WRONG_PRODUCT_VERSION';
 
-  var getSideStorageKeyByLicense = function getSideStorageKeyByLicense(store, licenseId) {
+  var getSideStorageKey = function getSideStorageKey(store) {
     var _store$getState = store.getState(),
+      licenseId = _store$getState.licenseId,
       groupId = _store$getState.groupId,
       uniqueGroups = _store$getState.uniqueGroups;
     return "side_storage_" + licenseId + (uniqueGroups ? ":" + groupId : '');
   };
-  var getSideStorageKeyByOrganization = function getSideStorageKeyByOrganization(store) {
-    var _store$getState2 = store.getState(),
-      organizationId = _store$getState2.organizationId,
-      groupId = _store$getState2.groupId,
-      uniqueGroups = _store$getState2.uniqueGroups;
-    return "side_storage_" + organizationId + (uniqueGroups ? ":" + groupId : '');
-  };
-  var getSideStorage = function getSideStorage(store, licenseId) {
-    var sideStorageLicenseKey = getSideStorageKeyByLicense(store, licenseId);
-    var sideStorageOrganizationKey = getSideStorageKeyByOrganization(store);
-    return storage.getItem(sideStorageLicenseKey)["catch"](noop).then(function (sideStorage) {
-      if (!sideStorage) {
-        return storage.getItem(sideStorageOrganizationKey)["catch"](noop).then(function (organizationSideStorage) {
-          return JSON.parse(organizationSideStorage || '{}');
-        })["catch"](noop);
-      }
-      return storage.setItem(sideStorageOrganizationKey, sideStorage)["catch"](noop).then(function () {
-        return storage.removeItem(sideStorageLicenseKey)["catch"](noop).then(function () {
-          return JSON.parse(sideStorage);
-        })["catch"](noop);
-      });
+  var getSideStorage = function getSideStorage(store) {
+    return storage.getItem(getSideStorageKey(store))["catch"](noop).then(function (sideStorage) {
+      return JSON.parse(sideStorage || '{}');
     })
     // shouldnt get triggered, just a defensive measure against malformed storage entries
-    ["catch"](noop);
+    ["catch"](function () {
+      return {};
+    });
   };
   var saveSideStorage = function saveSideStorage(store, sideStorage) {
-    storage.setItem(getSideStorageKeyByOrganization(store), JSON.stringify(sideStorage))["catch"](noop);
+    return storage.setItem(getSideStorageKey(store), JSON.stringify(sideStorage))["catch"](noop);
   };
 
   var taskChain = function taskChain(_ref, onSuccess, onError) {
@@ -1871,7 +1745,7 @@
       setTimeout(resolve, ms);
     });
   };
-  function createLoginTask(auth, customerDataProvider, licenseId) {
+  function createLoginTask(auth, customerDataProvider) {
     var store;
     var sentPage = null;
     var task;
@@ -1892,7 +1766,7 @@
       return store.dispatch(reconnect(currentBackoffStrategy.duration()));
     };
     var getTokenAndSideStorage = function getTokenAndSideStorage() {
-      return Promise.all([auth.getToken(), getSideStorage(store, licenseId)]);
+      return Promise.all([auth.getToken(), getSideStorage(store)]);
     };
     var dispatchSelfId = function dispatchSelfId(_ref2) {
       var token = _ref2[0],
@@ -2032,7 +1906,7 @@
         return;
       }
       var query = buildQueryString({
-        organization_id: state.organizationId
+        license_id: state.licenseId
       });
       var payload = {
         session_fields: parseCustomerSessionFields(sessionFields || {}),
@@ -2531,11 +2405,11 @@
         {
           var upgradedPushes = [];
           socket.emit(_extends({}, frame, {
-            version: '3.4',
+            version: '3.3',
             payload: _extends({}, frame.payload, {
               pushes: {
-                // '3.5': upgradedPushes,
-                '3.4': values(serverPushActions).filter(function (pushAction) {
+                // '3.4': upgradedPushes,
+                '3.3': values(serverPushActions).filter(function (pushAction) {
                   return (
                     // `customer_disconnected` can be sent immediately after opening the connection, before it even received login request
                     // therefore it's not possible to subscribe for a particular version of this push - the "connection version" is always used
@@ -2705,10 +2579,9 @@
     var auth = _ref9.auth,
       customerDataProvider = _ref9.customerDataProvider,
       emitter = _ref9.emitter,
-      socket = _ref9.socket,
-      licenseId = _ref9.licenseId;
+      socket = _ref9.socket;
     var emit = emitter.emit;
-    var loginTask = createLoginTask(auth, customerDataProvider, licenseId);
+    var loginTask = createLoginTask(auth, customerDataProvider);
 
     // TODO: using Store type here is a lie, middleware only provides MiddlewareAPI here
     return function (action, store) {
@@ -3120,14 +2993,14 @@
         resolve = noop;
       },
       check: function check() {
-        var deferred = promiseDeferred();
-        resolve = deferred.resolve;
+        var deferred$1 = deferred();
+        resolve = deferred$1.resolve;
         timer = setTimeout(function () {
           var err = new Error('Timeout.');
           err.code = 'TIMEOUT';
-          deferred.reject(err);
+          deferred$1.reject(err);
         }, 2000);
-        return deferred.promise;
+        return deferred$1.promise;
       },
       resolve: function (_resolve) {
         function resolve() {
@@ -3229,7 +3102,7 @@
     var url = (getServerUrl(state) + "/rtm/ws").replace(/^https/, 'wss');
     return createPlatformClient(url, {
       query: {
-        organization_id: state.organizationId
+        license_id: state.licenseId
       },
       emitter: emitter
     });
@@ -3521,17 +3394,16 @@
       var lastEventSummary = last(lastEventSummariesArray.sort(function (eventSummaryA, eventSummaryB) {
         return eventSummaryA.thread_id === eventSummaryB.thread_id ? stringCompare(eventSummaryA.event.created_at, eventSummaryB.event.created_at) : stringCompare(eventSummaryA.thread_created_at, eventSummaryB.thread_created_at);
       }));
-      if (lastEventSummary && chatSummary.lastEventsPerType) {
+      if (lastEventSummary) {
         chatSummary.lastEvent = chatSummary.lastEventsPerType[lastEventSummary.event.type];
       }
       return chatSummary;
     });
     return {
       chatsSummary: numericSortBy(function (_ref4) {
-        var _ref5;
         var lastEvent = _ref4.lastEvent,
           order = _ref4.order;
-        return -1 * ((_ref5 = lastEvent !== undefined ? lastEvent.timestamp : order) != null ? _ref5 : 0);
+        return -1 * (lastEvent !== undefined ? lastEvent.timestamp : order);
       }, chatsSummary),
       totalChats: payload.total_chats,
       users: uniqBy(function (user) {
@@ -3708,9 +3580,9 @@
         };
     }
   };
-  var parseResponse = function parseResponse(_ref6) {
-    var request = _ref6.request,
-      response = _ref6.response;
+  var parseResponse = function parseResponse(_ref5) {
+    var request = _ref5.request,
+      response = _ref5.response;
     switch (response.action) {
       case ACCEPT_GREETING:
         return {
@@ -3964,10 +3836,9 @@
       customerId = _ref.customerId,
       _ref$groupId = _ref.groupId,
       groupId = _ref$groupId === void 0 ? state.groupId : _ref$groupId,
-      licenseId = _ref.licenseId,
       timeZone = _ref.timeZone;
     var ticketBody = _extends({
-      licence_id: licenseId,
+      licence_id: state.licenseId,
       ticket_message: '',
       offline_message: '',
       visitor_id: customerId,
@@ -4047,7 +3918,6 @@
   var sendTicketForm = function sendTicketForm(store, auth, _ref2) {
     var filledForm = _ref2.filledForm,
       groupId = _ref2.groupId,
-      licenseId = _ref2.licenseId,
       timeZone = _ref2.timeZone;
     return auth.getToken().then(function (token) {
       var state = store.getState();
@@ -4059,7 +3929,6 @@
         fields: filledForm.fields,
         customerId: token.entityId,
         groupId: groupId,
-        licenseId: licenseId,
         timeZone: timeZone
       });
       return unfetch(url, {
@@ -4211,7 +4080,7 @@
       validateFile(file);
       var state = store.getState();
       var query = buildQueryString({
-        organization_id: state.organizationId
+        license_id: state.licenseId
       });
       var url = getServerUrl(state) + "/action/" + UPLOAD_FILE + "?" + query;
       var payload = {
@@ -4277,7 +4146,7 @@
    */
   var log = function log(_ref) {
     var env = _ref.env,
-      organizationId = _ref.organizationId,
+      licenseId = _ref.licenseId,
       eventName = _ref.eventName;
     if (env !== 'production' || "customer_sdk" !== 'customer_sdk') {
       return Promise.resolve();
@@ -4285,10 +4154,10 @@
     var message = {
       event_name: eventName,
       severity: 'Informational',
-      sdkVersion: "3.1.3"
+      sdkVersion: "3.1.5"
     };
     var body = {
-      organizationId: organizationId,
+      licence_id: licenseId,
       event_id: 'chat_widget_customer_sdk',
       message: JSON.stringify(message)
     };
@@ -4403,7 +4272,7 @@
   });
 
   var CHATS_PAGINATION_MAX_LIMIT = 25;
-  var init = function init(config, env, licenseId) {
+  var init = function init(config, env) {
     if (env === void 0) {
       env = 'production';
     }
@@ -4418,13 +4287,12 @@
     }));
     var emitter = createMitt();
     var socket = createSocketClient(store);
-    var auth = typeof identityProvider === 'function' ? identityProvider() : createAuth(instanceConfig, licenseId, env);
+    var auth = typeof identityProvider === 'function' ? identityProvider() : createAuth(instanceConfig, env);
     store.addSideEffectsHandler(createSideEffectsHandler({
       emitter: emitter,
       socket: socket,
       auth: auth,
-      customerDataProvider: customerDataProvider,
-      licenseId: licenseId
+      customerDataProvider: customerDataProvider
     }));
     socketListener(store, socket);
     var sendRequestAction$1 = sendRequestAction.bind(null, store);
@@ -4623,7 +4491,7 @@
       resumeChat: function resumeChat(data) {
         log({
           env: env,
-          organizationId: config.organizationId,
+          licenseId: config.licenseId,
           eventName: 'chat_started'
         });
         return sendRequestAction$1(sendRequest(RESUME_CHAT, parseResumeChatData(data)));
@@ -4678,7 +4546,7 @@
         }
         log({
           env: env,
-          organizationId: config.organizationId,
+          licenseId: config.licenseId,
           eventName: 'chat_started'
         });
         return sendRequestAction$1(sendRequest(START_CHAT, parseStartChatData(data)));