@microsoft/omnichannel-chat-widget 0.1.0-main.a27ec4b → 0.1.0-main.a3902df

package/lib/esm/components/livechatwidget/common/endChat.js

@@ -7,16 +7,34 @@ import { WebChatStoreLoader } from "../../webchatcontainerstateful/webchatcontro
 import { defaultWebChatContainerStatefulProps } from "../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps";
 import { PostChatSurveyMode } from "../../postchatsurveypanestateful/enums/PostChatSurveyMode";
 import { Constants } from "../../../common/Constants";
-import { addDelayInMs, getWidgetEndChatEventName } from "../../../common/utils"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import { addDelayInMs, getWidgetEndChatEventName } from "../../../common/utils";
+import { getAuthClientFunction, handleAuthentication } from "./authHelper";
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const prepareEndChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state) => {
   var _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3, _state$domainStates$l4, _conversationDetails;
-
   const isPostChatEnabled = (_state$domainStates$l = state.domainStates.liveChatConfig) === null || _state$domainStates$l === void 0 ? void 0 : (_state$domainStates$l2 = _state$domainStates$l.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l2 === void 0 ? void 0 : _state$domainStates$l2.msdyn_postconversationsurveyenable;
-  const postChatSurveyMode = (_state$domainStates$l3 = state.domainStates.liveChatConfig) === null || _state$domainStates$l3 === void 0 ? void 0 : (_state$domainStates$l4 = _state$domainStates$l3.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l4 === void 0 ? void 0 : _state$domainStates$l4.msdyn_postconversationsurveymode; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const postChatSurveyMode = (_state$domainStates$l3 = state.domainStates.liveChatConfig) === null || _state$domainStates$l3 === void 0 ? void 0 : (_state$domainStates$l4 = _state$domainStates$l3.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l4 === void 0 ? void 0 : _state$domainStates$l4.msdyn_postconversationsurveymode;
+
+  //Unable to end chat if token has expired
+  if (props.getAuthToken) {
+    const authClientFunction = getAuthClientFunction(props.chatConfig);
+    if (props.getAuthToken && authClientFunction) {
+      // set auth token to chat sdk before start chat
+      const authSuccess = await handleAuthentication(chatSDK, props.chatConfig, props.getAuthToken);
+      if (!authSuccess) {
+        TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+          Event: TelemetryEvent.GetAuthTokenFailed,
+          ExceptionDetails: {
+            exception: "Unable to get auth token during end chat"
+          }
+        });
+      }
+    }
+  }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let conversationDetails = undefined;
-
   try {
     conversationDetails = await chatSDK.getConversationDetails();
   } catch (erorr) {
@@ -27,12 +45,16 @@ const prepareEndChat = async (props, chatSDK, setAdapter, setWebChatStyles, disp
       }
     });
   }
-
   if (isPostChatEnabled === "true" && ((_conversationDetails = conversationDetails) === null || _conversationDetails === void 0 ? void 0 : _conversationDetails.canRenderPostChat) === Constants.truePascal) {
     const skipEndChatSDK = false;
     const skipCloseChat = true;
+    const chatSession = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getCurrentLiveChatContext());
     await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat, false);
-
+    if (chatSession) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      chatSDK.chatToken = chatSession.chatToken ?? {};
+      chatSDK.requestId = chatSession.requestId;
+    }
     if (postChatSurveyMode === PostChatSurveyMode.Embed) {
       dispatch({
         type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
@@ -44,19 +66,29 @@ const prepareEndChat = async (props, chatSDK, setAdapter, setWebChatStyles, disp
       };
       BroadcastService.postMessage(loadPostChatEvent);
     } else if (postChatSurveyMode === PostChatSurveyMode.Link) {
+      var _props$webChatContain, _props$webChatContain2;
       dispatch({
         type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: ConversationState.InActive
       });
-    }
 
+      // Disable SendBox
+      if ((props === null || props === void 0 ? void 0 : (_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : (_props$webChatContain2 = _props$webChatContain.renderingMiddlewareProps) === null || _props$webChatContain2 === void 0 ? void 0 : _props$webChatContain2.hideSendboxOnConversationEnd) !== false) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        setWebChatStyles(styles => {
+          return {
+            ...styles,
+            hideSendBox: true
+          };
+        });
+      }
+    }
     return;
   }
-
   await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, false, true);
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) => {
   if (!skipEndChatSDK) {
     try {
@@ -73,9 +105,9 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
       });
       postMessageToOtherTab = false;
     }
-  } // Need to clear these states immediately when chat ended from OC.
-
+  }
 
+  // Need to clear these states immediately when chat ended from OC.
   dispatch({
     type: LiveChatWidgetActionType.SET_CUSTOM_CONTEXT,
     payload: undefined
@@ -88,15 +120,18 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
     type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
     payload: undefined
   });
-
+  dispatch({
+    type: LiveChatWidgetActionType.SET_RECONNECT_ID,
+    payload: undefined
+  });
   if (!skipCloseChat) {
     try {
-      var _props$webChatContain;
-
+      var _props$webChatContain3;
       adapter === null || adapter === void 0 ? void 0 : adapter.end();
       setAdapter(undefined);
-      setWebChatStyles({ ...defaultWebChatContainerStatefulProps.webChatStyles,
-        ...((_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : _props$webChatContain.webChatStyles)
+      setWebChatStyles({
+        ...defaultWebChatContainerStatefulProps.webChatStyles,
+        ...((_props$webChatContain3 = props.webChatContainerProps) === null || _props$webChatContain3 === void 0 ? void 0 : _props$webChatContain3.webChatStyles)
       });
       WebChatStoreLoader.store = null;
       dispatch({
@@ -127,10 +162,8 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
           proactiveChatInNewWindow: false
         }
       });
-
       if (postMessageToOtherTab) {
         var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _props$controlProps;
-
         const endChatEventName = getWidgetEndChatEventName(chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC === void 0 ? void 0 : _chatSDK$omnichannelC.orgId, chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC2 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC2 === void 0 ? void 0 : _chatSDK$omnichannelC2.widgetId, (props === null || props === void 0 ? void 0 : (_props$controlProps = props.controlProps) === null || _props$controlProps === void 0 ? void 0 : _props$controlProps.widgetInstanceId) ?? "");
         BroadcastService.postMessage({
           eventName: endChatEventName
@@ -146,5 +179,4 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
     }
   }
 };
-
 export { prepareEndChat, endChat };

package/lib/esm/components/livechatwidget/common/getGeneralStylesForButton.js

@@ -2,7 +2,6 @@ import { shouldShowChatButton, shouldShowProactiveChatPane } from "../../../cont
 import { defaultLiveChatWidgetGeneralStyles } from "./defaultStyles/defaultLiveChatWidgetGeneralStyles";
 export const getGeneralStylesForButton = state => {
   let generalStylesForButton = defaultLiveChatWidgetGeneralStyles;
-
   if (!shouldShowChatButton(state) && !shouldShowProactiveChatPane(state)) {
     generalStylesForButton = Object.assign({}, defaultLiveChatWidgetGeneralStyles, {
       boxShadow: "0px 0px 2px rgba(0, 0, 0, 0.16), 0px 4px 8px rgba(0, 0, 0, 0.12)",
@@ -12,6 +11,5 @@ export const getGeneralStylesForButton = state => {
       padding: "0.5"
     });
   }
-
   return generalStylesForButton;
 };

package/lib/esm/components/livechatwidget/common/initCallingSdk.js

@@ -1,6 +1,7 @@
 import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
-import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const initCallingSdk = async (chatSDK, setVoiceVideoCallingSDK) => {
   try {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -13,18 +14,15 @@ export const initCallingSdk = async (chatSDK, setVoiceVideoCallingSDK) => {
       });
       return true;
     }
-
     return false;
   } catch (error) {
-    if (error !== "Voice and video call is not enabled") {
-      TelemetryHelper.logCallingEvent(LogLevel.ERROR, {
-        Event: TelemetryEvent.CallingSDKLoadFailed,
-        ExceptionDetails: {
-          exception: error
-        }
-      });
-    }
-
+    TelemetryHelper.logCallingEvent(LogLevel.ERROR, {
+      Event: TelemetryEvent.CallingSDKLoadFailed,
+      ExceptionDetails: {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        exception: error.message
+      }
+    });
     return false;
   }
 };

package/lib/esm/components/livechatwidget/common/initConfirmationPropsComposer.js

@@ -1,14 +1,13 @@
 import { defaultConfirmationPaneLocalizedTexts } from "../../confirmationpanestateful/common/defaultProps/defaultConfirmationPaneLocalizedTexts";
 export const initConfirmationPropsComposer = props => {
   var _props$confirmationPa, _props$footerProps, _props$footerProps$co, _props$footerProps2, _props$footerProps2$c, _props$confirmationPa2;
-
-  const confirmationPanelocalizedTexts = { ...defaultConfirmationPaneLocalizedTexts,
+  const confirmationPanelocalizedTexts = {
+    ...defaultConfirmationPaneLocalizedTexts,
     ...(props === null || props === void 0 ? void 0 : (_props$confirmationPa = props.confirmationPaneProps) === null || _props$confirmationPa === void 0 ? void 0 : _props$confirmationPa.confirmationPaneLocalizedTexts)
   };
   let confirmationPaneInputs;
   const emailTranscriptDisabled = ((_props$footerProps = props.footerProps) === null || _props$footerProps === void 0 ? void 0 : (_props$footerProps$co = _props$footerProps.controlProps) === null || _props$footerProps$co === void 0 ? void 0 : _props$footerProps$co.hideEmailTranscriptButton) ?? false;
   const downloadTranscriptDisabled = ((_props$footerProps2 = props.footerProps) === null || _props$footerProps2 === void 0 ? void 0 : (_props$footerProps2$c = _props$footerProps2.controlProps) === null || _props$footerProps2$c === void 0 ? void 0 : _props$footerProps2$c.hideDownloadTranscriptButton) ?? false;
-
   if (!emailTranscriptDisabled && !downloadTranscriptDisabled) {
     confirmationPaneInputs = {
       title: confirmationPanelocalizedTexts.CLOSE_CONFIRMATION_DIALOG_TITLE_FOR_EMAIL_AND_DOWNLOAD_TRANSCRIPT_ENABLED,
@@ -30,8 +29,8 @@ export const initConfirmationPropsComposer = props => {
       description: confirmationPanelocalizedTexts.CLOSE_CONFIRMATION_DIALOG_DESCRIPTION_DEFAULT
     };
   }
-
-  const confirmationPaneProps = { ...props.confirmationPaneProps,
+  const confirmationPaneProps = {
+    ...props.confirmationPaneProps,
     controlProps: {
       titleText: confirmationPaneInputs.title,
       subtitleText: confirmationPaneInputs.description,

package/lib/esm/components/livechatwidget/common/initWebChatComposer.js

@@ -29,60 +29,52 @@ import preProcessingMiddleware from "../../webchatcontainerstateful/webchatcontr
 import sanitizationMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/sanitizationMiddleware";
 import { createCardActionMiddleware } from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/cardActionMiddleware";
 import createMessageTimeStampMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/messageTimestampMiddleware";
-import { Constants } from "../../../common/Constants"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import { Constants } from "../../../common/Constants";
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatStyles) => {
   var _props$webChatContain, _props$webChatContain2, _props$webChatContain3, _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3, _state$domainStates$l4, _state$domainStates$l8, _state$domainStates$l9, _props$webChatContain7, _props$webChatContain8, _state$domainStates$r, _state$domainStates$r2, _props$webChatContain9, _props$webChatContain10, _state$domainStates$r3, _state$domainStates$r4, _props$webChatContain11, _props$webChatContain12, _defaultWebChatContai, _props$webChatContain13, _props$webChatContain14, _props$webChatContain15, _props$webChatContain16, _state$domainStates$r5, _state$domainStates$r6, _props$webChatContain17, _props$webChatContain18, _defaultWebChatContai2, _props$webChatContain19, _props$webChatContain20, _defaultWebChatContai3, _props$webChatContain21, _props$webChatContain22;
-
-  const localizedTexts = { ...defaultMiddlewareLocalizedTexts,
+  const localizedTexts = {
+    ...defaultMiddlewareLocalizedTexts,
     ...((_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : _props$webChatContain.localizedTexts)
   };
-  const disableNewLineMarkdownSupport = ((_props$webChatContain2 = props.webChatContainerProps) === null || _props$webChatContain2 === void 0 ? void 0 : _props$webChatContain2.disableNewLineMarkdownSupport) ?? defaultWebChatContainerStatefulProps.disableNewLineMarkdownSupport; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-
+  const disableNewLineMarkdownSupport = ((_props$webChatContain2 = props.webChatContainerProps) === null || _props$webChatContain2 === void 0 ? void 0 : _props$webChatContain2.disableNewLineMarkdownSupport) ?? defaultWebChatContainerStatefulProps.disableNewLineMarkdownSupport;
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const markdown = createMarkdown(((_props$webChatContain3 = props.webChatContainerProps) === null || _props$webChatContain3 === void 0 ? void 0 : _props$webChatContain3.disableMarkdownMessageFormatting) ?? defaultWebChatContainerStatefulProps.disableMarkdownMessageFormatting, disableNewLineMarkdownSupport);
   const isPostChatEnabled = (_state$domainStates$l = state.domainStates.liveChatConfig) === null || _state$domainStates$l === void 0 ? void 0 : (_state$domainStates$l2 = _state$domainStates$l.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l2 === void 0 ? void 0 : _state$domainStates$l2.msdyn_postconversationsurveyenable;
-  const postChatSurveyMode = (_state$domainStates$l3 = state.domainStates.liveChatConfig) === null || _state$domainStates$l3 === void 0 ? void 0 : (_state$domainStates$l4 = _state$domainStates$l3.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l4 === void 0 ? void 0 : _state$domainStates$l4.msdyn_postconversationsurveymode; // Initialize Web Chat's redux store
+  const postChatSurveyMode = (_state$domainStates$l3 = state.domainStates.liveChatConfig) === null || _state$domainStates$l3 === void 0 ? void 0 : (_state$domainStates$l4 = _state$domainStates$l3.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l4 === void 0 ? void 0 : _state$domainStates$l4.msdyn_postconversationsurveymode;
 
+  // Initialize Web Chat's redux store
   let webChatStore = WebChatStoreLoader.store;
-
   if (!webChatStore) {
     var _state$domainStates$l5, _state$domainStates$l6, _state$domainStates$l7, _props$webChatContain6;
-
     const conversationEndCallback = async () => {
       var _props$webChatContain4, _props$webChatContain5;
-
       TelemetryHelper.logActionEvent(LogLevel.INFO, {
         Event: TelemetryEvent.ConversationEndedThreadEventReceived,
         Description: "Conversation is ended by agent side or by timeout."
       });
-
       if ((props === null || props === void 0 ? void 0 : (_props$webChatContain4 = props.webChatContainerProps) === null || _props$webChatContain4 === void 0 ? void 0 : (_props$webChatContain5 = _props$webChatContain4.renderingMiddlewareProps) === null || _props$webChatContain5 === void 0 ? void 0 : _props$webChatContain5.hideSendboxOnConversationEnd) !== false) {
         setWebChatStyles(styles => {
-          return { ...styles,
+          return {
+            ...styles,
             hideSendBox: true
           };
         });
       }
-
-      if (isPostChatEnabled === "true") {
-        if (postChatSurveyMode === PostChatSurveyMode.Embed) {
-          WebChatStoreLoader.store = null;
-          dispatch({
-            type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-            payload: ConversationState.PostchatLoading
-          });
-          await addDelayInMs(Constants.PostChatLoadingDurationInMs);
-          const loadPostChatEvent = {
-            eventName: BroadcastEvent.LoadPostChatSurvey
-          };
-          BroadcastService.postMessage(loadPostChatEvent);
-        } else if (postChatSurveyMode === PostChatSurveyMode.Link) {
-          dispatch({
-            type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-            payload: ConversationState.InActive
-          });
-        }
-      } else {
+      if (isPostChatEnabled === "true" && postChatSurveyMode === PostChatSurveyMode.Embed && state.appStates.conversationState === ConversationState.Active) {
+        WebChatStoreLoader.store = null;
+        dispatch({
+          type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+          payload: ConversationState.PostchatLoading
+        });
+        await addDelayInMs(Constants.PostChatLoadingDurationInMs);
+        const loadPostChatEvent = {
+          eventName: BroadcastEvent.LoadPostChatSurvey
+        };
+        BroadcastService.postMessage(loadPostChatEvent);
+      }
+      if (state.appStates.conversationState === ConversationState.Active) {
         dispatch({
           type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
           payload: ConversationState.InActive
@@ -92,7 +84,6 @@ export const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatS
           payload: true
         });
       }
-
       dispatch({
         type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
         payload: undefined
@@ -102,15 +93,17 @@ export const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatS
         payload: undefined
       });
     };
-
-    webChatStore = createStore({}, //initial state
-    preProcessingMiddleware, attachmentProcessingMiddleware, createAttachmentUploadValidatorMiddleware((_state$domainStates$l5 = state.domainStates.liveChatConfig) === null || _state$domainStates$l5 === void 0 ? void 0 : _state$domainStates$l5.allowedFileExtensions, (_state$domainStates$l6 = state.domainStates.liveChatConfig) === null || _state$domainStates$l6 === void 0 ? void 0 : _state$domainStates$l6.maxUploadFileSize, localizedTexts), channelDataMiddleware, createConversationEndMiddleware(conversationEndCallback), createDataMaskingMiddleware((_state$domainStates$l7 = state.domainStates.liveChatConfig) === null || _state$domainStates$l7 === void 0 ? void 0 : _state$domainStates$l7.DataMaskingInfo), createMessageTimeStampMiddleware, gifUploadMiddleware, htmlPlayerMiddleware, htmlTextMiddleware, createMaxMessageSizeValidator(localizedTexts), sanitizationMiddleware, // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    webChatStore = createStore({},
+    //initial state
+    preProcessingMiddleware, attachmentProcessingMiddleware, createAttachmentUploadValidatorMiddleware((_state$domainStates$l5 = state.domainStates.liveChatConfig) === null || _state$domainStates$l5 === void 0 ? void 0 : _state$domainStates$l5.allowedFileExtensions, (_state$domainStates$l6 = state.domainStates.liveChatConfig) === null || _state$domainStates$l6 === void 0 ? void 0 : _state$domainStates$l6.maxUploadFileSize, localizedTexts), channelDataMiddleware, createConversationEndMiddleware(conversationEndCallback), createDataMaskingMiddleware((_state$domainStates$l7 = state.domainStates.liveChatConfig) === null || _state$domainStates$l7 === void 0 ? void 0 : _state$domainStates$l7.DataMaskingInfo), createMessageTimeStampMiddleware, gifUploadMiddleware, htmlPlayerMiddleware, htmlTextMiddleware, createMaxMessageSizeValidator(localizedTexts), sanitizationMiddleware,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     ...(((_props$webChatContain6 = props.webChatContainerProps) === null || _props$webChatContain6 === void 0 ? void 0 : _props$webChatContain6.storeMiddlewares) ?? []));
     WebChatStoreLoader.store = webChatStore;
-  } // Initialize the remaining Web Chat props
-
+  }
 
-  const webChatProps = { ...defaultWebChatContainerStatefulProps.webChatProps,
+  // Initialize the remaining Web Chat props
+  const webChatProps = {
+    ...defaultWebChatContainerStatefulProps.webChatProps,
     dir: state.domainStates.globalDir,
     locale: changeLanguageCodeFormatForWebChat(getLocaleStringFromId((_state$domainStates$l8 = state.domainStates.liveChatConfig) === null || _state$domainStates$l8 === void 0 ? void 0 : (_state$domainStates$l9 = _state$domainStates$l8.ChatWidgetLanguage) === null || _state$domainStates$l9 === void 0 ? void 0 : _state$domainStates$l9.msdyn_localeid)),
     store: webChatStore,

package/lib/esm/components/livechatwidget/common/reconnectChatHelper.js

@@ -1,95 +1,88 @@
 import "regenerator-runtime/runtime";
 import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
+import { handleAuthentication, removeAuthTokenProvider } from "./authHelper";
+import { isNullOrEmptyString, isNullOrUndefined } from "../../../common/utils";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
-import { handleAuthentication, removeAuthTokenProvider } from "./authHelper"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-const getChatReconnectContext = async (chatSDK, chatConfig, getAuthToken, isReconnectEnabled, reconnectId) => {
-  if (isReconnectEnabled) {
-    try {
-      if (reconnectId) {
-        const chatReconnectOptionalParams = {
-          reconnectId: reconnectId
-        };
-        return await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatReconnectContext(chatReconnectOptionalParams));
-      } else {
-        // set auth token to chat sdk to get reconnectId for auth chat
-        await handleAuthentication(chatSDK, chatConfig, getAuthToken);
-        const reconnectChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatReconnectContext()); // remove auth token after reconnectId is fetched
-        // this will be reset later at start chat
-
-        removeAuthTokenProvider(chatSDK);
-        return reconnectChatContext;
-      }
-    } catch (ex) {
-      TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
-        Event: TelemetryEvent.GetChatReconnectContextSDKCallFailed,
-        ExceptionDetails: {
-          exception: ex
-        }
-      });
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const handleChatReconnect = async (chatSDK, props, dispatch, setAdapter, initStartChat, state) => {
+  var _props$chatConfig, _props$chatConfig$Liv;
+  if (!isReconnectEnabled(props.chatConfig)) return;
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const isAuthenticatedChat = (_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && (_props$chatConfig$Liv = _props$chatConfig.LiveChatConfigAuthSettings) !== null && _props$chatConfig$Liv !== void 0 && _props$chatConfig$Liv.msdyn_javascriptclientfunction ? true : false;
+
+  // Get chat reconnect context
+  const reconnectChatContext = await getChatReconnectContext(chatSDK, props.chatConfig, props, isAuthenticatedChat);
+  if (hasReconnectId(reconnectChatContext)) {
+    var _props$reconnectChatP2, _props$reconnectChatP3;
+    //Redirect if enabled
+    if (reconnectChatContext.redirectURL && !isNullOrEmptyString(reconnectChatContext.redirectURL)) {
+      var _props$reconnectChatP;
+      redirectPage(reconnectChatContext.redirectURL, (_props$reconnectChatP = props.reconnectChatPaneProps) === null || _props$reconnectChatP === void 0 ? void 0 : _props$reconnectChatP.redirectInSameWindow);
+      return;
     }
-  }
-
-  return null;
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
+    //if reconnect id is provided in props, don't show reconnect pane
+    if ((_props$reconnectChatP2 = props.reconnectChatPaneProps) !== null && _props$reconnectChatP2 !== void 0 && _props$reconnectChatP2.reconnectId && !isNullOrEmptyString((_props$reconnectChatP3 = props.reconnectChatPaneProps) === null || _props$reconnectChatP3 === void 0 ? void 0 : _props$reconnectChatP3.reconnectId)) {
+      const reconnectChatContext = await getChatReconnectContext(chatSDK, props.chatConfig, props, isAuthenticatedChat);
+      await setReconnectIdAndStartChat(isAuthenticatedChat, chatSDK, props, dispatch, setAdapter, reconnectChatContext.reconnectId ?? "", initStartChat);
+      return;
+    }
 
-const getReconnectIdForAuthenticatedChat = async (props, chatSDK) => {
-  var _props$chatConfig, _props$reconnectChatP;
-
-  let authClientFunction = undefined;
-
-  if ((_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && _props$chatConfig.LiveChatConfigAuthSettings) {
-    var _props$chatConfig2, _props$chatConfig2$Li;
-
-    authClientFunction = ((_props$chatConfig2 = props.chatConfig) === null || _props$chatConfig2 === void 0 ? void 0 : (_props$chatConfig2$Li = _props$chatConfig2.LiveChatConfigAuthSettings) === null || _props$chatConfig2$Li === void 0 ? void 0 : _props$chatConfig2$Li.msdyn_javascriptclientfunction) ?? undefined;
+    //show reconnect pane
+    state.appStates.conversationState = ConversationState.ReconnectChat;
+    dispatch({
+      type: LiveChatWidgetActionType.SET_RECONNECT_ID,
+      payload: reconnectChatContext.reconnectId ?? ""
+    });
+    dispatch({
+      type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+      payload: ConversationState.ReconnectChat
+    });
+    return;
   }
+};
 
-  if ((_props$reconnectChatP = props.reconnectChatPaneProps) !== null && _props$reconnectChatP !== void 0 && _props$reconnectChatP.isReconnectEnabled && authClientFunction // TODO: Implement this after storage is in place
-
-  /* && !isLoadWithState() */
-  ) {
-    var _props$reconnectChatP2;
-
-    const previousActiveSessionResponse = await getChatReconnectContext(chatSDK, props.chatConfig, props.getAuthToken, (_props$reconnectChatP2 = props.reconnectChatPaneProps) === null || _props$reconnectChatP2 === void 0 ? void 0 : _props$reconnectChatP2.isReconnectEnabled);
-
-    if (previousActiveSessionResponse && previousActiveSessionResponse.reconnectId) {
-      return previousActiveSessionResponse.reconnectId;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const getChatReconnectContext = async (chatSDK, chatConfig, props, isAuthenticatedChat) => {
+  try {
+    var _props$reconnectChatP4;
+    const chatReconnectOptionalParams = {
+      reconnectId: (_props$reconnectChatP4 = props.reconnectChatPaneProps) === null || _props$reconnectChatP4 === void 0 ? void 0 : _props$reconnectChatP4.reconnectId
+    };
+    if (isAuthenticatedChat) {
+      // Get auth token for for getting chat reconnect context
+      await handleAuthentication(chatSDK, chatConfig, props.getAuthToken);
     }
+    const reconnectChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatReconnectContext(chatReconnectOptionalParams));
+    if (isAuthenticatedChat) {
+      // remove auth token after reconnectId is fetched
+      // this will be reset later at start chat
+      removeAuthTokenProvider(chatSDK);
+    }
+    return reconnectChatContext;
+  } catch (error) {
+    TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
+      Event: TelemetryEvent.GetChatReconnectContextSDKCallFailed,
+      ExceptionDetails: {
+        exception: error
+      }
+    });
   }
+};
 
-  return undefined;
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
-const handleUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, isReconnectEnabled, reconnectId, initStartChat, redirectInSameWindow) => {
-  const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, chatConfig, getAuthToken, isReconnectEnabled, reconnectId);
-
-  if (shouldRedirectOrStartNewChat(reconnectAvailabilityResponse)) {
-    await redirectOrStartNewChat(reconnectAvailabilityResponse, chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, redirectInSameWindow);
-  } else {
-    await setReconnectIdAndStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat);
-  }
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
-const startUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, isReconnectEnabled, reconnectId, initStartChat) => {
-  const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, chatConfig, getAuthToken, isReconnectEnabled, reconnectId);
-
-  if (!shouldRedirectOrStartNewChat(reconnectAvailabilityResponse)) {
-    await setReconnectIdAndStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat);
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const setReconnectIdAndStartChat = async (isAuthenticatedChat, chatSDK, props, dispatch, setAdapter, reconnectId, initStartChat) => {
+  if (!isAuthenticatedChat) {
+    const startUnauthenticatedReconnectChat = {
+      eventName: BroadcastEvent.StartUnauthenticatedReconnectChat
+    };
+    BroadcastService.postMessage(startUnauthenticatedReconnectChat);
   }
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
-const setReconnectIdAndStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat) => {
-  const startUnauthenticatedReconnectChat = {
-    eventName: BroadcastEvent.StartUnauthenticatedReconnectChat
-  };
-  BroadcastService.postMessage(startUnauthenticatedReconnectChat);
   const optionalParams = {
     reconnectId: reconnectId
   };
@@ -101,9 +94,8 @@ const setReconnectIdAndStartChat = async (chatSDK, chatConfig, getAuthToken, dis
     type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
     payload: ConversationState.Loading
   });
-  await initStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, optionalParams);
+  await initStartChat(chatSDK, dispatch, setAdapter, props, optionalParams);
 };
-
 const redirectPage = (redirectURL, redirectInSameWindow) => {
   const redirectPageRequest = {
     eventName: BroadcastEvent.RedirectPageRequest,
@@ -112,60 +104,15 @@ const redirectPage = (redirectURL, redirectInSameWindow) => {
     }
   };
   BroadcastService.postMessage(redirectPageRequest);
-
   if (redirectInSameWindow) {
     window.location.href = redirectURL;
   }
 };
-
-const shouldRedirectOrStartNewChat = reconnectAvailabilityResponse => {
-  return reconnectAvailabilityResponse && !reconnectAvailabilityResponse.reconnectId;
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
-const startNewChatEmptyRedirectionUrl = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat) => {
-  const startUnauthenticatedReconnectChat = {
-    eventName: BroadcastEvent.StartUnauthenticatedReconnectChat
-  };
-  BroadcastService.postMessage(startUnauthenticatedReconnectChat); // Getting PreChat Survey Context
-
-  const parseToJson = false;
-  const preChatSurveyResponse = await chatSDK.getPreChatSurvey(parseToJson);
-
-  if (preChatSurveyResponse) {
-    dispatch({
-      type: LiveChatWidgetActionType.SET_PRE_CHAT_SURVEY_RESPONSE,
-      payload: preChatSurveyResponse
-    });
-    dispatch({
-      type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: ConversationState.Prechat
-    });
-  } else {
-    dispatch({
-      type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: ConversationState.Loading
-    });
-    await initStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter);
-  }
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
-const handleRedirectUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, isReconnectEnabled, reconnectId, redirectInSameWindow) => {
-  const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, chatConfig, getAuthToken, isReconnectEnabled, reconnectId);
-
-  if (shouldRedirectOrStartNewChat(reconnectAvailabilityResponse)) {
-    await redirectOrStartNewChat(reconnectAvailabilityResponse, chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, redirectInSameWindow);
-  }
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
-const redirectOrStartNewChat = async (reconnectAvailabilityResponse, chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, redirectInSameWindow) => {
-  if (reconnectAvailabilityResponse.redirectURL) {
-    redirectPage(reconnectAvailabilityResponse.redirectURL, redirectInSameWindow);
-  } else {
-    await startNewChatEmptyRedirectionUrl(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat);
-  }
+const isReconnectEnabled = chatConfig => {
+  var _chatConfig$LiveWSAnd;
+  return chatConfig && ((_chatConfig$LiveWSAnd = chatConfig.LiveWSAndLiveChatEngJoin) === null || _chatConfig$LiveWSAnd === void 0 ? void 0 : _chatConfig$LiveWSAnd.msdyn_enablechatreconnect) && (chatConfig.LiveWSAndLiveChatEngJoin.msdyn_enablechatreconnect === "true" || chatConfig.LiveWSAndLiveChatEngJoin.msdyn_enablechatreconnect === true);
 };
-
-export { getChatReconnectContext, getReconnectIdForAuthenticatedChat, handleUnauthenticatedReconnectChat, startUnauthenticatedReconnectChat, handleRedirectUnauthenticatedReconnectChat };
+const hasReconnectId = reconnectAvailabilityResponse => {
+  return reconnectAvailabilityResponse && !isNullOrUndefined(reconnectAvailabilityResponse.reconnectId);
+};
+export { handleChatReconnect, isReconnectEnabled, getChatReconnectContext };

package/lib/esm/components/livechatwidget/common/registerTelemetryLoggers.js

@@ -6,27 +6,23 @@ import { defaultInternalTelemetryData } from "../../../common/telemetry/defaultC
 import { defaultTelemetryConfiguration } from "../../../common/telemetry/defaultConfigs/defaultTelemetryConfiguration";
 export const registerTelemetryLoggers = (props, dispatch) => {
   var _props$liveChatContex, _props$liveChatContex2;
-
-  const telemetryConfig = { ...defaultTelemetryConfiguration,
+  const telemetryConfig = {
+    ...defaultTelemetryConfiguration,
     ...props.telemetryConfig
   };
-
   if ((_props$liveChatContex = props.liveChatContextFromCache) !== null && _props$liveChatContex !== void 0 && (_props$liveChatContex2 = _props$liveChatContex.domainStates) !== null && _props$liveChatContex2 !== void 0 && _props$liveChatContex2.telemetryInternalData) {
     var _props$liveChatContex3, _props$liveChatContex4;
-
     TelemetryManager.InternalTelemetryData = (_props$liveChatContex3 = props.liveChatContextFromCache) === null || _props$liveChatContex3 === void 0 ? void 0 : (_props$liveChatContex4 = _props$liveChatContex3.domainStates) === null || _props$liveChatContex4 === void 0 ? void 0 : _props$liveChatContex4.telemetryInternalData;
   } else {
     var _props$chatSDK, _props$chatSDK$omnich, _props$chatSDK2, _props$chatSDK2$omnic, _props$chatSDK3, _props$chatSDK3$omnic;
-
-    let telemetryData = { ...defaultInternalTelemetryData,
+    let telemetryData = {
+      ...defaultInternalTelemetryData,
       telemetryConfig: Object.assign({}, defaultTelemetryConfiguration, telemetryConfig),
       ariaConfig: Object.assign({}, defaultAriaConfig, telemetryConfig === null || telemetryConfig === void 0 ? void 0 : telemetryConfig.ariaConfigurations)
     };
-
     if (props.chatConfig) {
       telemetryData = TelemetryHelper.addChatConfigDataToTelemetry(props === null || props === void 0 ? void 0 : props.chatConfig, telemetryData);
     }
-
     telemetryData = TelemetryHelper.addWidgetDataToTelemetry(telemetryConfig, telemetryData);
     telemetryData.OCChatSDKVersion = telemetryConfig.OCChatSDKVersion ?? "0.0.0-0";
     telemetryData.chatComponentVersion = telemetryConfig.chatComponentVersion ?? "0.0.0-0";
@@ -40,6 +36,5 @@ export const registerTelemetryLoggers = (props, dispatch) => {
       payload: telemetryData
     });
   }
-
   RegisterLoggers();
 };