@microsoft/omnichannel-chat-widget 0.1.0-main.3d1c026 → 0.1.0-main.4151518

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

@@ -1,57 +1,162 @@
 import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
+import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
-import { NotificationHandler } from "../../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler";
-import { NotificationScenarios } from "../../webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { WebChatStoreLoader } from "../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader";
 import { defaultWebChatContainerStatefulProps } from "../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps";
-import { BroadcastService } from "@microsoft/omnichannel-chat-components"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import { getWidgetEndChatEventName } from "../../../common/utils";
+import { getAuthClientFunction, handleAuthentication } from "./authHelper";
+import { checkPostChatEnabled, initiatePostChat } from "./setPostChatContextAndLoadSurvey";
+import { ConversationEndEntity } from "../../../contexts/common/ConversationEndEntity";
 
-export const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter) => {
-  try {
-    var _props$webChatContain;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const prepareEndChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state) => {
+  //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 end 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"
+          }
+        });
+      }
+    }
+  }
+  const isPostChatEnabled = checkPostChatEnabled(props, state);
+  if (isPostChatEnabled) {
+    try {
+      await initiatePostChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state);
+    } catch (error) {
+      // Ending chat because something went wrong
+      await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, false, true);
+    }
+  } else {
+    if (state.appStates.conversationEndedBy === ConversationEndEntity.Agent) {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
+        payload: undefined
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: undefined
+      });
+    } else {
+      await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, false, true);
+    }
+  }
+};
 
-    TelemetryHelper.logConfigDataEvent(LogLevel.INFO, {
-      Event: TelemetryEvent.EndChatSDKCall
-    });
-    await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat());
-    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)
-    });
-    WebChatStoreLoader.store = null;
-    dispatch({
-      type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: ConversationState.Closed
-    });
-    dispatch({
-      type: LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT,
-      payload: false
-    });
-    dispatch({
-      type: LiveChatWidgetActionType.SET_RECONNECT_ID,
-      payload: undefined
-    });
-    dispatch({
-      type: LiveChatWidgetActionType.SET_AUDIO_NOTIFICATION,
-      payload: null
-    });
-    dispatch({
-      type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
-      payload: undefined
-    });
-    BroadcastService.postMessage({
-      eventName: "EndChat"
-    });
-  } catch (ex) {
-    TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
-      Event: TelemetryEvent.EndChatSDKCallFailed,
-      ExceptionDetails: {
-        exception: ex
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) => {
+  if (!skipEndChatSDK) {
+    try {
+      TelemetryHelper.logSDKEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.EndChatSDKCall
+      });
+      await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat());
+    } catch (ex) {
+      TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
+        Event: TelemetryEvent.EndChatSDKCallFailed,
+        ExceptionDetails: {
+          exception: ex
+        }
+      });
+      postMessageToOtherTab = false;
+    }
+  }
+  // Need to clear these states immediately when chat ended from OC.
+  dispatch({
+    type: LiveChatWidgetActionType.SET_CUSTOM_CONTEXT,
+    payload: undefined
+  });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
+    payload: undefined
+  });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+    payload: undefined
+  });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_RECONNECT_ID,
+    payload: undefined
+  });
+  if (!skipCloseChat) {
+    try {
+      var _props$webChatContain;
+      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)
+      });
+      WebChatStoreLoader.store = null;
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: ConversationState.Closed
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_POST_CHAT_WORKFLOW_IN_PROGRESS,
+        payload: false
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_SHOULD_USE_BOT_SURVEY,
+        payload: false
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT_EVENT_RECEIVED,
+        payload: false
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY,
+        payload: undefined
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_RECONNECT_ID,
+        payload: undefined
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_AUDIO_NOTIFICATION,
+        payload: null
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_PROACTIVE_CHAT_PARAMS,
+        payload: {
+          proactiveChatBodyTitle: "",
+          proactiveChatEnablePrechat: false,
+          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
+        });
       }
-    });
-    NotificationHandler.notifyError(NotificationScenarios.Connection, "End Chat Call Failed: " + ex);
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.CloseChatCall,
+        Description: "Chat was closed succesfully"
+      });
+    } catch (error) {
+      TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+        Event: TelemetryEvent.CloseChatMethodException,
+        ExceptionDetails: {
+          exception: `Failed to endChat: ${error}`
+        }
+      });
+    } finally {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_UNREAD_MESSAGE_COUNT,
+        payload: 0
+      });
+    }
   }
-};
+};
+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
@@ -8,20 +9,20 @@ export const initCallingSdk = async (chatSDK, setVoiceVideoCallingSDK) => {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const callingSDK = await chatSDK.getVoiceVideoCalling();
       setVoiceVideoCallingSDK(callingSDK);
+      TelemetryHelper.logCallingEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.CallingSDKLoadSuccess
+      });
       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

@@ -1,7 +1,7 @@
+import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
 import { createStore } from "botframework-webchat";
-import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
-import { PostChatSurveyMode } from "../../postchatsurveypanestateful/enums/PostChatSurveyMode";
+import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { WebChatStoreLoader } from "../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader";
 import attachmentProcessingMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentProcessingMiddleware";
 import { changeLanguageCodeFormatForWebChat } from "../../../common/utils";
@@ -14,6 +14,7 @@ import createConversationEndMiddleware from "../../webchatcontainerstateful/webc
 import createDataMaskingMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/dataMaskingMiddleware";
 import { createMarkdown } from "./createMarkdown";
 import createMaxMessageSizeValidator from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/maxMessageSizeValidator";
+import { createWebChatTelemetry } from "../../webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger";
 import { defaultAttachmentProps } from "../../webchatcontainerstateful/common/defaultProps/defaultAttachmentProps";
 import { defaultMiddlewareLocalizedTexts } from "../../webchatcontainerstateful/common/defaultProps/defaultMiddlewareLocalizedTexts";
 import { defaultWebChatContainerStatefulProps } from "../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps";
@@ -23,69 +24,55 @@ import htmlPlayerMiddleware from "../../webchatcontainerstateful/webchatcontroll
 import htmlTextMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/htmlTextMiddleware";
 import preProcessingMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/preProcessingMiddleware";
 import sanitizationMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/sanitizationMiddleware";
-import { setPostChatContextAndLoadSurvey } from "./setPostChatContextAndLoadSurvey"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import { createCardActionMiddleware } from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/cardActionMiddleware";
+import createMessageTimeStampMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/messageTimestampMiddleware";
 
-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;
-
-  const localizedTexts = { ...defaultMiddlewareLocalizedTexts,
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const initWebChatComposer = (props, chatSDK, setAdapter, state, dispatch, adapter, setWebChatStyles) => {
+  var _props$webChatContain, _props$webChatContain2, _props$webChatContain3, _state$domainStates$l4, _state$domainStates$l5, _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,
     ...((_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
-
+  // Initialize Web Chat's redux store
   let webChatStore = WebChatStoreLoader.store;
-
   if (!webChatStore) {
-    var _state$domainStates$l5, _state$domainStates$l6, _state$domainStates$l7, _props$webChatContain6;
-
+    var _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3, _props$webChatContain6;
     const conversationEndCallback = async () => {
       var _props$webChatContain4, _props$webChatContain5;
-
       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" && postChatSurveyMode === PostChatSurveyMode.Embed) {
-        dispatch({
-          type: LiveChatWidgetActionType.SET_SHOULD_SHOW_POST_CHAT,
-          payload: true
-        });
-        dispatch({
-          type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-          payload: ConversationState.Loading
-        });
-        await setPostChatContextAndLoadSurvey(chatSDK, dispatch, true);
-      } else {
-        dispatch({
-          type: LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT,
-          payload: true
-        });
-      }
-
       dispatch({
-        type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
-        payload: undefined
+        type: LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT_EVENT_RECEIVED,
+        payload: true
+      });
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.ConversationEndedThreadEventReceived,
+        Description: "Conversation end by agent side or by timeout event received."
       });
     };
-
-    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), gifUploadMiddleware, htmlPlayerMiddleware, htmlTextMiddleware, createMaxMessageSizeValidator(localizedTexts), sanitizationMiddleware, // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    webChatStore = createStore({},
+    //initial state
+    preProcessingMiddleware, attachmentProcessingMiddleware, createAttachmentUploadValidatorMiddleware((_state$domainStates$l = state.domainStates.liveChatConfig) === null || _state$domainStates$l === void 0 ? void 0 : _state$domainStates$l.allowedFileExtensions, (_state$domainStates$l2 = state.domainStates.liveChatConfig) === null || _state$domainStates$l2 === void 0 ? void 0 : _state$domainStates$l2.maxUploadFileSize, localizedTexts), channelDataMiddleware, createConversationEndMiddleware(conversationEndCallback), createDataMaskingMiddleware((_state$domainStates$l3 = state.domainStates.liveChatConfig) === null || _state$domainStates$l3 === void 0 ? void 0 : _state$domainStates$l3.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)),
+    locale: changeLanguageCodeFormatForWebChat(getLocaleStringFromId((_state$domainStates$l4 = state.domainStates.liveChatConfig) === null || _state$domainStates$l4 === void 0 ? void 0 : (_state$domainStates$l5 = _state$domainStates$l4.ChatWidgetLanguage) === null || _state$domainStates$l5 === void 0 ? void 0 : _state$domainStates$l5.msdyn_localeid)),
     store: webChatStore,
     activityMiddleware: (_props$webChatContain7 = props.webChatContainerProps) !== null && _props$webChatContain7 !== void 0 && (_props$webChatContain8 = _props$webChatContain7.renderingMiddlewareProps) !== null && _props$webChatContain8 !== void 0 && _props$webChatContain8.disableActivityMiddleware ? undefined : createActivityMiddleware((_state$domainStates$r = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r === void 0 ? void 0 : _state$domainStates$r.systemMessageStyleProps, (_state$domainStates$r2 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r2 === void 0 ? void 0 : _state$domainStates$r2.userMessageStyleProps),
     attachmentMiddleware: (_props$webChatContain9 = props.webChatContainerProps) !== null && _props$webChatContain9 !== void 0 && (_props$webChatContain10 = _props$webChatContain9.renderingMiddlewareProps) !== null && _props$webChatContain10 !== void 0 && _props$webChatContain10.disableAttachmentMiddleware ? undefined : createAttachmentMiddleware(((_state$domainStates$r3 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r3 === void 0 ? void 0 : (_state$domainStates$r4 = _state$domainStates$r3.attachmentProps) === null || _state$domainStates$r4 === void 0 ? void 0 : _state$domainStates$r4.enableInlinePlaying) ?? defaultAttachmentProps.enableInlinePlaying),
@@ -94,7 +81,10 @@ export const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatS
     avatarMiddleware: (_props$webChatContain15 = props.webChatContainerProps) !== null && _props$webChatContain15 !== void 0 && (_props$webChatContain16 = _props$webChatContain15.renderingMiddlewareProps) !== null && _props$webChatContain16 !== void 0 && _props$webChatContain16.disableAvatarMiddleware ? undefined : createAvatarMiddleware((_state$domainStates$r5 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r5 === void 0 ? void 0 : _state$domainStates$r5.avatarStyleProps, (_state$domainStates$r6 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r6 === void 0 ? void 0 : _state$domainStates$r6.avatarTextStyleProps),
     groupActivitiesMiddleware: (_props$webChatContain17 = props.webChatContainerProps) !== null && _props$webChatContain17 !== void 0 && (_props$webChatContain18 = _props$webChatContain17.renderingMiddlewareProps) !== null && _props$webChatContain18 !== void 0 && _props$webChatContain18.disableGroupActivitiesMiddleware ? undefined : (_defaultWebChatContai2 = defaultWebChatContainerStatefulProps.webChatProps) === null || _defaultWebChatContai2 === void 0 ? void 0 : _defaultWebChatContai2.groupActivitiesMiddleware,
     typingIndicatorMiddleware: (_props$webChatContain19 = props.webChatContainerProps) !== null && _props$webChatContain19 !== void 0 && (_props$webChatContain20 = _props$webChatContain19.renderingMiddlewareProps) !== null && _props$webChatContain20 !== void 0 && _props$webChatContain20.disableTypingIndicatorMiddleware ? undefined : (_defaultWebChatContai3 = defaultWebChatContainerStatefulProps.webChatProps) === null || _defaultWebChatContai3 === void 0 ? void 0 : _defaultWebChatContai3.typingIndicatorMiddleware,
-    ...((_props$webChatContain21 = props.webChatContainerProps) === null || _props$webChatContain21 === void 0 ? void 0 : _props$webChatContain21.webChatProps)
+    onTelemetry: createWebChatTelemetry(),
+    cardActionMiddleware: createCardActionMiddleware(((_props$webChatContain21 = props.webChatContainerProps) === null || _props$webChatContain21 === void 0 ? void 0 : _props$webChatContain21.botMagicCode) || undefined),
+    sendTypingIndicator: true,
+    ...((_props$webChatContain22 = props.webChatContainerProps) === null || _props$webChatContain22 === void 0 ? void 0 : _props$webChatContain22.webChatProps)
   };
   return webChatProps;
 };

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

@@ -1,78 +1,122 @@
 import "regenerator-runtime/runtime";
-import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
-import { Constants } from "../../../common/Constants";
+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"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-const getChatReconnectContext = async (chatSDK, reconnectId) => {
-  try {
-    if (reconnectId) {
-      const chatReconnectOptionalParams = {
-        reconnectId: reconnectId
-      };
-      return await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatReconnectContext(chatReconnectOptionalParams));
-    } else {
-      return await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatReconnectContext());
-    }
-  } catch (ex) {
-    TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
-      Event: TelemetryEvent.GetChatReconnectContextSDKCallFailed,
-      ExceptionDetails: {
-        exception: ex
-      }
-    });
-  }
-
-  return null;
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 
+// 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;
 
-const getReconnectIdForAuthenticatedChat = async (props, chatSDK) => {
-  var _props$reconnectChatP, _props$reconnectChatP2;
+  // 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;
 
-  if ((_props$reconnectChatP = props.reconnectChatPaneProps) !== null && _props$reconnectChatP !== void 0 && _props$reconnectChatP.isReconnectEnabled && (_props$reconnectChatP2 = props.reconnectChatPaneProps) !== null && _props$reconnectChatP2 !== void 0 && _props$reconnectChatP2.authClientFunction // TODO: Implement this after storage is in place
-
-  /* && !isLoadWithState() */
-  ) {
-    const previousActiveSessionResponse = await getChatReconnectContext(chatSDK);
-
-    if (previousActiveSessionResponse && previousActiveSessionResponse.reconnectId) {
-      return previousActiveSessionResponse.reconnectId;
+  // 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 undefined;
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
 
-const handleUnauthenticatedReconnectChat = async (dispatch, reconnectId, initStartChat) => {
-  const reconnectAvailabilityResponse = await getChatReconnectContext(reconnectId);
+    //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;
+    }
 
-  if (reconnectAvailabilityResponse && reconnectAvailabilityResponse.redirectURL) {
-    redirectPage(reconnectAvailabilityResponse.redirectURL);
-  } else {
-    const optionalParams = {
-      reconnectId: reconnectId
-    };
+    //show reconnect pane
+    state.appStates.conversationState = ConversationState.ReconnectChat;
     dispatch({
       type: LiveChatWidgetActionType.SET_RECONNECT_ID,
-      payload: reconnectId
+      payload: reconnectChatContext.reconnectId ?? ""
     });
     dispatch({
       type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: ConversationState.Loading
+      payload: ConversationState.ReconnectChat
     });
-    await initStartChat(optionalParams);
+    return;
   }
 };
 
-const redirectPage = newUrl => {
-  const data = {
-    messageName: Constants.redirectPageRequest,
-    newUrl: newUrl
-  };
-  window.parent.postMessage(data, "*");
+// 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
+    };
+    // Get auth token for getting chat reconnect context
+    if (isAuthenticatedChat) {
+      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
+      // AuthToken will be reset later at start chat
+      removeAuthTokenProvider(chatSDK);
+    }
+    return reconnectChatContext;
+  } catch (error) {
+    TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
+      Event: TelemetryEvent.GetChatReconnectContextSDKCallFailed,
+      ExceptionDetails: {
+        exception: error
+      }
+    });
+  }
 };
 
-export { getReconnectIdForAuthenticatedChat, handleUnauthenticatedReconnectChat };
+// 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);
+  }
+  const optionalParams = {
+    reconnectId: reconnectId
+  };
+  dispatch({
+    type: LiveChatWidgetActionType.SET_RECONNECT_ID,
+    payload: reconnectId
+  });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+    payload: ConversationState.Loading
+  });
+  await initStartChat(chatSDK, dispatch, setAdapter, props, optionalParams);
+};
+const redirectPage = (redirectURL, redirectInSameWindow) => {
+  const redirectPageRequest = {
+    eventName: BroadcastEvent.RedirectPageRequest,
+    payload: {
+      redirectURL: redirectURL
+    }
+  };
+  BroadcastService.postMessage(redirectPageRequest);
+  if (redirectInSameWindow) {
+    window.location.href = redirectURL;
+  }
+};
+const isReconnectEnabled = chatConfig => {
+  if (chatConfig) {
+    var _chatConfig$LiveWSAnd, _chatConfig$LiveWSAnd2;
+    const reconnectEnabled = ((_chatConfig$LiveWSAnd = chatConfig.LiveWSAndLiveChatEngJoin) === null || _chatConfig$LiveWSAnd === void 0 ? void 0 : (_chatConfig$LiveWSAnd2 = _chatConfig$LiveWSAnd.msdyn_enablechatreconnect) === null || _chatConfig$LiveWSAnd2 === void 0 ? void 0 : _chatConfig$LiveWSAnd2.toLowerCase()) === "true";
+    return reconnectEnabled;
+  }
+  return false;
+};
+const hasReconnectId = reconnectAvailabilityResponse => {
+  return reconnectAvailabilityResponse && !isNullOrUndefined(reconnectAvailabilityResponse.reconnectId);
+};
+export { handleChatReconnect, isReconnectEnabled, getChatReconnectContext };