Merge pull request #13 from Fullscript/support-domain-in-event-listener

fix(messagelistener.ts): generate events for custom domain

Author: Tambiebarango

src/eventSystem/messageListener/messageListener.spec.ts

@@ -1,19 +1,25 @@
+import { FullscriptOptions } from "../../fullscript";
 import { createDispatcher, Dispatcher } from "../dispatcher";
 
 import { initializeMessageListener } from "./messageListener";
 
 describe("initializeMessageListener", () => {
   let dispatcher: Dispatcher;
+  let mockFullscriptOptions: FullscriptOptions;
 
   beforeEach(() => {
     dispatcher = createDispatcher();
+    mockFullscriptOptions = {
+      publicKey: "mockPublicKey",
+      env: "us",
+    };
   });
 
   it("registers a message event listener", () => {
     const addEventListener = jest.fn();
     window.addEventListener = addEventListener;
 
-    initializeMessageListener("us", dispatcher);
+    initializeMessageListener(mockFullscriptOptions, dispatcher);
     expect(addEventListener).toHaveBeenCalled();
   });
 
@@ -24,7 +30,7 @@ describe("initializeMessageListener", () => {
     });
     window.addEventListener = addEventListener;
     dispatcher.dispatch = jest.fn();
-    initializeMessageListener("us", dispatcher);
+    initializeMessageListener(mockFullscriptOptions, dispatcher);
 
     const mockEvent = {
       origin: "https://us.fullscript.com",
@@ -38,14 +44,39 @@ describe("initializeMessageListener", () => {
     expect(dispatcher.dispatch).toHaveBeenCalledWith(mockEvent.data.type, mockEvent.data.payload);
   });
 
-  it("does not dispatch events if message origin does not match fullscript-js origin", () => {
+  it("dispatches events if message origin and custom domain match", () => {
+    let mockCallback;
+    const optionsWithDomain = {
+      ...mockFullscriptOptions,
+      domain: "http://test.fullscript.com",
+    };
+    const addEventListener = jest.fn((_, callback) => {
+      mockCallback = callback;
+    });
+    window.addEventListener = addEventListener;
+    dispatcher.dispatch = jest.fn();
+    initializeMessageListener(optionsWithDomain, dispatcher);
+
+    const mockEvent = {
+      origin: "http://test.fullscript.com",
+      data: {
+        type: "treatmentPlan.activated",
+        payload: "treatmentPlanData",
+      },
+    };
+
+    mockCallback(new MessageEvent("message", mockEvent));
+    expect(dispatcher.dispatch).toHaveBeenCalledWith(mockEvent.data.type, mockEvent.data.payload);
+  });
+
+  it("does not dispatch events if message origin does not match fullscript-js origin and no custom domain", () => {
     let mockCallback;
     const addEventListener = jest.fn((_, callback) => {
       mockCallback = callback;
     });
     window.addEventListener = addEventListener;
     dispatcher.dispatch = jest.fn();
-    initializeMessageListener("us", dispatcher);
+    initializeMessageListener(mockFullscriptOptions, dispatcher);
 
     const mockEvent = {
       origin: "https://malicious.com",
@@ -65,7 +96,7 @@ describe("initializeMessageListener", () => {
       mockCallback = callback;
     });
     window.addEventListener = addEventListener;
-    initializeMessageListener("us", dispatcher);
+    initializeMessageListener(mockFullscriptOptions, dispatcher);
 
     const mockEvent = {
       origin: "https://us.fullscript.com",

src/eventSystem/messageListener/messageListener.ts

@@ -1,8 +1,9 @@
-import { FullscriptEnv, FULLSCRIPT_DOMAINS } from "../../fullscript";
+import { FullscriptOptions, FULLSCRIPT_DOMAINS } from "../../fullscript";
 import { Dispatcher } from "../dispatcher";
 
-const initializeMessageListener = (env: FullscriptEnv, dispatcher: Dispatcher): void => {
-  const origin = FULLSCRIPT_DOMAINS[env];
+const initializeMessageListener = (options: FullscriptOptions, dispatcher: Dispatcher): void => {
+  const { domain, env } = options;
+  const origin = domain ?? FULLSCRIPT_DOMAINS[env];
 
   window.addEventListener("message", (e: MessageEvent) => {
     // !!!! Absolutely required for security purposes !!!!!

src/feature/featureUtil.ts

@@ -14,7 +14,7 @@ const getFeatureURL = <F extends FeatureType>(
   const { publicKey, env, domain } = fullscriptOptions;
   const queryString = buildQueryString({ ...featureOptions, publicKey, frameId });
   validateFeatureType(featureType);
-  const fsDomain = domain ? domain : FULLSCRIPT_DOMAINS[env];
+  const fsDomain = domain ?? FULLSCRIPT_DOMAINS[env];
 
   return `${fsDomain}/api/embeddable/session${FEATURE_PATHS[featureType]}${queryString}&target_origin=${window.location.origin}`;
 };

src/index.ts

@@ -19,6 +19,6 @@ export type {
 export const Fullscript = (options: FullscriptOptions): Client => {
   validateFullscriptOptions(options);
   const eventDispatcher = createDispatcher();
-  initializeMessageListener(options.env, eventDispatcher);
+  initializeMessageListener(options, eventDispatcher);
   return createClient(options, eventDispatcher);
 };