@microsoft/omnichannel-chat-widget 0.1.0-main.106d830 → 0.1.0-main.1e0880a

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

@@ -4,107 +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;
-
-  const localizedTexts = { ..._defaultMiddlewareLocalizedTexts.defaultMiddlewareLocalizedTexts,
+  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,
     ...((_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
+  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.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.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({
@@ -113,26 +87,35 @@ const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatStyles)
           });
         }
       } 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
       });
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: undefined
+      });
     };
-
-    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), _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$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
     ...(((_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)),
     store: webChatStore,
@@ -144,9 +127,9 @@ const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatStyles)
     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.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.defaultWebChatContainerStatefulProps.webChatProps) === null || _defaultWebChatContai3 === void 0 ? void 0 : _defaultWebChatContai3.typingIndicatorMiddleware,
     onTelemetry: (0, _WebChatLogger.createWebChatTelemetry)(),
-    ...((_props$webChatContain21 = props.webChatContainerProps) === null || _props$webChatContain21 === void 0 ? void 0 : _props$webChatContain21.webChatProps)
+    cardActionMiddleware: (0, _cardActionMiddleware.createCardActionMiddleware)(((_props$webChatContain21 = props.webChatContainerProps) === null || _props$webChatContain21 === void 0 ? void 0 : _props$webChatContain21.botMagicCode) || undefined),
+    ...((_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

@@ -4,96 +4,91 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.startUnauthenticatedReconnectChat = exports.handleUnauthenticatedReconnectChat = exports.handleRedirectUnauthenticatedReconnectChat = exports.getReconnectIdForAuthenticatedChat = exports.getChatReconnectContext = void 0;
-
 require("regenerator-runtime/runtime");
-
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
-
 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, 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.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
-      Event: _TelemetryConstants.TelemetryEvent.GetChatReconnectContextSDKCallFailed,
-      ExceptionDetails: {
-        exception: ex
+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
+        }
+      });
+    }
   }
-
   return null;
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.getChatReconnectContext = getChatReconnectContext;
-
 const getReconnectIdForAuthenticatedChat = async (props, chatSDK) => {
-  var _props$reconnectChatP, _props$reconnectChatP2;
-
-  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);
-
+  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;
+  }
+  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;
     }
   }
-
   return undefined;
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.getReconnectIdForAuthenticatedChat = getReconnectIdForAuthenticatedChat;
-
-const handleUnauthenticatedReconnectChat = async (chatSDK, dispatch, setAdapter, reconnectId, initStartChat, redirectInSameWindow) => {
-  const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, reconnectId);
-
+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, dispatch, setAdapter, initStartChat, redirectInSameWindow);
+    await redirectOrStartNewChat(reconnectAvailabilityResponse, chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, redirectInSameWindow);
   } else {
-    await setReconnectIdAndStartChat(chatSDK, dispatch, setAdapter, reconnectId, initStartChat);
+    await setReconnectIdAndStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat);
   }
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.handleUnauthenticatedReconnectChat = handleUnauthenticatedReconnectChat;
-
-const startUnauthenticatedReconnectChat = async (chatSDK, dispatch, setAdapter, reconnectId, initStartChat) => {
-  const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, reconnectId);
-
+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, dispatch, setAdapter, reconnectId, initStartChat);
+    await setReconnectIdAndStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat);
   }
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.startUnauthenticatedReconnectChat = startUnauthenticatedReconnectChat;
-
-const setReconnectIdAndStartChat = async (chatSDK, dispatch, setAdapter, reconnectId, initStartChat) => {
+const setReconnectIdAndStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat) => {
   const startUnauthenticatedReconnectChat = {
     eventName: _TelemetryConstants.BroadcastEvent.StartUnauthenticatedReconnectChat
   };
-
   _omnichannelChatComponents.BroadcastService.postMessage(startUnauthenticatedReconnectChat);
-
   const optionalParams = {
     reconnectId: reconnectId
   };
@@ -105,9 +100,8 @@ const setReconnectIdAndStartChat = async (chatSDK, dispatch, setAdapter, reconne
     type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
     payload: _ConversationState.ConversationState.Loading
   });
-  await initStartChat(chatSDK, dispatch, setAdapter, optionalParams);
+  await initStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, optionalParams);
 };
-
 const redirectPage = (redirectURL, redirectInSameWindow) => {
   const redirectPageRequest = {
     eventName: _TelemetryConstants.BroadcastEvent.RedirectPageRequest,
@@ -115,30 +109,24 @@ 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, dispatch, setAdapter, initStartChat) => {
+// 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
-
-
+  _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,
@@ -153,26 +141,24 @@ const startNewChatEmptyRedirectionUrl = async (chatSDK, dispatch, setAdapter, in
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: _ConversationState.ConversationState.Loading
     });
-    await initStartChat(chatSDK, dispatch, setAdapter);
+    await initStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter);
   }
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
-const handleRedirectUnauthenticatedReconnectChat = async (chatSDK, dispatch, setAdapter, initStartChat, reconnectId, redirectInSameWindow) => {
-  const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, reconnectId);
+};
 
+// 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, dispatch, setAdapter, initStartChat, redirectInSameWindow);
+    await redirectOrStartNewChat(reconnectAvailabilityResponse, chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, redirectInSameWindow);
   }
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.handleRedirectUnauthenticatedReconnectChat = handleRedirectUnauthenticatedReconnectChat;
-
-const redirectOrStartNewChat = async (reconnectAvailabilityResponse, chatSDK, dispatch, setAdapter, initStartChat, redirectInSameWindow) => {
+const redirectOrStartNewChat = async (reconnectAvailabilityResponse, chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, redirectInSameWindow) => {
   if (reconnectAvailabilityResponse.redirectURL) {
     redirectPage(reconnectAvailabilityResponse.redirectURL, redirectInSameWindow);
   } else {
-    await startNewChatEmptyRedirectionUrl(chatSDK, dispatch, setAdapter, initStartChat);
+    await startNewChatEmptyRedirectionUrl(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat);
   }
 };

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

@@ -4,58 +4,35 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.registerTelemetryLoggers = void 0;
-
 var _TelemetryManager = require("../../../common/telemetry/TelemetryManager");
-
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
-
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
-
-var _package = require("@microsoft/omnichannel-chat-components/package.json");
-
-var _package2 = require("@microsoft/omnichannel-chat-sdk/package.json");
-
 var _defaultAriaConfig = require("../../../common/telemetry/defaultConfigs/defaultAriaConfig");
-
 var _defaultTelemetryInternalData = require("../../../common/telemetry/defaultConfigs/defaultTelemetryInternalData");
-
 var _defaultTelemetryConfiguration = require("../../../common/telemetry/defaultConfigs/defaultTelemetryConfiguration");
-
 const registerTelemetryLoggers = (props, dispatch) => {
   var _props$liveChatContex, _props$liveChatContex2;
-
-  let widgetPackageInfo;
-
-  try {
-    widgetPackageInfo = require("@microsoft/omnichannel-chat-widget/package.json");
-  } catch (error) {
-    widgetPackageInfo = "0.0.0-0";
-  }
-
-  const telemetryConfig = { ..._defaultTelemetryConfiguration.defaultTelemetryConfiguration,
+  const telemetryConfig = {
+    ..._defaultTelemetryConfiguration.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.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 = { ..._defaultTelemetryInternalData.defaultInternalTelemetryData,
+    let telemetryData = {
+      ..._defaultTelemetryInternalData.defaultInternalTelemetryData,
       telemetryConfig: Object.assign({}, _defaultTelemetryConfiguration.defaultTelemetryConfiguration, telemetryConfig),
       ariaConfig: Object.assign({}, _defaultAriaConfig.defaultAriaConfig, telemetryConfig === null || telemetryConfig === void 0 ? void 0 : telemetryConfig.ariaConfigurations)
     };
-
     if (props.chatConfig) {
       telemetryData = _TelemetryHelper.TelemetryHelper.addChatConfigDataToTelemetry(props === null || props === void 0 ? void 0 : props.chatConfig, telemetryData);
     }
-
     telemetryData = _TelemetryHelper.TelemetryHelper.addWidgetDataToTelemetry(telemetryConfig, telemetryData);
-    telemetryData.OCChatSDKVersion = _package2.version;
-    telemetryData.chatComponentVersion = _package.version;
-    telemetryData.chatWidgetVersion = widgetPackageInfo;
+    telemetryData.OCChatSDKVersion = telemetryConfig.OCChatSDKVersion ?? "0.0.0-0";
+    telemetryData.chatComponentVersion = telemetryConfig.chatComponentVersion ?? "0.0.0-0";
+    telemetryData.chatWidgetVersion = telemetryConfig.chatWidgetVersion ?? "0.0.0-0";
     telemetryData.orgId = (_props$chatSDK = props.chatSDK) === null || _props$chatSDK === void 0 ? void 0 : (_props$chatSDK$omnich = _props$chatSDK.omnichannelConfig) === null || _props$chatSDK$omnich === void 0 ? void 0 : _props$chatSDK$omnich.orgId;
     telemetryData.widgetId = (_props$chatSDK2 = props.chatSDK) === null || _props$chatSDK2 === void 0 ? void 0 : (_props$chatSDK2$omnic = _props$chatSDK2.omnichannelConfig) === null || _props$chatSDK2$omnic === void 0 ? void 0 : _props$chatSDK2$omnic.widgetId;
     telemetryData.orgUrl = (_props$chatSDK3 = props.chatSDK) === null || _props$chatSDK3 === void 0 ? void 0 : (_props$chatSDK3$omnic = _props$chatSDK3.omnichannelConfig) === null || _props$chatSDK3$omnic === void 0 ? void 0 : _props$chatSDK3$omnic.orgUrl;
@@ -65,8 +42,6 @@ const registerTelemetryLoggers = (props, dispatch) => {
       payload: telemetryData
     });
   }
-
   (0, _TelemetryManager.RegisterLoggers)();
 };
-
 exports.registerTelemetryLoggers = registerTelemetryLoggers;

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

@@ -4,29 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.setPostChatContextAndLoadSurvey = void 0;
-
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
-
 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");
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat) => {
   try {
     if (!persistedChat) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const context = await chatSDK.getPostChatSurveyContext();
-
       _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
         Event: _TelemetryConstants.TelemetryEvent.PostChatContextCallSucceed,
         Description: "Postchat context call succeed."
       });
-
       dispatch({
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_POST_CHAT_CONTEXT,
         payload: context
@@ -39,19 +31,14 @@ const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat)
         exception: ex
       }
     });
-  } // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+  }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   _omnichannelChatComponents.BroadcastService.getMessageByEventName("LoadPostChatSurvey").subscribe(msg => {
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: _ConversationState.ConversationState.Loading
-    });
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: _ConversationState.ConversationState.Postchat
     });
   });
 };
-
 exports.setPostChatContextAndLoadSurvey = setPostChatContextAndLoadSurvey;

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

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shareObservable = shareObservable;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function shareObservable(observable) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let observers = [];
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let subscription;
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return new window.Observable(observer => {
+    if (!subscription) {
+      subscription = observable.subscribe({
+        complete() {
+          observers.forEach(observer => observer.complete());
+        },
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        error(err) {
+          observers.forEach(observer => observer.error(err));
+        },
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        next(value) {
+          observers.forEach(observer => observer.next(value));
+        }
+      });
+    }
+    observers.push(observer);
+    return () => {
+      observers = observers.filter(o => o !== observer);
+      if (!observers.length) {
+        subscription.unsubscribe();
+        subscription = null;
+      }
+    };
+  });
+}