@microsoft/omnichannel-chat-widget 1.7.4-main.120159a → 1.7.4-main.1f61ac6

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

@@ -1,18 +1,17 @@
+import { BotAuthActivitySubscriber } from "./ActivitySubscriber/BotAuthActivitySubscriber";
+import { ChatAdapterShim } from "./ChatAdapterShim";
+import { HiddenAdaptiveCardActivitySubscriber } from "./ActivitySubscriber/HiddenAdaptiveCardActivitySubscriber";
+import { MockChatSDK } from "../../webchatcontainerstateful/common/mockchatsdk";
 import { NotificationHandler } from "../../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler";
 import { NotificationLevel } from "../../webchatcontainerstateful/webchatcontroller/enums/NotificationLevel";
 import { NotificationScenarios } from "../../webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios";
-import { defaultMiddlewareLocalizedTexts } from "../../webchatcontainerstateful/common/defaultProps/defaultMiddlewareLocalizedTexts";
-import { ChatAdapterShim } from "./ChatAdapterShim";
 import { PauseActivitySubscriber } from "./ActivitySubscriber/PauseActivitySubscriber";
-import { BotAuthActivitySubscriber } from "./ActivitySubscriber/BotAuthActivitySubscriber";
-import { HiddenAdaptiveCardActivitySubscriber } from "./ActivitySubscriber/HiddenAdaptiveCardActivitySubscriber";
+import { defaultMiddlewareLocalizedTexts } from "../../webchatcontainerstateful/common/defaultProps/defaultMiddlewareLocalizedTexts";
 const defaultBotAuthConfig = {
   fetchBotAuthConfigRetries: 3,
   fetchBotAuthConfigRetryInterval: 1000
 };
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const createAdapter = async (chatSDK, props) => {
+export const createAdapter = async (facadeChatSDK, props) => {
   const chatAdapterOptionalParams = {
     IC3Adapter: {
       options: {
@@ -35,9 +34,10 @@ export const createAdapter = async (chatSDK, props) => {
       }
     }
   };
-  let adapter = await chatSDK.createChatAdapter(chatAdapterOptionalParams);
+  let adapter = await facadeChatSDK.createChatAdapter(chatAdapterOptionalParams);
   //so far, there is no need to convert to the shim adapter when using visual tests
-  if (chatSDK.isMockModeOn !== true) {
+  const isMocked = facadeChatSDK.getChatSDK() instanceof MockChatSDK;
+  if (isMocked !== true) {
     var _props$webChatContain, _props$webChatContain2, _props$webChatContain3, _props$webChatContain4;
     const botAuthActivitySubscriberOptionalParams = {
       fetchBotAuthConfigRetries: (props === null || props === void 0 ? void 0 : (_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : (_props$webChatContain2 = _props$webChatContain.botAuthConfig) === null || _props$webChatContain2 === void 0 ? void 0 : _props$webChatContain2.fetchBotAuthConfigRetries) || defaultBotAuthConfig.fetchBotAuthConfigRetries,

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

@@ -10,12 +10,11 @@ import { TelemetryManager } from "../../../common/telemetry/TelemetryManager";
 import { WebChatStoreLoader } from "../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader";
 import { defaultWebChatContainerStatefulProps } from "../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps";
 import { executeReducer } from "../../../contexts/createReducer";
-import { handleAuthentication } from "./authHelper";
 import { isPersistentEnabled } from "./reconnectChatHelper";
 import { uuidv4 } from "@microsoft/omnichannel-chat-sdk";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter) => {
+const prepareEndChat = async (props, facadeChatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter) => {
   try {
     var _conversationDetails$, _state$domainStates, _state$appStates3;
     const {
@@ -23,8 +22,8 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
     } = props;
 
     // Use Case: If call is ongoing, end the call by simulating end call button click
-    endVoiceVideoCallIfOngoing(chatSDK, dispatch);
-    const conversationDetails = await getConversationDetailsCall(chatSDK);
+    endVoiceVideoCallIfOngoing(facadeChatSDK, dispatch);
+    const conversationDetails = await getConversationDetailsCall(facadeChatSDK);
 
     // Use Case: When post chat is not configured
     if ((conversationDetails === null || conversationDetails === void 0 ? void 0 : (_conversationDetails$ = conversationDetails.canRenderPostChat) === null || _conversationDetails$ === void 0 ? void 0 : _conversationDetails$.toLowerCase()) === Constants.false) {
@@ -35,7 +34,7 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
           Event: TelemetryEvent.PrepareEndChat,
           Description: PrepareEndChatDescriptionConstants.ConversationEndedByCustomerWithoutPostChat
         });
-        await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true);
+        await endChat(props, facadeChatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true);
       }
 
       // Use Case: If ended by Agent, stay chat in InActive state
@@ -52,7 +51,7 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
 
     // Use Case: Can render post chat scenarios
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const postchatContext = (await getPostChatContext(chatSDK, state, dispatch)) ?? (state === null || state === void 0 ? void 0 : (_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : _state$domainStates.postChatContext);
+    const postchatContext = (await getPostChatContext(facadeChatSDK, state, dispatch)) ?? (state === null || state === void 0 ? void 0 : (_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : _state$domainStates.postChatContext);
     if (postchatContext === undefined) {
       var _state$appStates2;
       BroadcastService.postMessage({
@@ -68,7 +67,7 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
           Event: TelemetryEvent.PrepareEndChat,
           Description: PrepareEndChatDescriptionConstants.ConversationEndedByCustomerWithInvalidPostChat
         });
-        await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true);
+        await endChat(props, facadeChatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true);
         return;
       }
 
@@ -98,7 +97,7 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
     const endedByCustomer = (appStates === null || appStates === void 0 ? void 0 : appStates.conversationEndedBy) === "Customer";
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const commonParams = [props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter];
+    const commonParams = [props, facadeChatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter];
     if (persistentEnabled && endedByCustomer) {
       await endChat(...commonParams, true, false, true);
     } else {
@@ -123,7 +122,7 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
         Event: TelemetryEvent.PrepareEndChat,
         Description: PrepareEndChatDescriptionConstants.PrepareEndChatError
       });
-      await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true);
+      await endChat(props, facadeChatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true);
     }
   } finally {
     //Chat token clean up
@@ -132,8 +131,9 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const endChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) => {
-  if (!skipEndChatSDK && chatSDK.conversation) {
+const endChat = async (props, facadeChatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) => {
+  var _facadeChatSDK$getCha;
+  if (!skipEndChatSDK && facadeChatSDK !== null && facadeChatSDK !== void 0 && (_facadeChatSDK$getCha = facadeChatSDK.getChatSDK()) !== null && _facadeChatSDK$getCha !== void 0 && _facadeChatSDK$getCha.conversation) {
     var _inMemoryState$appSta;
     const inMemoryState = executeReducer(state, {
       type: LiveChatWidgetActionType.GET_IN_MEMORY_STATE,
@@ -146,9 +146,7 @@ const endChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatSt
       TelemetryHelper.logSDKEvent(LogLevel.INFO, {
         Event: TelemetryEvent.EndChatSDKCall
       });
-      //Get auth token again if chat continued for longer time, otherwise gets 401 error
-      await handleAuthentication(chatSDK, props.chatConfig, props.getAuthToken);
-      await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat(endChatOptionalParameters));
+      await (facadeChatSDK === null || facadeChatSDK === void 0 ? void 0 : facadeChatSDK.endChat(endChatOptionalParameters));
     } catch (ex) {
       var _inMemoryState$appSta2;
       // if the chat was disconnected or ended by the agent, we don't want to log the error
@@ -170,6 +168,7 @@ const endChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatSt
       postMessageToOtherTab = false;
     } finally {
       endChatStateCleanUp(dispatch);
+      facadeChatSDK.destroy();
     }
   }
   if (!skipCloseChat) {
@@ -205,10 +204,11 @@ const endChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatSt
       });
       // Always allow to close the chat for embedded mode irrespective of end chat errors
       closeChatWidget(dispatch, props, state);
+      facadeChatSDK.destroy();
     }
   }
   if (postMessageToOtherTab) {
-    const endChatEventName = await getEndChatEventName(chatSDK, props);
+    const endChatEventName = await getEndChatEventName(facadeChatSDK, props);
     BroadcastService.postMessage({
       eventName: endChatEventName,
       payload: {
@@ -303,11 +303,11 @@ export const chatSDKStateCleanUp = chatSDK => {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const endVoiceVideoCallIfOngoing = async (chatSDK, dispatch) => {
+export const endVoiceVideoCallIfOngoing = async (facadeChatSDK, dispatch) => {
   let callId = "";
   try {
-    if (chatSDK.isVoiceVideoCallingEnabled()) {
-      const voiceVideoCallingSdk = await chatSDK.getVoiceVideoCalling();
+    if (facadeChatSDK.getChatSDK().isVoiceVideoCallingEnabled()) {
+      const voiceVideoCallingSdk = await facadeChatSDK.getVoiceVideoCalling();
       if (voiceVideoCallingSdk && voiceVideoCallingSdk.isInACall()) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         callId = voiceVideoCallingSdk.callId;
@@ -360,9 +360,8 @@ const chatTokenCleanUp = async dispatch => {
   // Need to keep liveChatContext until chat is fully closed to for transcript download/email
 };
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const getEndChatEventName = async (chatSDK, props) => {
-  var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _props$controlProps4;
-  return getWidgetEndChatEventName(chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC === void 0 ? void 0 : _chatSDK$omnichannelC.orgId, chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC2 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC2 === void 0 ? void 0 : _chatSDK$omnichannelC2.widgetId, (props === null || props === void 0 ? void 0 : (_props$controlProps4 = props.controlProps) === null || _props$controlProps4 === void 0 ? void 0 : _props$controlProps4.widgetInstanceId) ?? "");
+const getEndChatEventName = async (facadeChatSDK, props) => {
+  var _facadeChatSDK$getCha2, _facadeChatSDK$getCha3, _facadeChatSDK$getCha4, _facadeChatSDK$getCha5, _props$controlProps4;
+  return getWidgetEndChatEventName((_facadeChatSDK$getCha2 = facadeChatSDK.getChatSDK()) === null || _facadeChatSDK$getCha2 === void 0 ? void 0 : (_facadeChatSDK$getCha3 = _facadeChatSDK$getCha2.omnichannelConfig) === null || _facadeChatSDK$getCha3 === void 0 ? void 0 : _facadeChatSDK$getCha3.orgId, (_facadeChatSDK$getCha4 = facadeChatSDK.getChatSDK()) === null || _facadeChatSDK$getCha4 === void 0 ? void 0 : (_facadeChatSDK$getCha5 = _facadeChatSDK$getCha4.omnichannelConfig) === null || _facadeChatSDK$getCha5 === void 0 ? void 0 : _facadeChatSDK$getCha5.widgetId, (props === null || props === void 0 ? void 0 : (_props$controlProps4 = props.controlProps) === null || _props$controlProps4 === void 0 ? void 0 : _props$controlProps4.widgetInstanceId) ?? "");
 };
 export { prepareEndChat, endChat };

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

@@ -2,12 +2,12 @@ import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryCon
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const initCallingSdk = async (chatSDK, setVoiceVideoCallingSDK) => {
+export const initCallingSdk = async (facadeChatSDK, setVoiceVideoCallingSDK) => {
   try {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    if (chatSDK.getVoiceVideoCalling) {
+    if (facadeChatSDK.getChatSDK().getVoiceVideoCalling) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const callingSDK = await chatSDK.getVoiceVideoCalling();
+      const callingSDK = await facadeChatSDK.getChatSDK().getVoiceVideoCalling();
       setVoiceVideoCallingSDK(callingSDK);
       TelemetryHelper.logCallingEvent(LogLevel.INFO, {
         Event: TelemetryEvent.CallingSDKLoadSuccess

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

@@ -33,7 +33,7 @@ import preProcessingMiddleware from "../../webchatcontainerstateful/webchatcontr
 import sanitizationMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/sanitizationMiddleware";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const initWebChatComposer = (props, state, dispatch, chatSDK, endChat) => {
+export const initWebChatComposer = (props, state, dispatch, facadeChatSDK, endChat) => {
   var _props$webChatContain, _props$webChatContain2, _props$webChatContain3, _props$webChatContain4, _state$domainStates$l4, _state$domainStates$l5, _props$webChatContain9, _props$webChatContain10, _state$domainStates$r, _state$domainStates$r2, _props$webChatContain11, _props$webChatContain12, _state$domainStates$r3, _state$domainStates$r4, _props$webChatContain13, _props$webChatContain14, _defaultWebChatContai, _props$webChatContain15, _props$webChatContain16, _props$webChatContain17, _props$webChatContain18, _state$domainStates$r5, _state$domainStates$r6, _props$webChatContain19, _props$webChatContain20, _defaultWebChatContai2, _props$webChatContain21, _props$webChatContain22, _defaultWebChatContai3, _props$webChatContain23, _props$webChatContain24;
   // Add a hook to make all links open a new window
   postDomPurifyActivities();
@@ -52,7 +52,7 @@ export const initWebChatComposer = (props, state, dispatch, chatSDK, endChat) =>
     var _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3, _props$webChatContain5;
     const conversationEndCallback = async () => {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const conversationDetails = await getConversationDetailsCall(chatSDK);
+      const conversationDetails = await getConversationDetailsCall(facadeChatSDK);
       if ((conversationDetails === null || conversationDetails === void 0 ? void 0 : conversationDetails.participantType) === ParticipantType.Bot) {
         TelemetryHelper.logActionEvent(LogLevel.INFO, {
           Event: TelemetryEvent.ConversationEndedThreadEventReceived,

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

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

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

@@ -1,9 +1,9 @@
 import "regenerator-runtime/runtime";
 import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
+import { ConversationMode, WidgetLoadCustomErrorString } from "../../../common/Constants";
 import { checkContactIdError, isNullOrEmptyString, isNullOrUndefined } from "../../../common/utils";
 import { handleAuthentication, removeAuthTokenProvider } from "./authHelper";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
-import { ConversationMode, WidgetLoadCustomErrorString } from "../../../common/Constants";
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
@@ -11,13 +11,12 @@ import { handleStartChatError } from "./startChatErrorHandler";
 
 // Return value: should start normal chat flow when reconnect is enabled
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const handleChatReconnect = async (chatSDK, props, dispatch, setAdapter, initStartChat, state) => {
+const handleChatReconnect = async (facadeChatSDK, props, dispatch, setAdapter, initStartChat, state) => {
   var _props$chatConfig, _props$chatConfig$Liv;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isAuthenticatedChat = (_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && (_props$chatConfig$Liv = _props$chatConfig.LiveChatConfigAuthSettings) !== null && _props$chatConfig$Liv !== void 0 && _props$chatConfig$Liv.msdyn_javascriptclientfunction ? true : false;
-
   // Get chat reconnect context
-  const reconnectChatContext = await getChatReconnectContext(chatSDK, props.chatConfig, props, isAuthenticatedChat, dispatch);
+  const reconnectChatContext = (await getChatReconnectContext(facadeChatSDK, props.chatConfig, props, isAuthenticatedChat, dispatch)) ?? {};
 
   // Redirect if enabled
   if (reconnectChatContext !== null && reconnectChatContext !== void 0 && reconnectChatContext.redirectURL) {
@@ -29,7 +28,7 @@ const handleChatReconnect = async (chatSDK, props, dispatch, setAdapter, initSta
     var _props$reconnectChatP2, _props$reconnectChatP3, _props$controlProps;
     //if reconnect id is provided in props, or hideReconnectChatPane is true, don't show reconnect pane
     if ((_props$reconnectChatP2 = props.reconnectChatPaneProps) !== null && _props$reconnectChatP2 !== void 0 && _props$reconnectChatP2.reconnectId && !isNullOrEmptyString((_props$reconnectChatP3 = props.reconnectChatPaneProps) === null || _props$reconnectChatP3 === void 0 ? void 0 : _props$reconnectChatP3.reconnectId) || (_props$controlProps = props.controlProps) !== null && _props$controlProps !== void 0 && _props$controlProps.hideReconnectChatPane) {
-      await setReconnectIdAndStartChat(isAuthenticatedChat, chatSDK, state, props, dispatch, setAdapter, reconnectChatContext.reconnectId ?? "", initStartChat);
+      await setReconnectIdAndStartChat(isAuthenticatedChat, facadeChatSDK, state, props, dispatch, setAdapter, reconnectChatContext.reconnectId ?? "", initStartChat);
       return false;
     }
 
@@ -52,7 +51,7 @@ const handleChatReconnect = async (chatSDK, props, dispatch, setAdapter, initSta
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const getChatReconnectContext = async (chatSDK, chatConfig, props, isAuthenticatedChat, dispatch) => {
+const getChatReconnectContext = async (facadeChatSDK, chatConfig, props, isAuthenticatedChat, dispatch) => {
   try {
     var _props$reconnectChatP4;
     TelemetryHelper.logSDKEvent(LogLevel.INFO, {
@@ -65,13 +64,13 @@ const getChatReconnectContext = async (chatSDK, chatConfig, props, isAuthenticat
     // Get auth token for getting chat reconnect context
     if (isAuthenticatedChat) {
       // handle authentication will throw error if auth token is not available, so no need to check for response
-      await handleAuthentication(chatSDK, chatConfig, props.getAuthToken);
+      await handleAuthentication(facadeChatSDK.getChatSDK(), chatConfig, props.getAuthToken);
     }
-    const reconnectChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatReconnectContext(chatReconnectOptionalParams));
+    const reconnectChatContext = await (facadeChatSDK === null || facadeChatSDK === void 0 ? void 0 : facadeChatSDK.getChatReconnectContext(chatReconnectOptionalParams));
     if (isAuthenticatedChat) {
       // remove auth token after reconnectId is fetched
       // AuthToken will be reset later at start chat
-      removeAuthTokenProvider(chatSDK);
+      removeAuthTokenProvider(facadeChatSDK.getChatSDK());
     }
     return reconnectChatContext;
   }
@@ -87,14 +86,14 @@ const getChatReconnectContext = async (chatSDK, chatConfig, props, isAuthenticat
 
     // when auth token is not available, propagate the error to stop the execution and ensure error pane is loaded
     if ((error === null || error === void 0 ? void 0 : error.message) == WidgetLoadCustomErrorString.AuthenticationFailedErrorString) {
-      handleStartChatError(dispatch, chatSDK, props, new Error(WidgetLoadCustomErrorString.AuthenticationFailedErrorString), false);
+      handleStartChatError(dispatch, facadeChatSDK, props, new Error(WidgetLoadCustomErrorString.AuthenticationFailedErrorString), false);
       throw error;
     }
   }
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const setReconnectIdAndStartChat = async (isAuthenticatedChat, chatSDK, state, props, dispatch, setAdapter, reconnectId, initStartChat) => {
+const setReconnectIdAndStartChat = async (isAuthenticatedChat, facadeChatSDK, state, props, dispatch, setAdapter, reconnectId, initStartChat) => {
   if (!isAuthenticatedChat) {
     const startUnauthenticatedReconnectChat = {
       eventName: BroadcastEvent.StartUnauthenticatedReconnectChat
@@ -112,7 +111,7 @@ const setReconnectIdAndStartChat = async (isAuthenticatedChat, chatSDK, state, p
     type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
     payload: ConversationState.Loading
   });
-  await initStartChat(chatSDK, dispatch, setAdapter, state, props, optionalParams);
+  await initStartChat(facadeChatSDK, dispatch, setAdapter, state, props, optionalParams);
 };
 const redirectPage = (redirectURL, redirectInSameWindow) => {
   const redirectPageRequest = {

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

@@ -1,10 +1,10 @@
 import { Constants, ParticipantType, PostChatSurveyTelemetryMessage } from "../../../common/Constants";
 import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
-import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
-import { addDelayInMs } from "../../../common/utils";
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { PostChatSurveyMode } from "../../postchatsurveypanestateful/enums/PostChatSurveyMode";
+import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
+import { addDelayInMs } from "../../../common/utils";
 import { isPostChatSurveyEnabled } from "./liveChatConfigUtils";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -100,14 +100,14 @@ const isPostChatEnabled = (props, state) => {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const getPostChatContext = async (chatSDK, state, dispatch) => {
+const getPostChatContext = async (facadeChatSDK, state, dispatch) => {
   try {
-    const postChatEnabled = await isPostChatSurveyEnabled(chatSDK);
+    const postChatEnabled = await isPostChatSurveyEnabled(facadeChatSDK);
     if (postChatEnabled) {
       var _state$domainStates2;
       if ((state === null || state === void 0 ? void 0 : (_state$domainStates2 = state.domainStates) === null || _state$domainStates2 === void 0 ? void 0 : _state$domainStates2.postChatContext) === undefined) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const context = await chatSDK.getPostChatSurveyContext();
+        const context = await facadeChatSDK.getPostChatSurveyContext();
         TelemetryHelper.logSDKEvent(LogLevel.INFO, {
           Event: TelemetryEvent.PostChatContextCallSucceed,
           Description: PostChatSurveyTelemetryMessage.PostChatContextCallSucceed

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

@@ -2,18 +2,18 @@ import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryCon
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
-import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { PostChatSurveyTelemetryMessage } from "../../../common/Constants";
+import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { isPostChatSurveyEnabled } from "./liveChatConfigUtils";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat) => {
+export const setPostChatContextAndLoadSurvey = async (facadeChatSDK, dispatch, persistedChat) => {
   try {
-    const postChatEnabled = await isPostChatSurveyEnabled(chatSDK);
+    const postChatEnabled = await isPostChatSurveyEnabled(facadeChatSDK);
     if (postChatEnabled) {
       if (!persistedChat) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const context = await chatSDK.getPostChatSurveyContext();
+        const context = await facadeChatSDK.getPostChatSurveyContext();
         TelemetryHelper.logSDKEvent(LogLevel.INFO, {
           Event: TelemetryEvent.PostChatContextCallSucceed,
           Description: PostChatSurveyTelemetryMessage.PostChatContextCallSucceed

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

@@ -26,27 +26,27 @@ let widgetInstanceId;
 let popoutWidgetInstanceId;
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const setAuthenticationIfApplicable = async (props, chatSDK) => {
+const setAuthenticationIfApplicable = async (props, facadeChatSDK) => {
   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) {
+    const authSuccess = await handleAuthentication(facadeChatSDK.getChatSDK(), chatConfig, getAuthToken);
+    if (!authSuccess.result) {
       throw new Error(WidgetLoadCustomErrorString.AuthenticationFailedErrorString);
     }
   }
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) => {
+const prepareStartChat = async (props, facadeChatSDK, 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);
+    const shouldStartChatNormally = await handleChatReconnect(facadeChatSDK, props, dispatch, setAdapter, initStartChat, state);
     if (!shouldStartChatNormally) {
       return;
     }
@@ -58,7 +58,7 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
   }
 
   // Can connect to existing chat session
-  if (await canConnectToExistingChat(props, chatSDK, state, dispatch, setAdapter)) {
+  if (await canConnectToExistingChat(props, facadeChatSDK, state, dispatch, setAdapter)) {
     return;
   }
 
@@ -68,26 +68,30 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
 
   // 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);
+    await setAuthenticationIfApplicable(props, facadeChatSDK);
   }
 
   //Setting PreChat and intiate chat
-  await setPreChatAndInitiateChat(chatSDK, dispatch, setAdapter, isProactiveChat, isPreChatEnabledInProactiveChat, state, props);
+  await setPreChatAndInitiateChat(facadeChatSDK, 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) => {
+const setPreChatAndInitiateChat = async (facadeChatSDK, dispatch, setAdapter, isProactiveChat, proactiveChatEnablePrechatState, state, props) => {
   var _props$preChatSurveyP, _props$preChatSurveyP2, _props$controlProps, _state$domainStates, _state$domainStates$l, _state$domainStates$l2;
-  //Handle reconnect scenario
+  // This reset needs to be done before to load prechat, because the conversation state changes from close to prechat
+  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(facadeChatSDK.getChatSDK());
+  }
 
   // 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 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 facadeChatSDK.getPreChatSurvey(parseToJson));
   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);
+  showPrechat = await shouldSetPreChatIfPersistentChat(facadeChatSDK.getChatSDK(), 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$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";
+    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.toString().toLowerCase()) === "true";
     if (isOutOfOperatingHours) {
       (state === null || state === void 0 ? void 0 : state.appStates.isMinimized) && dispatch({
         type: LiveChatWidgetActionType.SET_MINIMIZED,
@@ -100,6 +104,9 @@ const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProact
       return;
     } else {
       var _state$appStates;
+      TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.PrechatSurveyExpected
+      });
       dispatch({
         type: LiveChatWidgetActionType.SET_PRE_CHAT_SURVEY_RESPONSE,
         payload: preChatSurveyResponse
@@ -138,17 +145,17 @@ const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProact
   const optionalParams = {
     isProactiveChat
   };
-  await initStartChat(chatSDK, dispatch, setAdapter, state, props, optionalParams);
+  await initStartChat(facadeChatSDK, dispatch, setAdapter, state, props, optionalParams);
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params, persistedState) => {
+const initStartChat = async (facadeChatSDK, dispatch, setAdapter, state, props, params, persistedState) => {
   var _state$domainStates5, _state$domainStates5$, _state$domainStates5$2;
   let isStartChatSuccessful = false;
   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);
+    chatSDKStateCleanUp(facadeChatSDK.getChatSDK());
   }
   try {
     var _state$appStates2;
@@ -166,7 +173,7 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
     });
 
     // Auth token retrieval needs to happen during start chat to support pop-out chat
-    await setAuthenticationIfApplicable(props, chatSDK);
+    await setAuthenticationIfApplicable(props, facadeChatSDK);
 
     //Check if chat retrieved from cache
     if (persistedState || params !== null && params !== void 0 && params.liveChatContext) {
@@ -189,7 +196,7 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
         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);
+      await facadeChatSDK.startChat(startChatOptionalParams);
       isStartChatSuccessful = true;
     } catch (error) {
       checkContactIdError(error);
@@ -208,7 +215,7 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
       isStartChatSuccessful = false;
       throw error;
     }
-    await createAdapterAndSubscribe(chatSDK, dispatch, setAdapter, props);
+    await createAdapterAndSubscribe(facadeChatSDK, dispatch, setAdapter, props);
 
     // Set app state to Active
     if (isStartChatSuccessful) {
@@ -230,14 +237,14 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
       });
       logWidgetLoadComplete(WidgetLoadTelemetryMessage.PersistedStateRetrievedMessage);
       // Set post chat context in state, load in background to do not block the load
-      setPostChatContextAndLoadSurvey(chatSDK, dispatch, true);
+      setPostChatContextAndLoadSurvey(facadeChatSDK, dispatch, true);
       return;
     }
 
     // Persistent Chat relies on the `reconnectId` retrieved from reconnectablechats API to reconnect upon start chat and not `liveChatContext`
     if (!persistentChatEnabled) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const liveChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getCurrentLiveChatContext());
+      const liveChatContext = await (facadeChatSDK === null || facadeChatSDK === void 0 ? void 0 : facadeChatSDK.getCurrentLiveChatContext());
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       dispatch({
         type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
@@ -246,11 +253,11 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
     }
     logWidgetLoadComplete();
     // Set post chat context in state, load in background to do not block the load
-    setPostChatContextAndLoadSurvey(chatSDK, dispatch);
+    setPostChatContextAndLoadSurvey(facadeChatSDK, dispatch);
     // Updating chat session detail for telemetry
-    await updateTelemetryData(chatSDK, dispatch);
+    await updateTelemetryData(facadeChatSDK, dispatch);
   } catch (ex) {
-    handleStartChatError(dispatch, chatSDK, props, ex, isStartChatSuccessful);
+    handleStartChatError(dispatch, facadeChatSDK, props, ex, isStartChatSuccessful);
   } finally {
     optionalParams = {};
     widgetInstanceId = "";
@@ -258,20 +265,22 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const createAdapterAndSubscribe = async (chatSDK, dispatch, setAdapter, props) => {
-  var _newAdapter$activity$;
+const createAdapterAndSubscribe = async (facadeChatSDK, dispatch, setAdapter, props) => {
   // New adapter creation
-  const newAdapter = await createAdapter(chatSDK, props);
+  const newAdapter = await createAdapter(facadeChatSDK, props);
   setAdapter(newAdapter);
-  const chatToken = await chatSDK.getChatToken();
+  const chatToken = await (facadeChatSDK === null || facadeChatSDK === void 0 ? void 0 : facadeChatSDK.getChatToken());
   dispatch({
     type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
     payload: chatToken
   });
-  newAdapter === null || newAdapter === void 0 ? void 0 : (_newAdapter$activity$ = newAdapter.activity$) === null || _newAdapter$activity$ === void 0 ? void 0 : _newAdapter$activity$.subscribe(createOnNewAdapterActivityHandler(chatToken === null || chatToken === void 0 ? void 0 : chatToken.chatId, chatToken === null || chatToken === void 0 ? void 0 : chatToken.visitorId));
+  if (chatToken !== null && chatToken !== void 0 && chatToken.chatId && chatToken !== null && chatToken !== void 0 && chatToken.visitorId) {
+    var _newAdapter$activity$;
+    newAdapter === null || newAdapter === void 0 ? void 0 : (_newAdapter$activity$ = newAdapter.activity$) === null || _newAdapter$activity$ === void 0 ? void 0 : _newAdapter$activity$.subscribe(createOnNewAdapterActivityHandler(chatToken.chatId, chatToken.visitorId));
+  }
 };
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdapter) => {
+const canConnectToExistingChat = async (props, facadeChatSDK, state, dispatch, setAdapter) => {
   var _state$appStates3, _persistedState$domai6, _persistedState$appSt;
   // By pass this function in case of popout chat
   if ((state === null || state === void 0 ? void 0 : (_state$appStates3 = state.appStates) === null || _state$appStates3 === void 0 ? void 0 : _state$appStates3.hideStartChatButton) === true) {
@@ -289,7 +298,7 @@ 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, state, props, optionalParams, persistedState);
+    await initStartChat(facadeChatSDK, dispatch, setAdapter, state, props, optionalParams, persistedState);
     return true;
   }
   return false;
@@ -354,28 +363,28 @@ const canStartPopoutChat = async props => {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const checkIfConversationStillValid = async (chatSDK, dispatch, state) => {
+const checkIfConversationStillValid = async (facadeChatSDK, dispatch, state) => {
   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;
   // Preserve current requestId
-  const currentRequestId = chatSDK.requestId ?? "";
+  const currentRequestId = facadeChatSDK.getChatSDK().requestId ?? "";
   dispatch({
     type: LiveChatWidgetActionType.SET_INITIAL_CHAT_SDK_REQUEST_ID,
     payload: currentRequestId
   });
   try {
-    chatSDK.requestId = requestIdFromCache;
-    conversationDetails = await getConversationDetailsCall(chatSDK, liveChatContext);
+    facadeChatSDK.getChatSDK().requestId = requestIdFromCache;
+    conversationDetails = await getConversationDetailsCall(facadeChatSDK, liveChatContext);
     if (Object.keys(conversationDetails).length === 0 || isNullOrUndefined(conversationDetails.state) || conversationDetails.state === LiveWorkItemState.Closed || conversationDetails.state === LiveWorkItemState.WrapUp) {
       dispatch({
         type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
         payload: undefined
       });
       if (currentRequestId) {
-        chatSDK.requestId = currentRequestId;
+        facadeChatSDK.getChatSDK().requestId = currentRequestId;
       }
       return false;
     }