Ws 2925 inline js add static beacon

src/app/components/ATIAnalytics/canonical/index.test.tsx

@@ -79,7 +79,7 @@ describe('Canonical ATI Analytics', () => {
     const helmet = Helmet.peek();
 
     expect(helmet.scriptTags[0].innerHTML).toEqual(
-      addSendStaticBeaconToWindow(),
+      `(${addSendStaticBeaconToWindow.toString()})()`,
     );
   });
 

src/app/components/ATIAnalytics/canonical/index.tsx

@@ -59,7 +59,10 @@ const CanonicalATIAnalytics = ({ reverbParams }: ATIAnalyticsProps) => {
 
   return (
     <>
-      {addScript({ script: addSendStaticBeaconToWindow(), nonce })}
+      {addScript({
+        script: addSendStaticBeaconToWindow,
+        nonce,
+      })}
       {isLite &&
         addScript({
           script: sendPageViewBeaconLite,

src/app/lib/analyticsUtils/staticATITracking/sendStaticBeacon/index.test.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-eval */
 import sendStaticBeacon, { addSendStaticBeaconToWindow } from '.';
 
 let XMLHttpRequestSpy: jest.SpyInstance<XMLHttpRequest | undefined, []>;
@@ -12,7 +11,7 @@ describe('sendStaticBeacon', () => {
 
   beforeEach(() => {
     XMLHttpRequestSpy = jest.spyOn(window, 'XMLHttpRequest');
-    eval(addSendStaticBeaconToWindow());
+    addSendStaticBeaconToWindow();
   });
 
   afterEach(() => {
@@ -31,7 +30,7 @@ describe('sendStaticBeacon', () => {
       () => XMLHttpRequestMock as XMLHttpRequest,
     );
 
-    eval(sendStaticBeacon('https://foobar.com'));
+    sendStaticBeacon('https://foobar.com');
 
     expect(XMLHttpRequestMock.open).toHaveBeenCalledWith(
       'GET',

src/app/lib/analyticsUtils/staticATITracking/sendStaticBeacon/index.ts

@@ -1,12 +1,12 @@
-export const addSendStaticBeaconToWindow = () => `
-    window.sendStaticBeacon = function (atiUrlString) {
-        var xhr = new XMLHttpRequest();
-        xhr.open("GET", atiUrlString, true);
-        xhr.withCredentials = true;
-        xhr.send();
-    };
-`;
+export const addSendStaticBeaconToWindow = () => {
+  window.sendStaticBeacon = function (atiUrlString) {
+    const xhr = new XMLHttpRequest();
+    xhr.open('GET', atiUrlString, true);
+    xhr.withCredentials = true;
+    xhr.send();
+    return true;
+  };
+};
 
-export default (atiUrlString: string) => `
-    window.sendStaticBeacon("${atiUrlString}");
-`;
+export default (atiUrlString: string) =>
+  window.sendStaticBeacon(`${atiUrlString}`);

src/app/lib/utilities/addInlineScript/index.test.tsx

@@ -73,4 +73,22 @@ describe('addInlineScript', () => {
       </script>,
     );
   });
+
+  it('should inject callable functions as script parameters', () => {
+    const script = (callback: () => void) => callback();
+    const callback = () => console.log('hello world');
+
+    const inlineScript = addInlineScript({
+      script,
+      parameters: [callback],
+    });
+
+    expect(inlineScript).toStrictEqual(
+      <script type="text/javascript">
+        {`(function script(callback) {
+      return callback();
+    })(${callback.toString()})`}
+      </script>,
+    );
+  });
 });

src/app/lib/utilities/addInlineScript/index.tsx

@@ -1,14 +1,19 @@
 export type InlineScriptProps = {
   script: string | { toString: () => string };
-  parameters?: string | string[];
+  parameters?: string | string[] | (string | { toString: () => string })[];
   nonce?: string | null;
 };
 
 export default ({ script, parameters, nonce }: InlineScriptProps) => {
   let inlineScript = script;
   const stringifiedParams = [parameters]
     .flat()
-    .map(param => `"${param}"`)
+    .map(param => {
+      if (typeof param === 'function') {
+        return param.toString();
+      }
+      return `"${param}"`;
+    })
     .join(', ');
 
   let paramLiteral = '';