SCAL-269016 : smal

Author: sastaachar

src/api-intercept.ts

@@ -3,7 +3,6 @@ import { getEmbedConfig } from "./embed/embedConfig";
 import { InterceptedApiType, BaseViewConfig, EmbedConfig, InterceptV2Flags, EmbedEvent } from "./types";
 import { logger } from "./utils/logger";
 
-
 const defaultUrls: Record<Exclude<InterceptedApiType, InterceptedApiType.ALL>, string[]> = {
     [InterceptedApiType.METADATA]: [
         '/prism/?op=CreateAnswerSession',
@@ -43,8 +42,8 @@ const processInterceptUrls = (interceptUrls: (string | InterceptedApiType)[]) =>
     })
     return processedUrls.map(url => formatInterceptUrl(url));
 }
-export const getInterceptInitData = (embedConfig: EmbedConfig, viewConfig: BaseViewConfig): InterceptV2Flags => {
-
+export const getInterceptInitData = (viewConfig: BaseViewConfig): InterceptV2Flags => {
+    const embedConfig = getEmbedConfig();
     const enableApiIntercept = (embedConfig.enableApiIntercept || viewConfig.enableApiIntercept) && (viewConfig.enableApiIntercept !== false);
 
     if (!enableApiIntercept) return {
@@ -69,16 +68,33 @@ export const getInterceptInitData = (embedConfig: EmbedConfig, viewConfig: BaseV
     };
 }
 
+const parseJson = (jsonString: string): [any, Error | null] => {
+    try {
+        const json = JSON.parse(jsonString);
+        return [json, null];
+    } catch (error) {
+        return [null, error];
+    }
+}
+
 /**
  * 
  * @param fetchInit 
  */
 const parseInterceptData = (eventDataString: any) => {
 
     try {
-        const { input, init } = JSON.parse(eventDataString);
+        const [parsedData, error] = parseJson(eventDataString);
+        if (error) {
+            return [null, error];
+        }
+
+        const { input, init } = parsedData;
 
-        init.body = JSON.parse(init.body);
+        const [parsedBody, bodyParseError] = parseJson(init.body);
+        if (!bodyParseError) {
+            init.body = parsedBody;
+        }
 
         const parsedInit = { input, init };
         return [parsedInit, null];
@@ -87,7 +103,12 @@ const parseInterceptData = (eventDataString: any) => {
     }
 }
 
-export const handleInterceptEvent = async (params: { eventData: any, executeEvent: (eventType: EmbedEvent, data: any) => void, embedConfig: EmbedConfig, viewConfig: BaseViewConfig, getUnsavedAnswerTml: (props: { sessionId?: string, vizId?: string }) => Promise<{ tml: string }> }) => {
+export const handleInterceptEvent = async (params: { 
+    eventData: any, 
+    executeEvent: (eventType: EmbedEvent, data: any) => void, 
+    viewConfig: BaseViewConfig, 
+    getUnsavedAnswerTml: (props: { sessionId?: string, vizId?: string }) => Promise<{ tml: string }> 
+}) => {
 
     const { eventData, executeEvent, viewConfig, getUnsavedAnswerTml } = params;
 

src/embed/ts-embed.ts

@@ -349,16 +349,15 @@ export class TsEmbed {
                 this.isPreRendered ? this.preRenderWrapper : this.el,
             );
 
-            const executeEvent = (_eventType: EmbedEvent, data: any) => {
-                this.executeCallbacks(_eventType, data, eventPort);
-            }
-
             if (eventType === EmbedEvent.ApiIntercept && this.viewConfig.enableApiIntercept) {
+                const executeEvent = (_eventType: EmbedEvent, data: any) => {
+                    this.executeCallbacks(_eventType, data, eventPort);
+                }    
                 const getUnsavedAnswerTml = async (props: { sessionId?: string, vizId?: string }) => {
                     const response = await this.triggerUIPassThrough(UIPassthroughEvent.GetUnsavedAnswerTML, props);
                     return response[0]?.value;
                 }
-                handleInterceptEvent({ eventData: processedEventData, executeEvent, embedConfig: this.embedConfig, viewConfig: this.viewConfig, getUnsavedAnswerTml });
+                handleInterceptEvent({ eventData: processedEventData, executeEvent, viewConfig: this.viewConfig, getUnsavedAnswerTml });
                 return;
             }
 
@@ -464,7 +463,7 @@ export class TsEmbed {
                 this.embedConfig.customVariablesForThirdPartyTools || {},
             hiddenListColumns: this.viewConfig.hiddenListColumns || [],
             customActions: customActionsResult.actions,
-            ...getInterceptInitData(this.embedConfig, this.viewConfig),
+            ...getInterceptInitData(this.viewConfig),
         };
 
         return baseInitData;
@@ -1047,7 +1046,7 @@ export class TsEmbed {
 
     protected createEmbedEventResponder = (eventPort: MessagePort | void, eventType: EmbedEvent) => {
 
-        const { enableApiIntercept } = getInterceptInitData(this.embedConfig, this.viewConfig);
+        const { enableApiIntercept } = getInterceptInitData(this.viewConfig);
         if (eventType === EmbedEvent.OnBeforeGetVizDataIntercept && enableApiIntercept) {
             return (payload: any) => {
                 const payloadToSend = processLegacyInterceptResponse(payload);

src/utils/logger.ts

@@ -1,4 +1,3 @@
-import { isUndefined } from '../utils';
 import { LogLevel } from '../types';
 
 const logFunctions: {
@@ -42,7 +41,7 @@ class Logger {
 
     public canLog(logLevel: LogLevel): boolean {
         if (logLevel === LogLevel.SILENT) return false;
-        if (!isUndefined(globalLogLevelOverride)) {
+        if (globalLogLevelOverride !== undefined) {
             return compareLogLevels(globalLogLevelOverride, logLevel) >= 0;
         }
         return compareLogLevels(this.logLevel, logLevel) >= 0;