coveo.analytics 2.26.3 → 2.26.5

package/dist/definitions/client/analytics.d.ts

@@ -110,6 +110,7 @@ export declare class CoveoAnalyticsClient implements AnalyticsClient, VisitorIdP
     private lowercaseKeys;
     private validateParams;
     private ensureAnonymousUserWhenUsingApiKey;
+    private limit;
     private get baseUrl();
 }
 export default CoveoAnalyticsClient;

package/dist/definitions/version.d.ts

@@ -1 +1 @@
-export declare const libVersion = "2.26.3";
+export declare const libVersion = "2.26.5";

package/dist/library.es.js

@@ -593,7 +593,7 @@ function sha1(bytes) {
 const v5 = v35('v5', 0x50, sha1);
 var uuidv5 = v5;
 
-const libVersion = "2.26.3" ;
+const libVersion = "2.26.5" ;
 
 const getFormattedLocation = (location) => `${location.protocol}//${location.hostname}${location.pathname.indexOf('/') === 0 ? location.pathname : `/${location.pathname}`}${location.search}`;
 
@@ -1377,7 +1377,7 @@ class CoveoAnalyticsClient {
         return __awaiter(this, void 0, void 0, function* () {
             const { usesMeasurementProtocol = false } = this.eventTypeMapping[eventType] || {};
             const cleanPayloadStep = (currentPayload) => this.removeEmptyPayloadValues(currentPayload, eventType);
-            const validateParams = (currentPayload) => this.validateParams(currentPayload);
+            const validateParams = (currentPayload) => this.validateParams(currentPayload, eventType);
             const processMeasurementProtocolConversionStep = (currentPayload) => usesMeasurementProtocol ? convertKeysToMeasurementProtocol(currentPayload) : currentPayload;
             const removeUnknownParameters = (currentPayload) => usesMeasurementProtocol ? this.removeUnknownParameters(currentPayload) : currentPayload;
             const processCustomParameters = (currentPayload) => usesMeasurementProtocol
@@ -1579,13 +1579,27 @@ class CoveoAnalyticsClient {
         });
         return result;
     }
-    validateParams(payload) {
+    validateParams(payload, eventType) {
         const { anonymizeIp } = payload, rest = __rest(payload, ["anonymizeIp"]);
         if (anonymizeIp !== undefined) {
             if (['0', 'false', 'undefined', 'null', '{}', '[]', ''].indexOf(`${anonymizeIp}`.toLowerCase()) == -1) {
-                rest['anonymizeIp'] = 1;
+                rest.anonymizeIp = 1;
             }
         }
+        if (eventType == EventType.view ||
+            eventType == EventType.click ||
+            eventType == EventType.search ||
+            eventType == EventType.custom) {
+            rest.originLevel3 = this.limit(rest.originLevel3, 128);
+        }
+        if (eventType == EventType.view) {
+            rest.location = this.limit(rest.location, 128);
+        }
+        if (eventType == 'pageview' || eventType == 'event') {
+            rest.referrer = this.limit(rest.referrer, 2048);
+            rest.location = this.limit(rest.location, 2048);
+            rest.page = this.limit(rest.page, 2048);
+        }
         return rest;
     }
     ensureAnonymousUserWhenUsingApiKey(payload) {
@@ -1598,6 +1612,12 @@ class CoveoAnalyticsClient {
             return payload;
         }
     }
+    limit(input, length) {
+        if (typeof input !== 'string') {
+            return input;
+        }
+        return input.substring(0, length);
+    }
     get baseUrl() {
         return buildBaseUrl(this.options.endpoint, this.options.version);
     }

package/dist/library.js

@@ -740,7 +740,7 @@ function sha1(bytes) {
 const v5 = v35('v5', 0x50, sha1);
 var uuidv5 = v5;
 
-var libVersion = "2.26.3" ;
+var libVersion = "2.26.5" ;
 
 var getFormattedLocation = function (location) {
     return location.protocol + "//" + location.hostname + (location.pathname.indexOf('/') === 0 ? location.pathname : "/" + location.pathname) + location.search;
@@ -83306,7 +83306,7 @@ var CoveoAnalyticsClient = (function () {
                         cleanPayloadStep = function (currentPayload) {
                             return _this.removeEmptyPayloadValues(currentPayload, eventType);
                         };
-                        validateParams = function (currentPayload) { return _this.validateParams(currentPayload); };
+                        validateParams = function (currentPayload) { return _this.validateParams(currentPayload, eventType); };
                         processMeasurementProtocolConversionStep = function (currentPayload) {
                             return usesMeasurementProtocol ? convertKeysToMeasurementProtocol(currentPayload) : currentPayload;
                         };
@@ -83617,13 +83617,27 @@ var CoveoAnalyticsClient = (function () {
         });
         return result;
     };
-    CoveoAnalyticsClient.prototype.validateParams = function (payload) {
+    CoveoAnalyticsClient.prototype.validateParams = function (payload, eventType) {
         var anonymizeIp = payload.anonymizeIp, rest = __rest(payload, ["anonymizeIp"]);
         if (anonymizeIp !== undefined) {
             if (['0', 'false', 'undefined', 'null', '{}', '[]', ''].indexOf(("" + anonymizeIp).toLowerCase()) == -1) {
-                rest['anonymizeIp'] = 1;
+                rest.anonymizeIp = 1;
             }
         }
+        if (eventType == EventType.view ||
+            eventType == EventType.click ||
+            eventType == EventType.search ||
+            eventType == EventType.custom) {
+            rest.originLevel3 = this.limit(rest.originLevel3, 128);
+        }
+        if (eventType == EventType.view) {
+            rest.location = this.limit(rest.location, 128);
+        }
+        if (eventType == 'pageview' || eventType == 'event') {
+            rest.referrer = this.limit(rest.referrer, 2048);
+            rest.location = this.limit(rest.location, 2048);
+            rest.page = this.limit(rest.page, 2048);
+        }
         return rest;
     };
     CoveoAnalyticsClient.prototype.ensureAnonymousUserWhenUsingApiKey = function (payload) {
@@ -83636,6 +83650,12 @@ var CoveoAnalyticsClient = (function () {
             return payload;
         }
     };
+    CoveoAnalyticsClient.prototype.limit = function (input, length) {
+        if (typeof input !== 'string') {
+            return input;
+        }
+        return input.substring(0, length);
+    };
     Object.defineProperty(CoveoAnalyticsClient.prototype, "baseUrl", {
         get: function () {
             return buildBaseUrl(this.options.endpoint, this.options.version);

package/dist/react-native.es.js

@@ -655,7 +655,7 @@ const addPageViewToHistory = (pageViewValue) => __awaiter(void 0, void 0, void 0
     yield store.addElementAsync(historyElement);
 });
 
-const libVersion = "2.26.3" ;
+const libVersion = "2.26.5" ;
 
 const getFormattedLocation = (location) => `${location.protocol}//${location.hostname}${location.pathname.indexOf('/') === 0 ? location.pathname : `/${location.pathname}`}${location.search}`;
 
@@ -1378,7 +1378,7 @@ class CoveoAnalyticsClient {
         return __awaiter(this, void 0, void 0, function* () {
             const { usesMeasurementProtocol = false } = this.eventTypeMapping[eventType] || {};
             const cleanPayloadStep = (currentPayload) => this.removeEmptyPayloadValues(currentPayload, eventType);
-            const validateParams = (currentPayload) => this.validateParams(currentPayload);
+            const validateParams = (currentPayload) => this.validateParams(currentPayload, eventType);
             const processMeasurementProtocolConversionStep = (currentPayload) => usesMeasurementProtocol ? convertKeysToMeasurementProtocol(currentPayload) : currentPayload;
             const removeUnknownParameters = (currentPayload) => usesMeasurementProtocol ? this.removeUnknownParameters(currentPayload) : currentPayload;
             const processCustomParameters = (currentPayload) => usesMeasurementProtocol
@@ -1580,13 +1580,27 @@ class CoveoAnalyticsClient {
         });
         return result;
     }
-    validateParams(payload) {
+    validateParams(payload, eventType) {
         const { anonymizeIp } = payload, rest = __rest(payload, ["anonymizeIp"]);
         if (anonymizeIp !== undefined) {
             if (['0', 'false', 'undefined', 'null', '{}', '[]', ''].indexOf(`${anonymizeIp}`.toLowerCase()) == -1) {
-                rest['anonymizeIp'] = 1;
+                rest.anonymizeIp = 1;
             }
         }
+        if (eventType == EventType.view ||
+            eventType == EventType.click ||
+            eventType == EventType.search ||
+            eventType == EventType.custom) {
+            rest.originLevel3 = this.limit(rest.originLevel3, 128);
+        }
+        if (eventType == EventType.view) {
+            rest.location = this.limit(rest.location, 128);
+        }
+        if (eventType == 'pageview' || eventType == 'event') {
+            rest.referrer = this.limit(rest.referrer, 2048);
+            rest.location = this.limit(rest.location, 2048);
+            rest.page = this.limit(rest.page, 2048);
+        }
         return rest;
     }
     ensureAnonymousUserWhenUsingApiKey(payload) {
@@ -1599,6 +1613,12 @@ class CoveoAnalyticsClient {
             return payload;
         }
     }
+    limit(input, length) {
+        if (typeof input !== 'string') {
+            return input;
+        }
+        return input.substring(0, length);
+    }
     get baseUrl() {
         return buildBaseUrl(this.options.endpoint, this.options.version);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "coveo.analytics",
-    "version": "2.26.3",
+    "version": "2.26.5",
     "description": "📈 Coveo analytics client (node and browser compatible) ",
     "main": "dist/library.js",
     "module": "dist/library.es.js",

package/src/caseAssist/caseAssistClient.spec.ts

@@ -6,7 +6,7 @@ import {
     DocumentSuggestion,
     FieldSuggestion,
 } from './caseAssistActions';
-import {mockFetch} from '../../tests/fetchMock';
+import {mockFetch, lastCallBody} from '../../tests/fetchMock';
 import {TicketProperties} from '../plugins/svc';
 const {fetchMock, fetchMockBeforeEach} = mockFetch();
 import doNotTrack from '../donottrack';
@@ -90,8 +90,8 @@ describe('CaseAssistClient', () => {
     };
 
     const expectMatchPayload = (actionName: CaseAssistActions, actionData: Object, ticket: TicketProperties) => {
-        const [, {body}] = fetchMock.lastCall();
-        const content = JSON.parse(body.toString());
+        const body: string = lastCallBody(fetchMock);
+        const content = JSON.parse(body);
 
         expectMatchActionPayload(content, actionName, actionData);
         expectMatchTicketPayload(content, ticket);
@@ -125,7 +125,7 @@ describe('CaseAssistClient', () => {
         if (typeof propValue !== 'undefined') {
             if (typeof propValue === 'object') {
                 expect(content).toHaveProperty(propName);
-                expect(content[propName]).toMatchObject(propValue);
+                expect(content[propName]).toMatchObject(propValue as object);
             } else {
                 expect(content).toHaveProperty(propName, propValue);
             }

package/src/client/analytics.spec.ts

@@ -7,7 +7,6 @@ import {mockFetch} from '../../tests/fetchMock';
 import {BrowserRuntime} from './runtimeEnvironment';
 import * as doNotTrack from '../donottrack';
 import {Cookie} from '../cookieutils';
-import {v4 as uuidv4} from 'uuid';
 import {CoveoLinkParam} from '../plugins/link';
 
 const aVisitorId = '123';
@@ -144,6 +143,42 @@ describe('Analytics', () => {
         });
     });
 
+    describe('should truncate the maxlength for URL parameters at 128 characters for ua events', () => {
+        const desiredMax: number = 128;
+        const longUrl: string = 'http://coveo.com/?q=' + 'a'.repeat(desiredMax);
+        expect(longUrl.length).toBeGreaterThan(desiredMax);
+        async function testEventType(type: EventType, url: string) {
+            mockFetchRequestForEventType(type);
+            await client.sendEvent(type, {
+                location: type == EventType.view ? url : undefined,
+                originLevel3: url,
+            });
+            const [body] = getParsedBodyCalls();
+            if (type == EventType.view) expect(body.location.length).toBeLessThanOrEqual(desiredMax);
+            expect(body.originLevel3.length).toBeLessThanOrEqual(desiredMax);
+        }
+        it('for view events', () => testEventType(EventType.view, longUrl));
+        it('for click events', () => testEventType(EventType.click, longUrl));
+        it('for search events', () => testEventType(EventType.search, longUrl));
+        it('for custom events', () => testEventType(EventType.custom, longUrl));
+    });
+
+    describe('url truncation is null safe', () => {
+        async function testAttributeTruncation(url: any) {
+            mockFetchRequestForEventType(EventType.view);
+            await client.sendEvent(EventType.view, {
+                location: url,
+                originLevel3: url,
+            });
+            const [body] = getParsedBodyCalls();
+            expect(body.location).toBe(url == null ? undefined : url);
+            expect(body.originLevel3).toBe(url == null ? undefined : url);
+        }
+        it('for undefined urls', () => testAttributeTruncation(undefined));
+        it('for null urls', () => testAttributeTruncation(null));
+        it('for non-string urls', () => testAttributeTruncation(12345));
+    });
+
     it('should not remove #queryText for search events even if empty', async () => {
         mockFetchRequestForEventType(EventType.search);
         await client.sendEvent(EventType.search, {

package/src/client/analytics.ts

@@ -337,7 +337,7 @@ export class CoveoAnalyticsClient implements AnalyticsClient, VisitorIdProvider
 
         const cleanPayloadStep: ProcessPayloadStep = (currentPayload) =>
             this.removeEmptyPayloadValues(currentPayload, eventType);
-        const validateParams: ProcessPayloadStep = (currentPayload) => this.validateParams(currentPayload);
+        const validateParams: ProcessPayloadStep = (currentPayload) => this.validateParams(currentPayload, eventType);
         const processMeasurementProtocolConversionStep: ProcessPayloadStep = (currentPayload) =>
             usesMeasurementProtocol ? convertKeysToMeasurementProtocol(currentPayload) : currentPayload;
         const removeUnknownParameters: ProcessPayloadStep = (currentPayload) =>
@@ -577,13 +577,30 @@ export class CoveoAnalyticsClient implements AnalyticsClient, VisitorIdProvider
         return result;
     }
 
-    private validateParams(payload: IRequestPayload): IRequestPayload {
+    private validateParams(payload: IRequestPayload, eventType: EventType | string): IRequestPayload {
         const {anonymizeIp, ...rest} = payload;
         if (anonymizeIp !== undefined) {
             if (['0', 'false', 'undefined', 'null', '{}', '[]', ''].indexOf(`${anonymizeIp}`.toLowerCase()) == -1) {
-                rest['anonymizeIp'] = 1;
+                rest.anonymizeIp = 1;
             }
         }
+
+        if (
+            eventType == EventType.view ||
+            eventType == EventType.click ||
+            eventType == EventType.search ||
+            eventType == EventType.custom
+        ) {
+            rest.originLevel3 = this.limit(rest.originLevel3, 128);
+        }
+        if (eventType == EventType.view) {
+            rest.location = this.limit(rest.location, 128);
+        }
+        if (eventType == 'pageview' || eventType == 'event') {
+            rest.referrer = this.limit(rest.referrer, 2048);
+            rest.location = this.limit(rest.location, 2048);
+            rest.page = this.limit(rest.page, 2048);
+        }
         return rest;
     }
 
@@ -597,6 +614,13 @@ export class CoveoAnalyticsClient implements AnalyticsClient, VisitorIdProvider
         }
     }
 
+    private limit(input: string, length: number): string | undefined | null {
+        if (typeof input !== 'string') {
+            return input;
+        }
+        return input.substring(0, length);
+    }
+
     private get baseUrl(): string {
         return buildBaseUrl(this.options.endpoint, this.options.version);
     }

package/src/coveoua/simpleanalytics.spec.ts

@@ -3,7 +3,7 @@ import {createAnalyticsClientMock, visitorIdMock} from '../../tests/analyticsCli
 import {TestPlugin} from '../../tests/pluginMock';
 import {v4 as uuidv4} from 'uuid';
 import {PluginOptions} from '../plugins/BasePlugin';
-import {mockFetch} from '../../tests/fetchMock';
+import {mockFetch, lastCallBody} from '../../tests/fetchMock';
 import {CookieStorage} from '../storage';
 import {libVersion} from '../version';
 
@@ -194,7 +194,7 @@ describe('simpleanalytics', () => {
 
             expect(fetchMock.calls().length).toBe(1);
             expect(fetchMock.lastUrl()).toBe(`${analyticsEndpoint}/pageview`);
-            expect(JSON.parse(fetchMock.lastCall()![1]!.body!.toString())).toEqual({somedata: 'asd'});
+            expect(JSON.parse(lastCallBody(fetchMock))).toEqual({somedata: 'asd'});
         });
 
         it('can send view event with clientId', async () => {
@@ -203,7 +203,7 @@ describe('simpleanalytics', () => {
 
             expect(fetchMock.calls().length).toBe(1);
             expect(fetchMock.lastUrl()).toBe(`${analyticsEndpoint}/view?visitor=${visitorIdMock}`);
-            expect(JSON.parse(fetchMock.lastCall()![1]!.body!.toString()).clientId).toBe(visitorIdMock);
+            expect(JSON.parse(lastCallBody(fetchMock)).clientId).toBe(visitorIdMock);
         });
 
         it('can send any event to the endpoint', async () => {
@@ -221,6 +221,32 @@ describe('simpleanalytics', () => {
             expect(fetchMock.calls().length).toBe(1);
             expect(fetchMock.lastUrl()).toBe(`https://myproxyendpoint.com/rest/v15/analytics/${someRandomEventName}`);
         });
+
+        describe('will restrict referrers and url lengths', () => {
+            const max: number = 2048;
+            const reallyLongPath1: string = 'http://coveo.com/?q=' + 'a'.repeat(max);
+            const reallyLongPath2: string = 'http://coveo.com/?q=' + 'b'.repeat(max);
+            expect(reallyLongPath1.length).toBeGreaterThan(max);
+            expect(reallyLongPath2.length).toBeGreaterThan(max);
+            it('does this for pageviews', async () => {
+                coveoua('init', 'MYTOKEN');
+                await coveoua('send', 'pageview', reallyLongPath1);
+                await coveoua('send', 'pageview', reallyLongPath2);
+                const body = JSON.parse(lastCallBody(fetchMock));
+                expect(body.dr.length).toBeLessThanOrEqual(max);
+                expect(body.dl.length).toBeLessThanOrEqual(max);
+                expect(body.dp.length).toBeLessThanOrEqual(max);
+            });
+            it('does this for generic events', async () => {
+                coveoua('init', 'MYTOKEN');
+                await coveoua('send', 'pageview', reallyLongPath1);
+                await coveoua('send', 'pageview', reallyLongPath2);
+                await coveoua('send', 'event');
+                const body = JSON.parse(lastCallBody(fetchMock));
+                expect(body.dr.length).toBeLessThanOrEqual(max);
+                expect(body.dl.length).toBeLessThanOrEqual(max);
+            });
+        });
     });
 
     describe('set', () => {
@@ -231,7 +257,7 @@ describe('simpleanalytics', () => {
 
             expect(fetchMock.calls().length).toBe(1);
             expect(fetchMock.lastUrl()).toBe(`${analyticsEndpoint}/${someRandomEventName}`);
-            expect(JSON.parse(fetchMock.lastCall()![1]!.body!.toString())).toEqual({userId: 'something'});
+            expect(JSON.parse(lastCallBody(fetchMock))).toEqual({userId: 'something'});
         });
 
         it('can set parameters using an object', async () => {
@@ -243,7 +269,7 @@ describe('simpleanalytics', () => {
 
             expect(fetchMock.calls().length).toBe(1);
             expect(fetchMock.lastUrl()).toBe(`${analyticsEndpoint}/${someRandomEventName}`);
-            expect(JSON.parse(fetchMock.lastCall()![1]!.body!.toString())).toEqual({userId: 'something'});
+            expect(JSON.parse(lastCallBody(fetchMock))).toEqual({userId: 'something'});
         });
 
         it('can set a custom_website parameter on a collect event', async () => {
@@ -252,7 +278,7 @@ describe('simpleanalytics', () => {
             await coveoua('send', 'pageview');
 
             expect(fetchMock.calls().length).toBe(1);
-            let result = JSON.parse(fetchMock.lastCall()![1]!.body!.toString());
+            let result = JSON.parse(lastCallBody(fetchMock));
             expect(result).toHaveProperty('context_website', 'MY_WEBSITE');
         });
 
@@ -262,7 +288,7 @@ describe('simpleanalytics', () => {
             await coveoua('send', 'pageview');
 
             expect(fetchMock.calls().length).toBe(1);
-            let result = JSON.parse(fetchMock.lastCall()![1]!.body!.toString());
+            let result = JSON.parse(lastCallBody(fetchMock));
             expect(Object.keys(result).length).toBe(11);
         });
 
@@ -272,7 +298,7 @@ describe('simpleanalytics', () => {
             await coveoua('send', 'pageview');
 
             expect(fetchMock.calls().length).toBe(1);
-            let result = JSON.parse(fetchMock.lastCall()![1]!.body!.toString());
+            let result = JSON.parse(lastCallBody(fetchMock));
             expect(Object.keys(result).length).toBe(11);
         });
 
@@ -282,7 +308,7 @@ describe('simpleanalytics', () => {
             await coveoua('send', 'pageview');
 
             expect(fetchMock.calls().length).toBe(1);
-            let result = JSON.parse(fetchMock.lastCall()![1]!.body!.toString());
+            let result = JSON.parse(lastCallBody(fetchMock));
             expect(Object.keys(result).length).toBe(11);
         });
 
@@ -292,7 +318,7 @@ describe('simpleanalytics', () => {
             await coveoua('send', 'pageview');
 
             expect(fetchMock.calls().length).toBe(1);
-            let result = JSON.parse(fetchMock.lastCall()![1]!.body!.toString());
+            let result = JSON.parse(lastCallBody(fetchMock));
             expect(Object.keys(result).length).toBe(11);
         });
 
@@ -302,7 +328,7 @@ describe('simpleanalytics', () => {
             await coveoua('send', 'view', {somedata: 'something'});
 
             expect(fetchMock.calls().length).toBe(1);
-            let result = JSON.parse(fetchMock.lastCall()![1]!.body!.toString());
+            let result = JSON.parse(lastCallBody(fetchMock));
             expect(result).toHaveProperty('somedata', 'something');
             expect(result).toHaveProperty('customData.context_website', 'MY_WEBSITE');
         });
@@ -313,7 +339,7 @@ describe('simpleanalytics', () => {
             await coveoua('send', 'view', {somedata: 'something'});
 
             expect(fetchMock.calls().length).toBe(1);
-            let result = JSON.parse(fetchMock.lastCall()![1]!.body!.toString());
+            let result = JSON.parse(lastCallBody(fetchMock));
             expect(result).toHaveProperty('somedata', 'something');
             expect(result).not.toHaveProperty('customData');
         });
@@ -324,7 +350,7 @@ describe('simpleanalytics', () => {
             await coveoua('send', 'view', {somedata: 'something'});
 
             expect(fetchMock.calls().length).toBe(1);
-            let result = JSON.parse(fetchMock.lastCall()![1]!.body!.toString());
+            let result = JSON.parse(lastCallBody(fetchMock));
             expect(result).toHaveProperty('somedata', 'something');
             expect(result).not.toHaveProperty('customData');
         });
@@ -335,7 +361,7 @@ describe('simpleanalytics', () => {
             await coveoua('send', 'view', {somedata: 'something'});
 
             expect(fetchMock.calls().length).toBe(1);
-            let result = JSON.parse(fetchMock.lastCall()![1]!.body!.toString());
+            let result = JSON.parse(lastCallBody(fetchMock));
             expect(result).toHaveProperty('somedata', 'something');
             expect(result).not.toHaveProperty('customData');
         });
@@ -346,7 +372,7 @@ describe('simpleanalytics', () => {
             await coveoua('send', 'view', {somedata: 'something'});
 
             expect(fetchMock.calls().length).toBe(1);
-            let result = JSON.parse(fetchMock.lastCall()![1]!.body!.toString());
+            let result = JSON.parse(lastCallBody(fetchMock));
             expect(result).toHaveProperty('somedata', 'something');
             expect(result).not.toHaveProperty('customData');
         });
@@ -357,7 +383,7 @@ describe('simpleanalytics', () => {
             await coveoua('send', 'view', {somedata: 'something', customData: {context_website: 'MY_OTHER_WEBSITE'}});
 
             expect(fetchMock.calls().length).toBe(1);
-            let result = JSON.parse(fetchMock.lastCall()![1]!.body!.toString());
+            let result = JSON.parse(lastCallBody(fetchMock));
             expect(result).toHaveProperty('somedata', 'something');
             expect(result).toHaveProperty('customData.context_website', 'MY_OTHER_WEBSITE');
         });
@@ -471,7 +497,7 @@ describe('simpleanalytics', () => {
 
             expect(fetchMock.calls().length).toBe(1);
             expect(fetchMock.lastUrl()).toBe(`${analyticsEndpoint}/${someRandomEventName}`);
-            expect(JSON.parse(fetchMock.lastCall()![1]!.body!.toString())).toEqual({});
+            expect(JSON.parse(lastCallBody(fetchMock))).toEqual({});
         });
     });
 

package/src/donottrack.spec.ts

@@ -16,25 +16,25 @@ describe('doNotTrack', () => {
         if (hasNav) {
             Object.defineProperty(<any>navigator, 'globalPrivacyControl', {
                 get() {
-                    return options.navigatorGlobalPrivacyControl;
+                    return options!.navigatorGlobalPrivacyControl;
                 },
                 configurable: true,
             });
             Object.defineProperty(<any>navigator, 'doNotTrack', {
                 get() {
-                    return options.navigatorDoNotTrack;
+                    return options!.navigatorDoNotTrack;
                 },
                 configurable: true,
             });
             Object.defineProperty(<any>navigator, 'msDoNotTrack', {
                 get() {
-                    return options.navigatorMsDoNotTrack;
+                    return options!.navigatorMsDoNotTrack;
                 },
                 configurable: true,
             });
             Object.defineProperty(<any>window, 'doNotTrack', {
                 get() {
-                    return options.windowDoNotTrack;
+                    return options!.windowDoNotTrack;
                 },
                 configurable: true,
             });

package/src/insight/insightClient.spec.ts

@@ -1,4 +1,4 @@
-import {mockFetch} from '../../tests/fetchMock';
+import {lastCallBody, mockFetch} from '../../tests/fetchMock';
 import CoveoAnalyticsClient from '../client/analytics';
 import {NoopAnalytics} from '../client/noopAnalytics';
 import {
@@ -77,9 +77,9 @@ describe('InsightClient', () => {
     });
 
     const expectMatchPayload = (actionCause: SearchPageEvents | InsightEvents, meta = {}) => {
-        const [, {body}] = fetchMock.lastCall();
+        const body: string = lastCallBody(fetchMock);
         const customData = {foo: 'bar', ...meta};
-        expect(JSON.parse(body.toString())).toMatchObject({
+        expect(JSON.parse(body)).toMatchObject({
             queryText: 'queryText',
             responseTime: 123,
             queryPipeline: 'my-pipeline',
@@ -93,9 +93,9 @@ describe('InsightClient', () => {
     };
 
     const expectMatchCustomEventPayload = (actionCause: SearchPageEvents | InsightEvents, meta = {}) => {
-        const [, {body}] = fetchMock.lastCall();
+        const body: string = lastCallBody(fetchMock);
         const customData = {foo: 'bar', ...meta};
-        expect(JSON.parse(body.toString())).toMatchObject({
+        expect(JSON.parse(body)).toMatchObject({
             eventValue: actionCause,
             eventType: CustomEventsTypes[actionCause],
             lastSearchQueryUid: 'my-uid',
@@ -107,7 +107,7 @@ describe('InsightClient', () => {
     };
 
     const expectMatchDocumentPayload = (actionCause: SearchPageEvents, doc: PartialDocumentInformation, meta = {}) => {
-        const [, {body}] = fetchMock.lastCall();
+        const body: string = lastCallBody(fetchMock);
         const customData = {foo: 'bar', ...meta};
         expect(JSON.parse(body.toString())).toMatchObject({
             actionCause,

package/src/searchPage/searchPageClient.spec.ts

@@ -3,13 +3,12 @@ import {
     SearchPageEvents,
     PartialDocumentInformation,
     CustomEventsTypes,
-    SmartSnippetFeedbackReason,
     OmniboxSuggestionsMetadata,
     StaticFilterToggleValueMetadata,
 } from './searchPageEvents';
 import CoveoAnalyticsClient from '../client/analytics';
 import {NoopAnalytics} from '../client/noopAnalytics';
-import {mockFetch} from '../../tests/fetchMock';
+import {mockFetch, lastCallBody} from '../../tests/fetchMock';
 import doNotTrack from '../donottrack';
 jest.mock('../donottrack', () => {
     return {
@@ -114,9 +113,9 @@ describe('SearchPageClient', () => {
     });
 
     const expectMatchPayload = (actionCause: SearchPageEvents, meta = {}) => {
-        const [, {body}] = fetchMock.lastCall();
+        const body: string = lastCallBody(fetchMock);
         const customData = {foo: 'bar', ...customDataFromMiddleware, ...meta};
-        expect(JSON.parse(body.toString())).toEqual({
+        expect(JSON.parse(body)).toEqual({
             queryText: 'queryText',
             responseTime: 123,
             searchQueryUid: provider.getSearchUID(),
@@ -142,9 +141,9 @@ describe('SearchPageClient', () => {
     };
 
     const expectMatchDocumentPayload = (actionCause: SearchPageEvents, doc: PartialDocumentInformation, meta = {}) => {
-        const [, {body}] = fetchMock.lastCall();
+        const body: string = lastCallBody(fetchMock);
         const customData = {foo: 'bar', ...customDataFromMiddleware, ...meta};
-        expect(JSON.parse(body.toString())).toEqual({
+        expect(JSON.parse(body)).toEqual({
             anonymous: false,
             actionCause,
             customData,
@@ -164,9 +163,9 @@ describe('SearchPageClient', () => {
         meta = {},
         eventType = CustomEventsTypes[actionCause]
     ) => {
-        const [, {body}] = fetchMock.lastCall();
+        const body: string = lastCallBody(fetchMock);
         const customData = {foo: 'bar', ...customDataFromMiddleware, ...meta};
-        expect(JSON.parse(body.toString())).toEqual({
+        expect(JSON.parse(body)).toEqual({
             anonymous: false,
             eventValue: actionCause,
             eventType,
@@ -182,9 +181,9 @@ describe('SearchPageClient', () => {
     };
 
     const expectMatchCustomEventWithTypePayload = (eventValue: string, eventType: string, meta = {}) => {
-        const [, {body}] = fetchMock.lastCall();
+        const body: string = lastCallBody(fetchMock);
         const customData = {foo: 'bar', ...customDataFromMiddleware, ...meta};
-        expect(JSON.parse(body.toString())).toEqual({
+        expect(JSON.parse(body)).toEqual({
             anonymous: false,
             eventValue,
             eventType,