@microsoft/omnichannel-chat-widget 0.1.0-main.24bd1e6 → 0.1.0-main.2b2f787

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,9 +31,9 @@ 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,
@@ -49,5 +41,4 @@ const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat)
     });
   });
 };
-
 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;
+      }
+    };
+  });
+}

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

@@ -3,92 +3,70 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setPreChatAndInitiateChat = exports.prepareStartChat = exports.initStartChat = void 0;
-
-var _Constants = require("../../../common/Constants");
-
+exports.setPreChatAndInitiateChat = exports.prepareStartChat = exports.initStartChat = exports.checkIfConversationStillValid = void 0;
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
-
+var _Constants = require("../../../common/Constants");
+var _utils = require("../../../common/utils");
+var _authHelper = require("./authHelper");
+var _ActivityStreamHandler = require("./ActivityStreamHandler");
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 var _ConversationState = require("../../../contexts/common/ConversationState");
-
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
-
 var _NotificationHandler = require("../../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler");
-
 var _NotificationScenarios = require("../../webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios");
-
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
-
 var _TelemetryManager = require("../../../common/telemetry/TelemetryManager");
-
 var _createAdapter = require("./createAdapter");
-
 var _newMessageEventHandler = require("../../../plugins/newMessageEventHandler");
-
-var _utils = require("../../../common/utils");
-
 var _reconnectChatHelper = require("./reconnectChatHelper");
-
 var _setPostChatContextAndLoadSurvey = require("./setPostChatContextAndLoadSurvey");
-
 var _updateSessionDataForTelemetry = require("./updateSessionDataForTelemetry");
-
-var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-let optionalParams = {}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+let optionalParams = {};
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+let widgetInstanceId;
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) => {
-  var _props$reconnectChatP;
-
+  var _props$controlProps;
   optionalParams = {}; //Resetting to ensure no stale values
-  // Can connect to existing chat session
+  widgetInstanceId = props === null || props === void 0 ? void 0 : (_props$controlProps = props.controlProps) === null || _props$controlProps === void 0 ? void 0 : _props$controlProps.widgetInstanceId;
 
+  // Can connect to existing chat session
   if (await canConnectToExistingChat(props, chatSDK, state, dispatch, setAdapter)) {
     return;
-  } // Redirecting if unauthenticated reconnect chat expired
-
-
-  if ((_props$reconnectChatP = props.reconnectChatPaneProps) !== null && _props$reconnectChatP !== void 0 && _props$reconnectChatP.reconnectId) {
-    var _props$reconnectChatP2, _props$reconnectChatP3;
-
-    await (0, _reconnectChatHelper.handleRedirectUnauthenticatedReconnectChat)(chatSDK, dispatch, setAdapter, initStartChat, (_props$reconnectChatP2 = props.reconnectChatPaneProps) === null || _props$reconnectChatP2 === void 0 ? void 0 : _props$reconnectChatP2.reconnectId, (_props$reconnectChatP3 = props.reconnectChatPaneProps) === null || _props$reconnectChatP3 === void 0 ? void 0 : _props$reconnectChatP3.redirectInSameWindow);
-    return;
-  } // Getting reconnectId for authenticated chat
-
-
-  const reconnectId = await (0, _reconnectChatHelper.getReconnectIdForAuthenticatedChat)(props, chatSDK);
+  }
+  await (0, _reconnectChatHelper.handleChatReconnect)(chatSDK, props, dispatch, setAdapter, initStartChat, state);
 
-  if (reconnectId) {
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_RECONNECT_ID,
-      payload: reconnectId
-    });
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: _ConversationState.ConversationState.ReconnectChat
-    });
+  // If chat reconnect has kicked in chat state will become Active or Reconnect. So just exit, else go next
+  if (state.appStates.conversationState === _ConversationState.ConversationState.Active || state.appStates.conversationState === _ConversationState.ConversationState.ReconnectChat) {
     return;
-  } // Set custom context params
-
-
-  setCustomContextParams(props, chatSDK); // Setting Proactive chat settings
+  }
 
+  // Setting Proactive chat settings
   const isProactiveChat = state.appStates.conversationState === _ConversationState.ConversationState.ProactiveChat;
-  const isPreChatEnabledInProactiveChat = state.appStates.proactiveChatStates.proactiveChatEnablePrechat; //Setting PreChat and intiate chat
-
-  setPreChatAndInitiateChat(chatSDK, dispatch, setAdapter, isProactiveChat, isPreChatEnabledInProactiveChat);
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const isPreChatEnabledInProactiveChat = state.appStates.proactiveChatStates.proactiveChatEnablePrechat;
 
+  //Setting PreChat and intiate chat
+  setPreChatAndInitiateChat(chatSDK, dispatch, setAdapter, isProactiveChat, isPreChatEnabledInProactiveChat, undefined, props);
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.prepareStartChat = prepareStartChat;
+const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProactiveChat, proactiveChatEnablePrechatState, state, props) => {
+  //Handle reconnect scenario
+  if (state) {
+    await (0, _reconnectChatHelper.handleChatReconnect)(chatSDK, props, dispatch, setAdapter, initStartChat, state);
+    // If chat reconnect has kicked in chat state will become Active or Reconnect. So just exit, else go next
+    if (state.appStates.conversationState === _ConversationState.ConversationState.Active || state.appStates.conversationState === _ConversationState.ConversationState.ReconnectChat) {
+      return;
+    }
+  }
 
-const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProactiveChat, proactiveChatEnablePrechatState) => {
   // Getting prechat Survey Context
   const parseToJson = false;
   const preChatSurveyResponse = await chatSDK.getPreChatSurvey(parseToJson);
   const showPrechat = isProactiveChat ? preChatSurveyResponse && proactiveChatEnablePrechatState : preChatSurveyResponse;
-
   if (showPrechat) {
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_PRE_CHAT_SURVEY_RESPONSE,
@@ -99,28 +77,51 @@ const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProact
       payload: _ConversationState.ConversationState.Prechat
     });
     return;
-  } //Initiate start chat
-
+  }
 
+  //Initiate start chat
   dispatch({
     type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
     payload: _ConversationState.ConversationState.Loading
   });
-  await initStartChat(chatSDK, dispatch, setAdapter);
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+  const optionalParams = {
+    isProactiveChat
+  };
+  await initStartChat(chatSDK, dispatch, setAdapter, props, optionalParams);
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.setPreChatAndInitiateChat = setPreChatAndInitiateChat;
-
-const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedState) => {
+const initStartChat = async (chatSDK, dispatch, setAdapter, props, params, persistedState) => {
+  var _props$controlProps2;
+  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 hideErrorUIPane = props === null || props === void 0 ? void 0 : (_props$controlProps2 = props.controlProps) === null || _props$controlProps2 === void 0 ? void 0 : _props$controlProps2.hideErrorUIPane;
   try {
     var _newAdapter$activity$, _TelemetryTimers$Widg;
+    //Start widget load timer
+    _TelemetryManager.TelemetryTimers.WidgetLoadTimer = (0, _utils.createTimer)();
+    _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
+      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) {
+        dispatch({
+          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+          payload: _ConversationState.ConversationState.Closed
+        });
+        return;
+      }
+    }
 
-    let isStartChatSuccessful = false; //Check if chat retrieved from cache
-
+    //Check if chat retrieved from cache
     if (persistedState || params !== null && params !== void 0 && params.liveChatContext) {
       var _persistedState$domai, _persistedState$domai2, _persistedState$domai3, _persistedState$domai4, _persistedState$domai5;
-
       _omnichannelChatComponents.BroadcastService.postMessage({
         eventName: _TelemetryConstants.BroadcastEvent.ChatRetrievedFromCache,
         payload: {
@@ -129,18 +130,17 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
         }
       });
     }
-
     try {
-      //Start widget load timer
-      _TelemetryManager.TelemetryTimers.WidgetLoadTimer = (0, _utils.createTimer)();
-
-      _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
-        Event: _TelemetryConstants.TelemetryEvent.StartChatSDKCall
-      }); // Set optional params
-
-
-      optionalParams = Object.assign({}, params, optionalParams);
-      await chatSDK.startChat(optionalParams);
+      var _window$Microsoft, _window$Microsoft$Dyn, _window$Microsoft$Dyn2, _window$Microsoft$Dyn3;
+      // Set custom context params
+      setCustomContextParams(chatSDK);
+      const defaultOptionalParams = {
+        sendDefaultInitContext: true,
+        isProactiveChat: !!(params !== null && params !== void 0 && params.isProactiveChat),
+        portalContactId: (_window$Microsoft = window.Microsoft) === null || _window$Microsoft === void 0 ? void 0 : (_window$Microsoft$Dyn = _window$Microsoft.Dynamic365) === null || _window$Microsoft$Dyn === void 0 ? void 0 : (_window$Microsoft$Dyn2 = _window$Microsoft$Dyn.Portal) === null || _window$Microsoft$Dyn2 === void 0 ? void 0 : (_window$Microsoft$Dyn3 = _window$Microsoft$Dyn2.User) === null || _window$Microsoft$Dyn3 === void 0 ? void 0 : _window$Microsoft$Dyn3.contactId
+      };
+      const startChatOptionalParams = Object.assign({}, params, optionalParams, defaultOptionalParams);
+      await chatSDK.startChat(startChatOptionalParams);
       isStartChatSuccessful = true;
     } catch (error) {
       _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
@@ -149,18 +149,11 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
           exception: `Failed to setup startChat: ${error}`
         }
       });
-
-      isStartChatSuccessful = false; // Resetting the widget state to Closed, for recent introduction of OC rate limiting(429 Error) 
-      // TODO : How to diplay a proper UI message to customer to try after sometime at this point - cool down scenario
-
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-        payload: _ConversationState.ConversationState.Closed
-      });
+      isStartChatSuccessful = false;
       return;
-    } // New adapter creation
-
+    }
 
+    // New adapter creation
     const newAdapter = await (0, _createAdapter.createAdapter)(chatSDK);
     setAdapter(newAdapter);
     const chatToken = await chatSDK.getChatToken();
@@ -169,39 +162,46 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
       payload: chatToken
     });
     newAdapter === null || newAdapter === void 0 ? void 0 : (_newAdapter$activity$ = newAdapter.activity$) === null || _newAdapter$activity$ === void 0 ? void 0 : _newAdapter$activity$.subscribe((0, _newMessageEventHandler.createOnNewAdapterActivityHandler)(chatToken === null || chatToken === void 0 ? void 0 : chatToken.chatId, chatToken === null || chatToken === void 0 ? void 0 : chatToken.visitorId));
-
     if (persistedState) {
       dispatch({
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_WIDGET_STATE,
         payload: persistedState
       });
-      await (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch, true);
+      (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch, true);
       return;
-    } // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+    }
 
+    // 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
-    }); // Set post chat context in state, no survey load
-
-    await (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch); // Updating chat session detail for telemetry
-
-    await (0, _updateSessionDataForTelemetry.updateSessionDataForTelemetry)(chatSDK, dispatch); // Set app state to Active
+    });
 
+    // Set app state to Active
     if (isStartChatSuccessful) {
+      _ActivityStreamHandler.ActivityStreamHandler.uncork();
+      // Update start chat failure app state if chat loads successfully
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_START_CHAT_FAILING,
+        payload: false
+      });
       dispatch({
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: _ConversationState.ConversationState.Active
       });
     }
-
     _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
       Event: _TelemetryConstants.TelemetryEvent.WidgetLoadComplete,
       Description: "Widget load complete",
       ElapsedTimeInMilliseconds: _TelemetryManager.TelemetryTimers === null || _TelemetryManager.TelemetryTimers === void 0 ? void 0 : (_TelemetryTimers$Widg = _TelemetryManager.TelemetryTimers.WidgetLoadTimer) === null || _TelemetryTimers$Widg === void 0 ? void 0 : _TelemetryTimers$Widg.milliSecondsElapsed
     });
+
+    // Set post chat context in state, no survey load
+    (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch);
+
+    // Updating chat session detail for telemetry
+    await (0, _updateSessionDataForTelemetry.updateSessionDataForTelemetry)(chatSDK, dispatch);
   } catch (ex) {
     _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.ERROR, {
       Event: _TelemetryConstants.TelemetryEvent.WidgetLoadFailed,
@@ -209,10 +209,8 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
         Exception: `Widget load Failed: ${ex}`
       }
     });
-
-    _NotificationHandler.NotificationHandler.notifyError(_NotificationScenarios.NotificationScenarios.Connection, "Start Chat Failed: " + ex); // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
+    _NotificationHandler.NotificationHandler.notifyError(_NotificationScenarios.NotificationScenarios.Connection, "Start Chat Failed: " + ex);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     if (ex.message === _Constants.ChatSDKError.WidgetUseOutsideOperatingHour) {
       dispatch({
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_OUTSIDE_OPERATING_HOURS,
@@ -222,28 +220,60 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: _ConversationState.ConversationState.OutOfOffice
       });
+      return;
+    }
+    if (!hideErrorUIPane) {
+      // Set app state to failing start chat if hideErrorUI is not turned on
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_START_CHAT_FAILING,
+        payload: true
+      });
+      _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.ErrorUIPaneLoaded,
+        Description: "Error UI Pane Loaded"
+      });
+    }
+    // Show the loading pane in other cases for failure, this will help for both hideStartChatButton case
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+      payload: _ConversationState.ConversationState.Loading
+    });
+
+    // If sessionInit was successful but LCW startchat failed due to some reason e.g adapter didn't load
+    // we need to directly endChat to avoid leaving ghost chats in OC, not disturbing any other UI state 
+    if (isStartChatSuccessful === true) {
+      await forceEndChat(chatSDK);
     }
   } finally {
     optionalParams = {};
+    widgetInstanceId = "";
   }
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.initStartChat = initStartChat;
+const forceEndChat = async chatSDK => {
+  _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.ERROR, {
+    Event: _TelemetryConstants.TelemetryEvent.WidgetLoadFailed,
+    ExceptionDetails: {
+      Exception: "SessionInit was successful, but widget load failed."
+    }
+  });
+  chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat();
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdapter) => {
-  var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _persistedState$domai6, _persistedState$appSt;
-
+  var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _props$controlProps3, _persistedState$domai6;
   // By pass this function in case of popout chat
-  if (state.appStates.skipChatButtonRendering === true) {
+  if (state.appStates.hideStartChatButton === true) {
     return false;
   }
+  const persistedState = (0, _utils.getStateFromCache)(chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC === void 0 ? void 0 : _chatSDK$omnichannelC.orgId, chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC2 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC2 === void 0 ? void 0 : _chatSDK$omnichannelC2.widgetId, (props === null || props === void 0 ? void 0 : (_props$controlProps3 = props.controlProps) === null || _props$controlProps3 === void 0 ? void 0 : _props$controlProps3.widgetInstanceId) ?? "");
 
-  const persistedState = (0, _utils.getStateFromCache)(chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC === void 0 ? void 0 : _chatSDK$omnichannelC.orgId, chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC2 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC2 === void 0 ? void 0 : _chatSDK$omnichannelC2.widgetId); //Connect to only active chat session
-
-  if (persistedState && !(0, _utils.isUndefinedOrEmpty)(persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai6 = persistedState.domainStates) === null || _persistedState$domai6 === void 0 ? void 0 : _persistedState$domai6.liveChatContext) && (persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$appSt = persistedState.appStates) === null || _persistedState$appSt === void 0 ? void 0 : _persistedState$appSt.conversationState) === _ConversationState.ConversationState.Active) {
+  //Connect to only active chat session
+  if (persistedState && !(0, _utils.isUndefinedOrEmpty)(persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai6 = persistedState.domainStates) === null || _persistedState$domai6 === void 0 ? void 0 : _persistedState$domai6.liveChatContext)) {
     var _persistedState$domai7;
-
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: _ConversationState.ConversationState.Loading
@@ -251,25 +281,68 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
     const optionalParams = {
       liveChatContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai7 = persistedState.domainStates) === null || _persistedState$domai7 === void 0 ? void 0 : _persistedState$domai7.liveChatContext
     };
-    await initStartChat(chatSDK, dispatch, setAdapter, optionalParams, persistedState);
+    await initStartChat(chatSDK, dispatch, setAdapter, props, optionalParams, persistedState);
     return true;
   } else {
     return false;
   }
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
-const setCustomContextParams = (props, chatSDK) => {
-  var _chatSDK$omnichannelC3, _chatSDK$omnichannelC4, _props$chatConfig, _persistedState$domai8;
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const setCustomContextParams = chatSDK => {
+  var _chatSDK$omnichannelC3, _chatSDK$omnichannelC4, _persistedState$domai8;
   // Add custom context only for unauthenticated chat
-  const persistedState = (0, _utils.getStateFromCache)(chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC3 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC3 === void 0 ? void 0 : _chatSDK$omnichannelC3.orgId, chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC4 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC4 === void 0 ? void 0 : _chatSDK$omnichannelC4.widgetId);
+  const persistedState = (0, _utils.getStateFromCache)(chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC3 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC3 === void 0 ? void 0 : _chatSDK$omnichannelC3.orgId, chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC4 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC4 === void 0 ? void 0 : _chatSDK$omnichannelC4.widgetId, widgetInstanceId ?? "");
+  if (!(0, _utils.isUndefinedOrEmpty)(persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai8 = persistedState.domainStates) === null || _persistedState$domai8 === void 0 ? void 0 : _persistedState$domai8.customContext)) {
+    var _persistedState$domai9, _persistedState$domai10;
+    if (persistedState !== null && persistedState !== void 0 && (_persistedState$domai9 = persistedState.domainStates.liveChatConfig) !== null && _persistedState$domai9 !== void 0 && _persistedState$domai9.LiveChatConfigAuthSettings) {
+      const errorMessage = "Use of custom context with authenticated chat is deprecated. The chat would not go through.";
+      _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.WARN, {
+        Event: _TelemetryConstants.TelemetryEvent.StartChatMethodException,
+        ExceptionDetails: {
+          exception: errorMessage
+        }
+      });
+      throw new Error(errorMessage);
+    }
+    optionalParams = Object.assign({}, optionalParams, {
+      customContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai10 = persistedState.domainStates) === null || _persistedState$domai10 === void 0 ? void 0 : _persistedState$domai10.customContext
+    });
+  }
+};
 
-  if (!((_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && _props$chatConfig.LiveChatConfigAuthSettings) && !(0, _utils.isUndefinedOrEmpty)(persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai8 = persistedState.domainStates) === null || _persistedState$domai8 === void 0 ? void 0 : _persistedState$domai8.customContext)) {
-    var _persistedState$domai9;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const checkIfConversationStillValid = async (chatSDK, props, requestId, dispatch) => {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let conversationDetails = undefined;
 
-    optionalParams = Object.assign({}, optionalParams, {
-      customContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai9 = persistedState.domainStates) === null || _persistedState$domai9 === void 0 ? void 0 : _persistedState$domai9.customContext
+  //Preserve old requestId
+  const oldRequestId = chatSDK.requestId;
+  try {
+    chatSDK.requestId = requestId;
+    conversationDetails = await chatSDK.getConversationDetails();
+    if (Object.keys(conversationDetails).length === 0) {
+      chatSDK.requestId = oldRequestId;
+      return false;
+    }
+    if (conversationDetails.state === _Constants.LiveWorkItemState.Closed || conversationDetails.state === _Constants.LiveWorkItemState.WrapUp) {
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: undefined
+      });
+      chatSDK.requestId = oldRequestId;
+      return false;
+    }
+    return true;
+  } catch (erorr) {
+    _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+      Event: _TelemetryConstants.TelemetryEvent.GetConversationDetailsException,
+      ExceptionDetails: {
+        exception: `Conversation is not valid: ${erorr}`
+      }
     });
+    chatSDK.requestId = oldRequestId;
+    return false;
   }
-};
+};
+exports.checkIfConversationStillValid = checkIfConversationStillValid;

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

@@ -4,17 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.startProactiveChat = void 0;
-
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
-
 var _ConversationState = require("../../../contexts/common/ConversationState");
-
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
-
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
-
 var _TelemetryManager = require("../../../common/telemetry/TelemetryManager");
-
 // Defines startProactiveChat callback
 const startProactiveChat = (dispatch, notificationConfig, enablePreChat, inNewWindow) => {
   dispatch({
@@ -29,12 +23,10 @@ const startProactiveChat = (dispatch, notificationConfig, enablePreChat, inNewWi
     type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
     payload: _ConversationState.ConversationState.ProactiveChat
   });
-
   _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
     Event: _TelemetryConstants.TelemetryEvent.IncomingProactiveChatScreenLoaded,
     ElapsedTimeInMilliseconds: _TelemetryManager.TelemetryTimers.LcwLoadToChatButtonTimer.milliSecondsElapsed,
     Description: "Incoming proactive chat loaded."
   });
 };
-
 exports.startProactiveChat = startProactiveChat;

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

@@ -4,39 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.updateSessionDataForTelemetry = void 0;
-
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
-
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
-
 var _TelemetryManager = require("../../../common/telemetry/TelemetryManager");
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const updateSessionDataForTelemetry = async (chatSDK, dispatch) => {
   if (chatSDK) {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const chatSession = await chatSDK.getCurrentLiveChatContext();
-
     const telemetryData = _TelemetryHelper.TelemetryHelper.addSessionDataToTelemetry(chatSession, _TelemetryManager.TelemetryManager.InternalTelemetryData);
-
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_TELEMETRY_DATA,
       payload: telemetryData
     });
     await updateConversationDataForTelemetry(chatSDK, dispatch);
   }
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.updateSessionDataForTelemetry = updateSessionDataForTelemetry;
-
 const updateConversationDataForTelemetry = async (chatSDK, dispatch) => {
   if (chatSDK) {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const liveWorkItem = await chatSDK.getConversationDetails();
-
     const telemetryData = _TelemetryHelper.TelemetryHelper.addConversationDataToTelemetry(liveWorkItem, _TelemetryManager.TelemetryManager.InternalTelemetryData);
-
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_TELEMETRY_DATA,
       payload: telemetryData

package/lib/cjs/components/livechatwidget/interfaces/IScrollBarProps.js

@@ -0,0 +1 @@
+"use strict";