@microsoft/omnichannel-chat-widget 0.1.0-main.fdf1fdf → 1.0.1-main.068a14e

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

@@ -4,14 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getGeneralStylesForButton = void 0;
-
 var _componentController = require("../../../controller/componentController");
-
 var _defaultLiveChatWidgetGeneralStyles = require("./defaultStyles/defaultLiveChatWidgetGeneralStyles");
-
 const getGeneralStylesForButton = state => {
   let generalStylesForButton = _defaultLiveChatWidgetGeneralStyles.defaultLiveChatWidgetGeneralStyles;
-
   if (!(0, _componentController.shouldShowChatButton)(state) && !(0, _componentController.shouldShowProactiveChatPane)(state)) {
     generalStylesForButton = Object.assign({}, _defaultLiveChatWidgetGeneralStyles.defaultLiveChatWidgetGeneralStyles, {
       boxShadow: "0px 0px 2px rgba(0, 0, 0, 0.16), 0px 4px 8px rgba(0, 0, 0, 0.12)",
@@ -21,8 +17,6 @@ const getGeneralStylesForButton = state => {
       padding: "0.5"
     });
   }
-
   return generalStylesForButton;
 };
-
 exports.getGeneralStylesForButton = getGeneralStylesForButton;

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

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.initCallingSdk = void 0;
-
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
-
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const initCallingSdk = async (chatSDK, setVoiceVideoCallingSDK) => {
   try {
@@ -17,27 +14,21 @@ const initCallingSdk = async (chatSDK, setVoiceVideoCallingSDK) => {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const callingSDK = await chatSDK.getVoiceVideoCalling();
       setVoiceVideoCallingSDK(callingSDK);
-
       _TelemetryHelper.TelemetryHelper.logCallingEvent(_TelemetryConstants.LogLevel.INFO, {
         Event: _TelemetryConstants.TelemetryEvent.CallingSDKLoadSuccess
       });
-
       return true;
     }
-
     return false;
   } catch (error) {
-    if (error !== "Voice and video call is not enabled") {
-      _TelemetryHelper.TelemetryHelper.logCallingEvent(_TelemetryConstants.LogLevel.ERROR, {
-        Event: _TelemetryConstants.TelemetryEvent.CallingSDKLoadFailed,
-        ExceptionDetails: {
-          exception: error
-        }
-      });
-    }
-
+    _TelemetryHelper.TelemetryHelper.logCallingEvent(_TelemetryConstants.LogLevel.ERROR, {
+      Event: _TelemetryConstants.TelemetryEvent.CallingSDKLoadFailed,
+      ExceptionDetails: {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        exception: error.message
+      }
+    });
     return false;
   }
 };
-
 exports.initCallingSdk = initCallingSdk;

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

@@ -4,19 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.initConfirmationPropsComposer = void 0;
-
 var _defaultConfirmationPaneLocalizedTexts = require("../../confirmationpanestateful/common/defaultProps/defaultConfirmationPaneLocalizedTexts");
-
 const initConfirmationPropsComposer = props => {
   var _props$confirmationPa, _props$footerProps, _props$footerProps$co, _props$footerProps2, _props$footerProps2$c, _props$confirmationPa2;
-
-  const confirmationPanelocalizedTexts = { ..._defaultConfirmationPaneLocalizedTexts.defaultConfirmationPaneLocalizedTexts,
+  const confirmationPanelocalizedTexts = {
+    ..._defaultConfirmationPaneLocalizedTexts.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,
@@ -38,8 +35,8 @@ 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,
@@ -48,5 +45,4 @@ const initConfirmationPropsComposer = props => {
   };
   return confirmationPaneProps;
 };
-
 exports.initConfirmationPropsComposer = initConfirmationPropsComposer;

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

@@ -4,157 +4,81 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.initWebChatComposer = void 0;
-
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
-
 var _botframeworkWebchat = require("botframework-webchat");
-
-var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
-
-var _ConversationState = require("../../../contexts/common/ConversationState");
-
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
-
-var _PostChatSurveyMode = require("../../postchatsurveypanestateful/enums/PostChatSurveyMode");
-
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
-
 var _WebChatStoreLoader = require("../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader");
-
 var _attachmentProcessingMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentProcessingMiddleware"));
-
 var _utils = require("../../../common/utils");
-
 var _channelDataMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/channelDataMiddleware"));
-
 var _activityMiddleware = require("../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityMiddleware");
-
 var _attachmentMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/attachmentMiddleware"));
-
 var _attachmentUploadValidatorMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentUploadValidatorMiddleware"));
-
 var _avatarMiddleware = require("../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/avatarMiddleware");
-
 var _conversationEndMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/conversationEndMiddleware"));
-
 var _dataMaskingMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/dataMaskingMiddleware"));
-
 var _createMarkdown = require("./createMarkdown");
-
 var _maxMessageSizeValidator = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/maxMessageSizeValidator"));
-
 var _WebChatLogger = require("../../webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger");
-
 var _defaultAttachmentProps = require("../../webchatcontainerstateful/common/defaultProps/defaultAttachmentProps");
-
 var _defaultMiddlewareLocalizedTexts = require("../../webchatcontainerstateful/common/defaultProps/defaultMiddlewareLocalizedTexts");
-
 var _defaultWebChatContainerStatefulProps = require("../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps");
-
 var _omnichannelChatSdk = require("@microsoft/omnichannel-chat-sdk");
-
 var _gifUploadMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/gifUploadMiddleware"));
-
 var _htmlPlayerMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/htmlPlayerMiddleware"));
-
 var _htmlTextMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/htmlTextMiddleware"));
-
 var _preProcessingMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/preProcessingMiddleware"));
-
 var _sanitizationMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/sanitizationMiddleware"));
-
 var _cardActionMiddleware = require("../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/cardActionMiddleware");
-
 var _messageTimestampMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/messageTimestampMiddleware"));
-
-var _Constants = require("../../../common/Constants");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-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.defaultMiddlewareLocalizedTexts,
+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.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.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.defaultWebChatContainerStatefulProps.disableNewLineMarkdownSupport;
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const markdown = (0, _createMarkdown.createMarkdown)(((_props$webChatContain3 = props.webChatContainerProps) === null || _props$webChatContain3 === void 0 ? void 0 : _props$webChatContain3.disableMarkdownMessageFormatting) ?? _defaultWebChatContainerStatefulProps.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.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;
-
-      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
-        Event: _TelemetryConstants.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.PostChatSurveyMode.Embed) {
-          _WebChatStoreLoader.WebChatStoreLoader.store = null;
-          dispatch({
-            type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-            payload: _ConversationState.ConversationState.PostchatLoading
-          });
-          await (0, _utils.addDelayInMs)(_Constants.Constants.PostChatLoadingDurationInMs);
-          const loadPostChatEvent = {
-            eventName: _TelemetryConstants.BroadcastEvent.LoadPostChatSurvey
-          };
-
-          _omnichannelChatComponents.BroadcastService.postMessage(loadPostChatEvent);
-        } else if (postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Link) {
-          dispatch({
-            type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-            payload: _ConversationState.ConversationState.InActive
-          });
-        }
-      } else {
-        dispatch({
-          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-          payload: _ConversationState.ConversationState.InActive
-        });
-        dispatch({
-          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT,
-          payload: true
-        });
-      }
-
       dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
-        payload: undefined
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT_EVENT_RECEIVED,
+        payload: true
       });
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
-        payload: undefined
+      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.ConversationEndedThreadEventReceived,
+        Description: "Conversation end by agent side or by timeout event received."
       });
     };
-
-    webChatStore = (0, _botframeworkWebchat.createStore)({}, //initial state
-    _preProcessingMiddleware.default, _attachmentProcessingMiddleware.default, (0, _attachmentUploadValidatorMiddleware.default)((_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.default, (0, _conversationEndMiddleware.default)(conversationEndCallback), (0, _dataMaskingMiddleware.default)((_state$domainStates$l7 = state.domainStates.liveChatConfig) === null || _state$domainStates$l7 === void 0 ? void 0 : _state$domainStates$l7.DataMaskingInfo), _messageTimestampMiddleware.default, _gifUploadMiddleware.default, _htmlPlayerMiddleware.default, _htmlTextMiddleware.default, (0, _maxMessageSizeValidator.default)(localizedTexts), _sanitizationMiddleware.default, // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    webChatStore = (0, _botframeworkWebchat.createStore)({},
+    //initial state
+    _preProcessingMiddleware.default, _attachmentProcessingMiddleware.default, (0, _attachmentUploadValidatorMiddleware.default)((_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.default, (0, _conversationEndMiddleware.default)(conversationEndCallback), (0, _dataMaskingMiddleware.default)((_state$domainStates$l3 = state.domainStates.liveChatConfig) === null || _state$domainStates$l3 === void 0 ? void 0 : _state$domainStates$l3.DataMaskingInfo), _messageTimestampMiddleware.default, _gifUploadMiddleware.default, _htmlPlayerMiddleware.default, _htmlTextMiddleware.default, (0, _maxMessageSizeValidator.default)(localizedTexts), _sanitizationMiddleware.default,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     ...(((_props$webChatContain6 = props.webChatContainerProps) === null || _props$webChatContain6 === void 0 ? void 0 : _props$webChatContain6.storeMiddlewares) ?? []));
     _WebChatStoreLoader.WebChatStoreLoader.store = webChatStore;
-  } // Initialize the remaining Web Chat props
-
+  }
 
-  const webChatProps = { ..._defaultWebChatContainerStatefulProps.defaultWebChatContainerStatefulProps.webChatProps,
+  // Initialize the remaining Web Chat props
+  const webChatProps = {
+    ..._defaultWebChatContainerStatefulProps.defaultWebChatContainerStatefulProps.webChatProps,
     dir: state.domainStates.globalDir,
-    locale: (0, _utils.changeLanguageCodeFormatForWebChat)((0, _omnichannelChatSdk.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: (0, _utils.changeLanguageCodeFormatForWebChat)((0, _omnichannelChatSdk.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 : (0, _activityMiddleware.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 : (0, _attachmentMiddleware.default)(((_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.defaultAttachmentProps.enableInlinePlaying),
@@ -165,9 +89,9 @@ const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatStyles)
     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.defaultWebChatContainerStatefulProps.webChatProps) === null || _defaultWebChatContai3 === void 0 ? void 0 : _defaultWebChatContai3.typingIndicatorMiddleware,
     onTelemetry: (0, _WebChatLogger.createWebChatTelemetry)(),
     cardActionMiddleware: (0, _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;
 };
-
 exports.initWebChatComposer = initWebChatComposer;

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

@@ -3,117 +3,93 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.startUnauthenticatedReconnectChat = exports.handleUnauthenticatedReconnectChat = exports.handleRedirectUnauthenticatedReconnectChat = exports.getReconnectIdForAuthenticatedChat = exports.getChatReconnectContext = void 0;
-
+exports.isReconnectEnabled = exports.handleChatReconnect = exports.getChatReconnectContext = void 0;
 require("regenerator-runtime/runtime");
-
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
-
+var _authHelper = require("./authHelper");
+var _utils = require("../../../common/utils");
 var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
-
 var _ConversationState = require("../../../contexts/common/ConversationState");
-
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
-
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
-
-var _authHelper = require("./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 (0, _authHelper.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
-
-        (0, _authHelper.removeAuthTokenProvider)(chatSDK);
-        return reconnectChatContext;
-      }
-    } catch (ex) {
-      _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
-        Event: _TelemetryConstants.TelemetryEvent.GetChatReconnectContextSDKCallFailed,
-        ExceptionDetails: {
-          exception: ex
-        }
-      });
+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 && !(0, _utils.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
-
 
-exports.getChatReconnectContext = getChatReconnectContext;
-
-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;
+    //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 && !(0, _utils.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;
+    }
 
-    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.ConversationState.ReconnectChat;
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_RECONNECT_ID,
+      payload: reconnectChatContext.reconnectId ?? ""
+    });
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+      payload: _ConversationState.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
+exports.handleChatReconnect = handleChatReconnect;
+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 (0, _authHelper.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
+      (0, _authHelper.removeAuthTokenProvider)(chatSDK);
+    }
+    return reconnectChatContext;
+  } catch (error) {
+    _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
+      Event: _TelemetryConstants.TelemetryEvent.GetChatReconnectContextSDKCallFailed,
+      ExceptionDetails: {
+        exception: error
+      }
+    });
   }
+};
 
-  return undefined;
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
-exports.getReconnectIdForAuthenticatedChat = getReconnectIdForAuthenticatedChat;
-
-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
-
-
-exports.handleUnauthenticatedReconnectChat = handleUnauthenticatedReconnectChat;
-
-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
+exports.getChatReconnectContext = getChatReconnectContext;
+const setReconnectIdAndStartChat = async (isAuthenticatedChat, chatSDK, props, dispatch, setAdapter, reconnectId, initStartChat) => {
+  if (!isAuthenticatedChat) {
+    const startUnauthenticatedReconnectChat = {
+      eventName: _TelemetryConstants.BroadcastEvent.StartUnauthenticatedReconnectChat
+    };
+    _omnichannelChatComponents.BroadcastService.postMessage(startUnauthenticatedReconnectChat);
   }
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
-exports.startUnauthenticatedReconnectChat = startUnauthenticatedReconnectChat;
-
-const setReconnectIdAndStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat) => {
-  const startUnauthenticatedReconnectChat = {
-    eventName: _TelemetryConstants.BroadcastEvent.StartUnauthenticatedReconnectChat
-  };
-
-  _omnichannelChatComponents.BroadcastService.postMessage(startUnauthenticatedReconnectChat);
-
   const optionalParams = {
     reconnectId: reconnectId
   };
@@ -125,9 +101,8 @@ const setReconnectIdAndStartChat = async (chatSDK, chatConfig, getAuthToken, dis
     type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
     payload: _ConversationState.ConversationState.Loading
   });
-  await initStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, optionalParams);
+  await initStartChat(chatSDK, dispatch, setAdapter, props, optionalParams);
 };
-
 const redirectPage = (redirectURL, redirectInSameWindow) => {
   const redirectPageRequest = {
     eventName: _TelemetryConstants.BroadcastEvent.RedirectPageRequest,
@@ -135,64 +110,20 @@ const redirectPage = (redirectURL, redirectInSameWindow) => {
       redirectURL: redirectURL
     }
   };
-
   _omnichannelChatComponents.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: _TelemetryConstants.BroadcastEvent.StartUnauthenticatedReconnectChat
-  };
-
-  _omnichannelChatComponents.BroadcastService.postMessage(startUnauthenticatedReconnectChat); // Getting PreChat Survey Context
-
-
-  const parseToJson = false;
-  const preChatSurveyResponse = await chatSDK.getPreChatSurvey(parseToJson);
-
-  if (preChatSurveyResponse) {
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_PRE_CHAT_SURVEY_RESPONSE,
-      payload: preChatSurveyResponse
-    });
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: _ConversationState.ConversationState.Prechat
-    });
-  } else {
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: _ConversationState.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
-
-
-exports.handleRedirectUnauthenticatedReconnectChat = handleRedirectUnauthenticatedReconnectChat;
-
-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 => {
+  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;
+};
+exports.isReconnectEnabled = isReconnectEnabled;
+const hasReconnectId = reconnectAvailabilityResponse => {
+  return reconnectAvailabilityResponse && !(0, _utils.isNullOrUndefined)(reconnectAvailabilityResponse.reconnectId);
 };