npm - @microsoft/omnichannel-chat-widget - Versions diffs - 1.7.2 → 1.7.3-main.0ecdb73 - Mend

@microsoft/omnichannel-chat-widget 1.7.2 → 1.7.3-main.0ecdb73

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/lib/cjs/common/telemetry/TelemetryConstants.js CHANGED Viewed

@@ -101,6 +101,7 @@ exports.TelemetryEvent = TelemetryEvent;
   TelemetryEvent["GetConversationDetailsCallStarted"] = "GetConversationDetailsCallStarted";
   TelemetryEvent["GetConversationDetailsCallFailed"] = "GetConversationDetailsCallFailed";
   TelemetryEvent["EndChatSDKCallFailed"] = "EndChatSDKCallFailed";
+  TelemetryEvent["DisconnectEndChatSDKCallFailed"] = "DisconnectEndChatSDKCallFailed";
   TelemetryEvent["GetChatReconnectContextSDKCallStarted"] = "GetChatReconnectContextSDKCallStarted";
   TelemetryEvent["GetChatReconnectContextSDKCallFailed"] = "GetChatReconnectContextSDKCallFailed";
   TelemetryEvent["ParseAdaptiveCardFailed"] = "ParseAdaptiveCardFailed";

package/lib/cjs/components/livechatwidget/common/endChat.js CHANGED Viewed

@@ -141,12 +141,27 @@ const endChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatSt
       await (0, _authHelper.handleAuthentication)(chatSDK, props.chatConfig, props.getAuthToken);
       await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat());
     } catch (ex) {
-      _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
-        Event: _TelemetryConstants.TelemetryEvent.EndChatSDKCallFailed,
-        ExceptionDetails: {
-          exception: ex
-        }
+      var _inMemoryState$appSta;
+      const inMemoryState = (0, _createReducer.executeReducer)(state, {
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.GET_IN_MEMORY_STATE,
+        payload: null
       });
+      // if the chat was disconnected or ended by the agent, we don't want to log the error
+      if (!(inMemoryState !== null && inMemoryState !== void 0 && (_inMemoryState$appSta = inMemoryState.appStates) !== null && _inMemoryState$appSta !== void 0 && _inMemoryState$appSta.chatDisconnectEventReceived)) {
+        _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
+          Event: _TelemetryConstants.TelemetryEvent.EndChatSDKCallFailed,
+          ExceptionDetails: {
+            exception: ex
+          }
+        });
+      } else {
+        _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.WARN, {
+          Event: _TelemetryConstants.TelemetryEvent.DisconnectEndChatSDKCallFailed,
+          ExceptionDetails: {
+            exception: ex
+          }
+        });
+      }
       postMessageToOtherTab = false;
     } finally {
       await endChatStateCleanUp(dispatch);

package/lib/cjs/components/livechatwidget/common/liveChatConfigUtils.js CHANGED Viewed

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isPostChatSurveyEnabled = void 0;
+exports.isPostChatSurveyEnabled = exports.isPersistentChatEnabled = void 0;
+var _Constants = require("../../../common/Constants");
+var _utils = require("../../../common/utils");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const isPostChatSurveyEnabled = async chatSDK => {
   var _chatConfig$LiveWSAnd;
@@ -11,4 +13,11 @@ const isPostChatSurveyEnabled = async chatSDK => {
   const postChatEnabled = (_chatConfig$LiveWSAnd = chatConfig.LiveWSAndLiveChatEngJoin) === null || _chatConfig$LiveWSAnd === void 0 ? void 0 : _chatConfig$LiveWSAnd.msdyn_postconversationsurveyenable.toString().toLowerCase();
   return postChatEnabled === "true";
 };
-exports.isPostChatSurveyEnabled = isPostChatSurveyEnabled;
+exports.isPostChatSurveyEnabled = isPostChatSurveyEnabled;
+const isPersistentChatEnabled = async conversationMode => {
+  if ((0, _utils.isNullOrUndefined)(conversationMode)) {
+    return false;
+  }
+  return (conversationMode === null || conversationMode === void 0 ? void 0 : conversationMode.toString().toLowerCase()) === _Constants.ConversationMode.Persistent;
+};
+exports.isPersistentChatEnabled = isPersistentChatEnabled;

package/lib/cjs/components/livechatwidget/common/persistentChatHelper.js ADDED Viewed

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shouldSetPreChatIfPersistentChat = void 0;
+var _liveChatConfigUtils = require("./liveChatConfigUtils");
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const shouldSetPreChatIfPersistentChat = async (chatSDK, conversationMode, showPreChat) => {
+  const persistentEnabled = await (0, _liveChatConfigUtils.isPersistentChatEnabled)(conversationMode);
+  let skipPreChat = false;
+  if (persistentEnabled) {
+    const reconnectableChatsParams = {
+      authenticatedUserToken: chatSDK.authenticatedUserToken
+    };
+    try {
+      const reconnectableChatsResponse = await chatSDK.OCClient.getReconnectableChats(reconnectableChatsParams);
+      if (reconnectableChatsResponse && reconnectableChatsResponse.reconnectid) {
+        // Skip rendering prechat on existing persistent chat session
+        skipPreChat = true;
+      }
+    } catch {
+      // eslint-disable-line no-empty
+    }
+  }
+  return showPreChat && !skipPreChat;
+};
+exports.shouldSetPreChatIfPersistentChat = shouldSetPreChatIfPersistentChat;

package/lib/cjs/components/livechatwidget/common/startChat.js CHANGED Viewed

@@ -21,6 +21,8 @@ var _setPostChatContextAndLoadSurvey = require("./setPostChatContextAndLoadSurve
 var _updateSessionDataForTelemetry = require("./updateSessionDataForTelemetry");
 var _startChatErrorHandler = require("./startChatErrorHandler");
 var _endChat = require("./endChat");
+var _liveChatConfigUtils = require("./liveChatConfigUtils");
+var _persistentChatHelper = require("./persistentChatHelper");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let optionalParams = {};
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -28,10 +30,25 @@ let widgetInstanceId;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let popoutWidgetInstanceId;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const setAuthenticationIfApplicable = async (props, chatSDK) => {
+  const chatConfig = props === null || props === void 0 ? void 0 : props.chatConfig;
+  const getAuthToken = props === null || props === void 0 ? void 0 : props.getAuthToken;
+  const authClientFunction = (0, _authHelper.getAuthClientFunction)(chatConfig);
+  if (getAuthToken && authClientFunction) {
+    // set auth token to chat sdk before start chat
+    const authSuccess = await (0, _authHelper.handleAuthentication)(chatSDK, chatConfig, getAuthToken);
+    if (!authSuccess) {
+      throw new Error(_Constants.WidgetLoadCustomErrorString.AuthenticationFailedErrorString);
+    }
+  }
+};
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) => {
   optionalParams = {}; //Resetting to ensure no stale values
   widgetInstanceId = (0, _utils.getWidgetCacheIdfromProps)(props);
   // reconnect > chat from cache
   if ((0, _reconnectChatHelper.isReconnectEnabled)(props.chatConfig) === true && !(0, _reconnectChatHelper.isPersistentEnabled)(props.chatConfig)) {
     const shouldStartChatNormally = await (0, _reconnectChatHelper.handleChatReconnect)(chatSDK, props, dispatch, setAdapter, initStartChat, state);
@@ -54,6 +71,11 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
   const isProactiveChat = state.appStates.conversationState === _ConversationState.ConversationState.ProactiveChat;
   const isPreChatEnabledInProactiveChat = state.appStates.proactiveChatStates.proactiveChatEnablePrechat;
+  // Setting auth settings to OC API to retrieve existing persistent chat session before start chat if any
+  if ((0, _reconnectChatHelper.isPersistentEnabled)(props.chatConfig)) {
+    await setAuthenticationIfApplicable(props, chatSDK);
+  }
   //Setting PreChat and intiate chat
   await setPreChatAndInitiateChat(chatSDK, dispatch, setAdapter, isProactiveChat, isPreChatEnabledInProactiveChat, state, props);
 };
@@ -61,16 +83,17 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.prepareStartChat = prepareStartChat;
 const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProactiveChat, proactiveChatEnablePrechatState, state, props) => {
-  var _props$preChatSurveyP, _props$preChatSurveyP2, _props$controlProps;
+  var _props$preChatSurveyP, _props$preChatSurveyP2, _props$controlProps, _state$domainStates, _state$domainStates$l, _state$domainStates$l2;
   //Handle reconnect scenario
   // Getting prechat Survey Context
   const parseToJson = false;
   const preChatSurveyResponse = (props === null || props === void 0 ? void 0 : (_props$preChatSurveyP = props.preChatSurveyPaneProps) === null || _props$preChatSurveyP === void 0 ? void 0 : (_props$preChatSurveyP2 = _props$preChatSurveyP.controlProps) === null || _props$preChatSurveyP2 === void 0 ? void 0 : _props$preChatSurveyP2.payload) ?? (await chatSDK.getPreChatSurvey(parseToJson));
-  const showPrechat = isProactiveChat ? preChatSurveyResponse && proactiveChatEnablePrechatState : preChatSurveyResponse && !(props !== null && props !== void 0 && (_props$controlProps = props.controlProps) !== null && _props$controlProps !== void 0 && _props$controlProps.hidePreChatSurveyPane);
+  let showPrechat = isProactiveChat ? preChatSurveyResponse && proactiveChatEnablePrechatState : preChatSurveyResponse && !(props !== null && props !== void 0 && (_props$controlProps = props.controlProps) !== null && _props$controlProps !== void 0 && _props$controlProps.hidePreChatSurveyPane);
+  showPrechat = await (0, _persistentChatHelper.shouldSetPreChatIfPersistentChat)(chatSDK, state === null || state === void 0 ? void 0 : (_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : (_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_conversationmode, showPrechat);
   if (showPrechat) {
-    var _state$domainStates, _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3;
-    const isOutOfOperatingHours = (state === null || state === void 0 ? void 0 : (_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : (_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$l3 = _state$domainStates$l2.OutOfOperatingHours) === null || _state$domainStates$l3 === void 0 ? void 0 : _state$domainStates$l3.toLowerCase()) === "true";
+    var _state$domainStates2, _state$domainStates2$, _state$domainStates2$2, _state$domainStates2$3;
+    const isOutOfOperatingHours = (state === null || state === void 0 ? void 0 : (_state$domainStates2 = state.domainStates) === null || _state$domainStates2 === void 0 ? void 0 : (_state$domainStates2$ = _state$domainStates2.liveChatConfig) === null || _state$domainStates2$ === void 0 ? void 0 : (_state$domainStates2$2 = _state$domainStates2$.LiveWSAndLiveChatEngJoin) === null || _state$domainStates2$2 === void 0 ? void 0 : (_state$domainStates2$3 = _state$domainStates2$2.OutOfOperatingHours) === null || _state$domainStates2$3 === void 0 ? void 0 : _state$domainStates2$3.toLowerCase()) === "true";
     if (isOutOfOperatingHours) {
       (state === null || state === void 0 ? void 0 : state.appStates.isMinimized) && dispatch({
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_MINIMIZED,
@@ -94,7 +117,7 @@ const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProact
       // If minimized, maximize the chat, if the state is missing, consider it as minimized
       if ((state === null || state === void 0 ? void 0 : state.appStates.isMinimized) == undefined || (state === null || state === void 0 ? void 0 : (_state$appStates = state.appStates) === null || _state$appStates === void 0 ? void 0 : _state$appStates.isMinimized) === true) {
-        var _state$domainStates2, _state$domainStates2$, _state$domainStates3, _state$domainStates3$;
+        var _state$domainStates3, _state$domainStates3$, _state$domainStates4, _state$domainStates4$;
         dispatch({
           type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_MINIMIZED,
           payload: false
@@ -104,8 +127,8 @@ const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProact
         _omnichannelChatComponents.BroadcastService.postMessage({
           eventName: _TelemetryConstants.BroadcastEvent.MaximizeChat,
           payload: {
-            height: state === null || state === void 0 ? void 0 : (_state$domainStates2 = state.domainStates) === null || _state$domainStates2 === void 0 ? void 0 : (_state$domainStates2$ = _state$domainStates2.widgetSize) === null || _state$domainStates2$ === void 0 ? void 0 : _state$domainStates2$.height,
-            width: state === null || state === void 0 ? void 0 : (_state$domainStates3 = state.domainStates) === null || _state$domainStates3 === void 0 ? void 0 : (_state$domainStates3$ = _state$domainStates3.widgetSize) === null || _state$domainStates3$ === void 0 ? void 0 : _state$domainStates3$.width
+            height: state === null || state === void 0 ? void 0 : (_state$domainStates3 = state.domainStates) === null || _state$domainStates3 === void 0 ? void 0 : (_state$domainStates3$ = _state$domainStates3.widgetSize) === null || _state$domainStates3$ === void 0 ? void 0 : _state$domainStates3$.height,
+            width: state === null || state === void 0 ? void 0 : (_state$domainStates4 = state.domainStates) === null || _state$domainStates4 === void 0 ? void 0 : (_state$domainStates4$ = _state$domainStates4.widgetSize) === null || _state$domainStates4$ === void 0 ? void 0 : _state$domainStates4$.width
           }
         });
       }
@@ -127,9 +150,9 @@ const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProact
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.setPreChatAndInitiateChat = setPreChatAndInitiateChat;
 const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params, persistedState) => {
+  var _state$domainStates5, _state$domainStates5$, _state$domainStates5$2;
   let isStartChatSuccessful = false;
-  const chatConfig = props === null || props === void 0 ? void 0 : props.chatConfig;
-  const getAuthToken = props === null || props === void 0 ? void 0 : props.getAuthToken;
+  const persistentChatEnabled = await (0, _liveChatConfigUtils.isPersistentChatEnabled)(state === null || state === void 0 ? void 0 : (_state$domainStates5 = state.domainStates) === null || _state$domainStates5 === void 0 ? void 0 : (_state$domainStates5$ = _state$domainStates5.liveChatConfig) === null || _state$domainStates5$ === void 0 ? void 0 : (_state$domainStates5$2 = _state$domainStates5$.LiveWSAndLiveChatEngJoin) === null || _state$domainStates5$2 === void 0 ? void 0 : _state$domainStates5$2.msdyn_conversationmode);
   if ((state === null || state === void 0 ? void 0 : state.appStates.conversationState) === _ConversationState.ConversationState.Closed) {
     // Preventive reset to avoid starting chat with previous requestId which could potentially cause problems
     (0, _endChat.chatSDKStateCleanUp)(chatSDK);
@@ -148,14 +171,9 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
       Event: _TelemetryConstants.TelemetryEvent.WidgetLoadStarted,
       Description: "Widget loading started"
     });
-    const authClientFunction = (0, _authHelper.getAuthClientFunction)(chatConfig);
-    if (getAuthToken && authClientFunction) {
-      // set auth token to chat sdk before start chat
-      const authSuccess = await (0, _authHelper.handleAuthentication)(chatSDK, chatConfig, getAuthToken);
-      if (!authSuccess) {
-        throw new Error(_Constants.WidgetLoadCustomErrorString.AuthenticationFailedErrorString);
-      }
-    }
+    // Auth token retrieval needs to happen during start chat to support pop-out chat
+    await setAuthenticationIfApplicable(props, chatSDK);
     //Check if chat retrieved from cache
     if (persistedState || params !== null && params !== void 0 && params.liveChatContext) {
@@ -227,10 +245,14 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const liveChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getCurrentLiveChatContext());
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
-      payload: liveChatContext
-    });
+    // Persistent Chat relies on the `reconnectId` retrieved from reconnectablechats API to reconnect upon start chat and not `liveChatContext`
+    if (!persistentChatEnabled) {
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: liveChatContext
+      });
+    }
     (0, _startChatErrorHandler.logWidgetLoadComplete)();
     // Set post chat context in state
     // Commenting this for now as post chat context is fetched during end chat
@@ -274,17 +296,17 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const setCustomContextParams = async (state, props) => {
-  var _props$chatConfig, _props$chatConfig$Liv, _state$domainStates4, _persistedState$domai8;
+  var _props$chatConfig, _props$chatConfig$Liv, _state$domainStates6, _persistedState$domai8;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isAuthenticatedChat = props !== null && props !== void 0 && (_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;
   //Should not set custom context for auth chat
   if (isAuthenticatedChat) {
     return;
   }
-  if (state !== null && state !== void 0 && (_state$domainStates4 = state.domainStates) !== null && _state$domainStates4 !== void 0 && _state$domainStates4.customContext) {
-    var _state$domainStates5;
+  if (state !== null && state !== void 0 && (_state$domainStates6 = state.domainStates) !== null && _state$domainStates6 !== void 0 && _state$domainStates6.customContext) {
+    var _state$domainStates7;
     optionalParams = Object.assign({}, optionalParams, {
-      customContext: JSON.parse(JSON.stringify(state === null || state === void 0 ? void 0 : (_state$domainStates5 = state.domainStates) === null || _state$domainStates5 === void 0 ? void 0 : _state$domainStates5.customContext))
+      customContext: JSON.parse(JSON.stringify(state === null || state === void 0 ? void 0 : (_state$domainStates7 = state.domainStates) === null || _state$domainStates7 === void 0 ? void 0 : _state$domainStates7.customContext))
     });
     return;
   }
@@ -332,9 +354,9 @@ const canStartPopoutChat = async props => {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const checkIfConversationStillValid = async (chatSDK, dispatch, state) => {
-  var _state$domainStates6, _state$domainStates6$, _state$domainStates7;
-  const requestIdFromCache = (_state$domainStates6 = state.domainStates) === null || _state$domainStates6 === void 0 ? void 0 : (_state$domainStates6$ = _state$domainStates6.liveChatContext) === null || _state$domainStates6$ === void 0 ? void 0 : _state$domainStates6$.requestId;
-  const liveChatContext = state === null || state === void 0 ? void 0 : (_state$domainStates7 = state.domainStates) === null || _state$domainStates7 === void 0 ? void 0 : _state$domainStates7.liveChatContext;
+  var _state$domainStates8, _state$domainStates8$, _state$domainStates9;
+  const requestIdFromCache = (_state$domainStates8 = state.domainStates) === null || _state$domainStates8 === void 0 ? void 0 : (_state$domainStates8$ = _state$domainStates8.liveChatContext) === null || _state$domainStates8$ === void 0 ? void 0 : _state$domainStates8$.requestId;
+  const liveChatContext = state === null || state === void 0 ? void 0 : (_state$domainStates9 = state.domainStates) === null || _state$domainStates9 === void 0 ? void 0 : _state$domainStates9.liveChatContext;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let conversationDetails = undefined;

package/lib/cjs/components/webchatcontainerstateful/common/mockchatsdk.js CHANGED Viewed

@@ -66,9 +66,13 @@ class MockChatSDK {
   getLiveChatConfig() {
     return {
       LiveWSAndLiveChatEngJoin: {
-        msdyn_postconversationsurveyenable: "true"
+        msdyn_postconversationsurveyenable: "true",
+        msdyn_conversationmode: "192350000"
       }
     };
   }
+  sendTypingEvent() {
+    return null;
+  }
 }
 exports.MockChatSDK = MockChatSDK;

package/lib/esm/common/telemetry/TelemetryConstants.js CHANGED Viewed

@@ -95,6 +95,7 @@ export let TelemetryEvent;
   TelemetryEvent["GetConversationDetailsCallStarted"] = "GetConversationDetailsCallStarted";
   TelemetryEvent["GetConversationDetailsCallFailed"] = "GetConversationDetailsCallFailed";
   TelemetryEvent["EndChatSDKCallFailed"] = "EndChatSDKCallFailed";
+  TelemetryEvent["DisconnectEndChatSDKCallFailed"] = "DisconnectEndChatSDKCallFailed";
   TelemetryEvent["GetChatReconnectContextSDKCallStarted"] = "GetChatReconnectContextSDKCallStarted";
   TelemetryEvent["GetChatReconnectContextSDKCallFailed"] = "GetChatReconnectContextSDKCallFailed";
   TelemetryEvent["ParseAdaptiveCardFailed"] = "ParseAdaptiveCardFailed";

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

@@ -135,12 +135,27 @@ const endChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatSt
       await handleAuthentication(chatSDK, props.chatConfig, props.getAuthToken);
       await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat());
     } catch (ex) {
-      TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
-        Event: TelemetryEvent.EndChatSDKCallFailed,
-        ExceptionDetails: {
-          exception: ex
-        }
+      var _inMemoryState$appSta;
+      const inMemoryState = executeReducer(state, {
+        type: LiveChatWidgetActionType.GET_IN_MEMORY_STATE,
+        payload: null
       });
+      // if the chat was disconnected or ended by the agent, we don't want to log the error
+      if (!(inMemoryState !== null && inMemoryState !== void 0 && (_inMemoryState$appSta = inMemoryState.appStates) !== null && _inMemoryState$appSta !== void 0 && _inMemoryState$appSta.chatDisconnectEventReceived)) {
+        TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
+          Event: TelemetryEvent.EndChatSDKCallFailed,
+          ExceptionDetails: {
+            exception: ex
+          }
+        });
+      } else {
+        TelemetryHelper.logSDKEvent(LogLevel.WARN, {
+          Event: TelemetryEvent.DisconnectEndChatSDKCallFailed,
+          ExceptionDetails: {
+            exception: ex
+          }
+        });
+      }
       postMessageToOtherTab = false;
     } finally {
       await endChatStateCleanUp(dispatch);

package/lib/esm/components/livechatwidget/common/liveChatConfigUtils.js CHANGED Viewed

@@ -1,7 +1,16 @@
+import { ConversationMode } from "../../../common/Constants";
+import { isNullOrUndefined } from "../../../common/utils";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const isPostChatSurveyEnabled = async chatSDK => {
   var _chatConfig$LiveWSAnd;
   const chatConfig = await chatSDK.getLiveChatConfig();
   const postChatEnabled = (_chatConfig$LiveWSAnd = chatConfig.LiveWSAndLiveChatEngJoin) === null || _chatConfig$LiveWSAnd === void 0 ? void 0 : _chatConfig$LiveWSAnd.msdyn_postconversationsurveyenable.toString().toLowerCase();
   return postChatEnabled === "true";
+};
+export const isPersistentChatEnabled = async conversationMode => {
+  if (isNullOrUndefined(conversationMode)) {
+    return false;
+  }
+  return (conversationMode === null || conversationMode === void 0 ? void 0 : conversationMode.toString().toLowerCase()) === ConversationMode.Persistent;
 };

package/lib/esm/components/livechatwidget/common/persistentChatHelper.js ADDED Viewed

@@ -0,0 +1,22 @@
+import { isPersistentChatEnabled } from "./liveChatConfigUtils";
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const shouldSetPreChatIfPersistentChat = async (chatSDK, conversationMode, showPreChat) => {
+  const persistentEnabled = await isPersistentChatEnabled(conversationMode);
+  let skipPreChat = false;
+  if (persistentEnabled) {
+    const reconnectableChatsParams = {
+      authenticatedUserToken: chatSDK.authenticatedUserToken
+    };
+    try {
+      const reconnectableChatsResponse = await chatSDK.OCClient.getReconnectableChats(reconnectableChatsParams);
+      if (reconnectableChatsResponse && reconnectableChatsResponse.reconnectid) {
+        // Skip rendering prechat on existing persistent chat session
+        skipPreChat = true;
+      }
+    } catch {
+      // eslint-disable-line no-empty
+    }
+  }
+  return showPreChat && !skipPreChat;
+};

package/lib/esm/components/livechatwidget/common/startChat.js CHANGED Viewed

@@ -15,6 +15,8 @@ import { setPostChatContextAndLoadSurvey } from "./setPostChatContextAndLoadSurv
 import { updateSessionDataForTelemetry } from "./updateSessionDataForTelemetry";
 import { logWidgetLoadComplete, handleStartChatError } from "./startChatErrorHandler";
 import { chatSDKStateCleanUp } from "./endChat";
+import { isPersistentChatEnabled } from "./liveChatConfigUtils";
+import { shouldSetPreChatIfPersistentChat } from "./persistentChatHelper";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let optionalParams = {};
@@ -23,10 +25,25 @@ let widgetInstanceId;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let popoutWidgetInstanceId;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const setAuthenticationIfApplicable = async (props, chatSDK) => {
+  const chatConfig = props === null || props === void 0 ? void 0 : props.chatConfig;
+  const getAuthToken = props === null || props === void 0 ? void 0 : props.getAuthToken;
+  const authClientFunction = getAuthClientFunction(chatConfig);
+  if (getAuthToken && authClientFunction) {
+    // set auth token to chat sdk before start chat
+    const authSuccess = await handleAuthentication(chatSDK, chatConfig, getAuthToken);
+    if (!authSuccess) {
+      throw new Error(WidgetLoadCustomErrorString.AuthenticationFailedErrorString);
+    }
+  }
+};
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) => {
   optionalParams = {}; //Resetting to ensure no stale values
   widgetInstanceId = getWidgetCacheIdfromProps(props);
   // reconnect > chat from cache
   if (isReconnectEnabled(props.chatConfig) === true && !isPersistentEnabled(props.chatConfig)) {
     const shouldStartChatNormally = await handleChatReconnect(chatSDK, props, dispatch, setAdapter, initStartChat, state);
@@ -49,22 +66,28 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
   const isProactiveChat = state.appStates.conversationState === ConversationState.ProactiveChat;
   const isPreChatEnabledInProactiveChat = state.appStates.proactiveChatStates.proactiveChatEnablePrechat;
+  // Setting auth settings to OC API to retrieve existing persistent chat session before start chat if any
+  if (isPersistentEnabled(props.chatConfig)) {
+    await setAuthenticationIfApplicable(props, chatSDK);
+  }
   //Setting PreChat and intiate chat
   await setPreChatAndInitiateChat(chatSDK, dispatch, setAdapter, isProactiveChat, isPreChatEnabledInProactiveChat, state, props);
 };
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProactiveChat, proactiveChatEnablePrechatState, state, props) => {
-  var _props$preChatSurveyP, _props$preChatSurveyP2, _props$controlProps;
+  var _props$preChatSurveyP, _props$preChatSurveyP2, _props$controlProps, _state$domainStates, _state$domainStates$l, _state$domainStates$l2;
   //Handle reconnect scenario
   // Getting prechat Survey Context
   const parseToJson = false;
   const preChatSurveyResponse = (props === null || props === void 0 ? void 0 : (_props$preChatSurveyP = props.preChatSurveyPaneProps) === null || _props$preChatSurveyP === void 0 ? void 0 : (_props$preChatSurveyP2 = _props$preChatSurveyP.controlProps) === null || _props$preChatSurveyP2 === void 0 ? void 0 : _props$preChatSurveyP2.payload) ?? (await chatSDK.getPreChatSurvey(parseToJson));
-  const showPrechat = isProactiveChat ? preChatSurveyResponse && proactiveChatEnablePrechatState : preChatSurveyResponse && !(props !== null && props !== void 0 && (_props$controlProps = props.controlProps) !== null && _props$controlProps !== void 0 && _props$controlProps.hidePreChatSurveyPane);
+  let showPrechat = isProactiveChat ? preChatSurveyResponse && proactiveChatEnablePrechatState : preChatSurveyResponse && !(props !== null && props !== void 0 && (_props$controlProps = props.controlProps) !== null && _props$controlProps !== void 0 && _props$controlProps.hidePreChatSurveyPane);
+  showPrechat = await shouldSetPreChatIfPersistentChat(chatSDK, state === null || state === void 0 ? void 0 : (_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : (_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_conversationmode, showPrechat);
   if (showPrechat) {
-    var _state$domainStates, _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3;
-    const isOutOfOperatingHours = (state === null || state === void 0 ? void 0 : (_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : (_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$l3 = _state$domainStates$l2.OutOfOperatingHours) === null || _state$domainStates$l3 === void 0 ? void 0 : _state$domainStates$l3.toLowerCase()) === "true";
+    var _state$domainStates2, _state$domainStates2$, _state$domainStates2$2, _state$domainStates2$3;
+    const isOutOfOperatingHours = (state === null || state === void 0 ? void 0 : (_state$domainStates2 = state.domainStates) === null || _state$domainStates2 === void 0 ? void 0 : (_state$domainStates2$ = _state$domainStates2.liveChatConfig) === null || _state$domainStates2$ === void 0 ? void 0 : (_state$domainStates2$2 = _state$domainStates2$.LiveWSAndLiveChatEngJoin) === null || _state$domainStates2$2 === void 0 ? void 0 : (_state$domainStates2$3 = _state$domainStates2$2.OutOfOperatingHours) === null || _state$domainStates2$3 === void 0 ? void 0 : _state$domainStates2$3.toLowerCase()) === "true";
     if (isOutOfOperatingHours) {
       (state === null || state === void 0 ? void 0 : state.appStates.isMinimized) && dispatch({
         type: LiveChatWidgetActionType.SET_MINIMIZED,
@@ -88,7 +111,7 @@ const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProact
       // If minimized, maximize the chat, if the state is missing, consider it as minimized
       if ((state === null || state === void 0 ? void 0 : state.appStates.isMinimized) == undefined || (state === null || state === void 0 ? void 0 : (_state$appStates = state.appStates) === null || _state$appStates === void 0 ? void 0 : _state$appStates.isMinimized) === true) {
-        var _state$domainStates2, _state$domainStates2$, _state$domainStates3, _state$domainStates3$;
+        var _state$domainStates3, _state$domainStates3$, _state$domainStates4, _state$domainStates4$;
         dispatch({
           type: LiveChatWidgetActionType.SET_MINIMIZED,
           payload: false
@@ -98,8 +121,8 @@ const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProact
         BroadcastService.postMessage({
           eventName: BroadcastEvent.MaximizeChat,
           payload: {
-            height: state === null || state === void 0 ? void 0 : (_state$domainStates2 = state.domainStates) === null || _state$domainStates2 === void 0 ? void 0 : (_state$domainStates2$ = _state$domainStates2.widgetSize) === null || _state$domainStates2$ === void 0 ? void 0 : _state$domainStates2$.height,
-            width: state === null || state === void 0 ? void 0 : (_state$domainStates3 = state.domainStates) === null || _state$domainStates3 === void 0 ? void 0 : (_state$domainStates3$ = _state$domainStates3.widgetSize) === null || _state$domainStates3$ === void 0 ? void 0 : _state$domainStates3$.width
+            height: state === null || state === void 0 ? void 0 : (_state$domainStates3 = state.domainStates) === null || _state$domainStates3 === void 0 ? void 0 : (_state$domainStates3$ = _state$domainStates3.widgetSize) === null || _state$domainStates3$ === void 0 ? void 0 : _state$domainStates3$.height,
+            width: state === null || state === void 0 ? void 0 : (_state$domainStates4 = state.domainStates) === null || _state$domainStates4 === void 0 ? void 0 : (_state$domainStates4$ = _state$domainStates4.widgetSize) === null || _state$domainStates4$ === void 0 ? void 0 : _state$domainStates4$.width
           }
         });
       }
@@ -120,9 +143,9 @@ const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProact
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params, persistedState) => {
+  var _state$domainStates5, _state$domainStates5$, _state$domainStates5$2;
   let isStartChatSuccessful = false;
-  const chatConfig = props === null || props === void 0 ? void 0 : props.chatConfig;
-  const getAuthToken = props === null || props === void 0 ? void 0 : props.getAuthToken;
+  const persistentChatEnabled = await isPersistentChatEnabled(state === null || state === void 0 ? void 0 : (_state$domainStates5 = state.domainStates) === null || _state$domainStates5 === void 0 ? void 0 : (_state$domainStates5$ = _state$domainStates5.liveChatConfig) === null || _state$domainStates5$ === void 0 ? void 0 : (_state$domainStates5$2 = _state$domainStates5$.LiveWSAndLiveChatEngJoin) === null || _state$domainStates5$2 === void 0 ? void 0 : _state$domainStates5$2.msdyn_conversationmode);
   if ((state === null || state === void 0 ? void 0 : state.appStates.conversationState) === ConversationState.Closed) {
     // Preventive reset to avoid starting chat with previous requestId which could potentially cause problems
     chatSDKStateCleanUp(chatSDK);
@@ -141,14 +164,9 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
       Event: TelemetryEvent.WidgetLoadStarted,
       Description: "Widget loading started"
     });
-    const authClientFunction = getAuthClientFunction(chatConfig);
-    if (getAuthToken && authClientFunction) {
-      // set auth token to chat sdk before start chat
-      const authSuccess = await handleAuthentication(chatSDK, chatConfig, getAuthToken);
-      if (!authSuccess) {
-        throw new Error(WidgetLoadCustomErrorString.AuthenticationFailedErrorString);
-      }
-    }
+    // Auth token retrieval needs to happen during start chat to support pop-out chat
+    await setAuthenticationIfApplicable(props, chatSDK);
     //Check if chat retrieved from cache
     if (persistedState || params !== null && params !== void 0 && params.liveChatContext) {
@@ -220,10 +238,14 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const liveChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getCurrentLiveChatContext());
-    dispatch({
-      type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
-      payload: liveChatContext
-    });
+    // Persistent Chat relies on the `reconnectId` retrieved from reconnectablechats API to reconnect upon start chat and not `liveChatContext`
+    if (!persistentChatEnabled) {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: liveChatContext
+      });
+    }
     logWidgetLoadComplete();
     // Set post chat context in state
     // Commenting this for now as post chat context is fetched during end chat
@@ -266,17 +288,17 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const setCustomContextParams = async (state, props) => {
-  var _props$chatConfig, _props$chatConfig$Liv, _state$domainStates4, _persistedState$domai8;
+  var _props$chatConfig, _props$chatConfig$Liv, _state$domainStates6, _persistedState$domai8;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isAuthenticatedChat = props !== null && props !== void 0 && (_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;
   //Should not set custom context for auth chat
   if (isAuthenticatedChat) {
     return;
   }
-  if (state !== null && state !== void 0 && (_state$domainStates4 = state.domainStates) !== null && _state$domainStates4 !== void 0 && _state$domainStates4.customContext) {
-    var _state$domainStates5;
+  if (state !== null && state !== void 0 && (_state$domainStates6 = state.domainStates) !== null && _state$domainStates6 !== void 0 && _state$domainStates6.customContext) {
+    var _state$domainStates7;
     optionalParams = Object.assign({}, optionalParams, {
-      customContext: JSON.parse(JSON.stringify(state === null || state === void 0 ? void 0 : (_state$domainStates5 = state.domainStates) === null || _state$domainStates5 === void 0 ? void 0 : _state$domainStates5.customContext))
+      customContext: JSON.parse(JSON.stringify(state === null || state === void 0 ? void 0 : (_state$domainStates7 = state.domainStates) === null || _state$domainStates7 === void 0 ? void 0 : _state$domainStates7.customContext))
     });
     return;
   }
@@ -324,9 +346,9 @@ const canStartPopoutChat = async props => {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const checkIfConversationStillValid = async (chatSDK, dispatch, state) => {
-  var _state$domainStates6, _state$domainStates6$, _state$domainStates7;
-  const requestIdFromCache = (_state$domainStates6 = state.domainStates) === null || _state$domainStates6 === void 0 ? void 0 : (_state$domainStates6$ = _state$domainStates6.liveChatContext) === null || _state$domainStates6$ === void 0 ? void 0 : _state$domainStates6$.requestId;
-  const liveChatContext = state === null || state === void 0 ? void 0 : (_state$domainStates7 = state.domainStates) === null || _state$domainStates7 === void 0 ? void 0 : _state$domainStates7.liveChatContext;
+  var _state$domainStates8, _state$domainStates8$, _state$domainStates9;
+  const requestIdFromCache = (_state$domainStates8 = state.domainStates) === null || _state$domainStates8 === void 0 ? void 0 : (_state$domainStates8$ = _state$domainStates8.liveChatContext) === null || _state$domainStates8$ === void 0 ? void 0 : _state$domainStates8$.requestId;
+  const liveChatContext = state === null || state === void 0 ? void 0 : (_state$domainStates9 = state.domainStates) === null || _state$domainStates9 === void 0 ? void 0 : _state$domainStates9.liveChatContext;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let conversationDetails = undefined;

package/lib/esm/components/webchatcontainerstateful/common/mockchatsdk.js CHANGED Viewed

@@ -59,8 +59,12 @@ export class MockChatSDK {
   getLiveChatConfig() {
     return {
       LiveWSAndLiveChatEngJoin: {
-        msdyn_postconversationsurveyenable: "true"
+        msdyn_postconversationsurveyenable: "true",
+        msdyn_conversationmode: "192350000"
       }
     };
   }
+  sendTypingEvent() {
+    return null;
+  }
 }

package/lib/types/common/telemetry/TelemetryConstants.d.ts CHANGED Viewed

@@ -88,6 +88,7 @@ export declare enum TelemetryEvent {
     GetConversationDetailsCallStarted = "GetConversationDetailsCallStarted",
     GetConversationDetailsCallFailed = "GetConversationDetailsCallFailed",
     EndChatSDKCallFailed = "EndChatSDKCallFailed",
+    DisconnectEndChatSDKCallFailed = "DisconnectEndChatSDKCallFailed",
     GetChatReconnectContextSDKCallStarted = "GetChatReconnectContextSDKCallStarted",
     GetChatReconnectContextSDKCallFailed = "GetChatReconnectContextSDKCallFailed",
     ParseAdaptiveCardFailed = "ParseAdaptiveCardFailed",

package/lib/types/components/livechatwidget/common/liveChatConfigUtils.d.ts CHANGED Viewed

	@@ -1 +1,2 @@
1 1	export declare const isPostChatSurveyEnabled: (chatSDK: any) => Promise<boolean>;
2	+ export declare const isPersistentChatEnabled: (conversationMode: string \| undefined) => Promise<boolean>;

package/lib/types/components/livechatwidget/common/persistentChatHelper.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export declare const shouldSetPreChatIfPersistentChat: (chatSDK: any, conversationMode: string, showPreChat: boolean) => Promise<boolean>;

package/lib/types/components/webchatcontainerstateful/common/mockchatsdk.d.ts CHANGED Viewed

@@ -31,6 +31,8 @@ export declare class MockChatSDK {
     getLiveChatConfig(): {
         LiveWSAndLiveChatEngJoin: {
             msdyn_postconversationsurveyenable: string;
+            msdyn_conversationmode: string;
         };
     };
+    sendTypingEvent(): null;
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/omnichannel-chat-widget",
-  "version": "1.7.2",
+  "version": "1.7.3-main.0ecdb73",
   "description": "Microsoft Omnichannel Chat Widget",
   "main": "lib/cjs/index.js",
   "types": "lib/types/index.d.ts",
@@ -75,9 +75,9 @@
   },
   "dependencies": {
     "@microsoft/omnichannel-chat-components": "1.1.5",
-    "@microsoft/omnichannel-chat-sdk": "^1.9.5",
+    "@microsoft/omnichannel-chat-sdk": "^1.9.6",
     "abort-controller-es5": "^2.0.1",
-    "dompurify": "^2.3.4",
+    "dompurify": "^2.5.4",
     "markdown-it": "^12.3.2",
     "markdown-it-attrs": "^4.1.6",
     "markdown-it-attrs-es5": "^2.0.2",