@microsoft/omnichannel-chat-widget 1.0.3-main.527b216 → 1.0.3-main.c925679

package/lib/esm/common/utils.js

@@ -258,7 +258,11 @@ export const getDomain = hostValue => {
   }
   return AriaTelemetryConstants.Public;
 };
-export const getWidgetCacheId = (orgId, widgetId, widgetInstanceId) => {
+export const getWidgetCacheId = function (orgId, widgetId, widgetInstanceId) {
+  let popoutChat = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  if (popoutChat) {
+    widgetInstanceId = widgetInstanceId + Constants.PopoutCacheSuffix;
+  }
   const widgetCacheId = `${widgetInstanceId}_${orgId}_${widgetId}`;
   return Md5.init(widgetCacheId);
 };
@@ -270,13 +274,13 @@ export const getWidgetEndChatEventName = (orgId, widgetId, widgetInstanceId) =>
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const getStateFromCache = (orgId, widgetId, widgetInstanceId) => {
+export const getStateFromCache = widgetCacheId => {
   // Getting updated state from cache
   try {
     if (DataStoreManager.clientDataStore) {
       var _DataStoreManager$cli;
-      const widgetStateEventName = getWidgetCacheId(orgId, widgetId, widgetInstanceId);
-      const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(widgetStateEventName, "localStorage");
+      const widgetStateEventName = widgetCacheId;
+      const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(widgetStateEventName);
       const persistedState = widgetStateFromCache ? JSON.parse(widgetStateFromCache) : undefined;
       return persistedState;
     } else {
@@ -308,6 +312,23 @@ export const getBroadcastChannelName = (widgetId, widgetInstanceId) => {
   return widgetInstanceId && !isNullOrEmptyString(widgetInstanceId) ? `${widgetInstanceId}_${widgetId}` : widgetId;
 };
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const getWidgetCacheIdfromProps = function (props) {
+  var _props$chatSDK, _props$chatSDK$omnich, _props$chatSDK2, _props$chatSDK2$omnic, _props$controlProps, _props$controlProps2;
+  let popoutChat = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  const orgId = props === null || props === void 0 ? void 0 : (_props$chatSDK = props.chatSDK) === null || _props$chatSDK === void 0 ? void 0 : (_props$chatSDK$omnich = _props$chatSDK.omnichannelConfig) === null || _props$chatSDK$omnich === void 0 ? void 0 : _props$chatSDK$omnich.orgId;
+  const widgetId = props === null || props === void 0 ? void 0 : (_props$chatSDK2 = props.chatSDK) === null || _props$chatSDK2 === void 0 ? void 0 : (_props$chatSDK2$omnic = _props$chatSDK2.omnichannelConfig) === null || _props$chatSDK2$omnic === void 0 ? void 0 : _props$chatSDK2$omnic.widgetId;
+  let widgetInstanceId = (props === null || props === void 0 ? void 0 : (_props$controlProps = props.controlProps) === null || _props$controlProps === void 0 ? void 0 : _props$controlProps.widgetInstanceId) ?? "";
+  if (props.useSessionStorage) {
+    widgetInstanceId = widgetInstanceId + Constants.SessionCacheSuffix;
+  }
+  if (props !== null && props !== void 0 && (_props$controlProps2 = props.controlProps) !== null && _props$controlProps2 !== void 0 && _props$controlProps2.hideStartChatButton || popoutChat === true) {
+    popoutChat = true;
+  }
+  const widgetCacheId = getWidgetCacheId(orgId, widgetId, widgetInstanceId, popoutChat);
+  return widgetCacheId;
+};
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const debounceLeading = function (fn) {
   let ms = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3000;

package/lib/esm/components/confirmationpanestateful/ConfirmationPaneStateful.js

@@ -5,9 +5,8 @@ import { findAllFocusableElement, findParentFocusableElementsWithoutChildContain
 import { DimLayer } from "../dimlayer/DimLayer";
 import { LiveChatWidgetActionType } from "../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../common/telemetry/TelemetryHelper";
-import useChatAdapterStore from "../../hooks/useChatAdapterStore";
 import useChatContextStore from "../../hooks/useChatContextStore";
-import { ConversationEndEntity } from "../../contexts/common/ConversationEndEntity";
+import { ConfirmationState } from "../../common/Constants";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const ConfirmationPaneStateful = props => {
@@ -15,7 +14,6 @@ export const ConfirmationPaneStateful = props => {
   let elements = [];
   const [state, dispatch] = useChatContextStore();
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
-  const [adapter] = useChatAdapterStore();
   const controlProps = {
     id: "oc-lcw-confirmation-pane",
     dir: state.domainStates.globalDir,
@@ -28,11 +26,11 @@ export const ConfirmationPaneStateful = props => {
         type: LiveChatWidgetActionType.SET_SHOW_CONFIRMATION,
         payload: false
       });
-      setTabIndices(elements, initialTabIndexMap, true);
       dispatch({
-        type: LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY,
-        payload: ConversationEndEntity.Customer
+        type: LiveChatWidgetActionType.SET_CONFIRMATION_STATE,
+        payload: ConfirmationState.Ok
       });
+      setTabIndices(elements, initialTabIndexMap, true);
       TelemetryHelper.logActionEvent(LogLevel.INFO, {
         Event: TelemetryEvent.ConversationEndedByCustomer,
         Description: "Conversation is ended by customer."
@@ -47,6 +45,10 @@ export const ConfirmationPaneStateful = props => {
         type: LiveChatWidgetActionType.SET_SHOW_CONFIRMATION,
         payload: false
       });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CONFIRMATION_STATE,
+        payload: ConfirmationState.Cancel
+      });
       const previousFocusedElementId = state.appStates.previousElementIdOnFocusBeforeModalOpen;
       if (previousFocusedElementId) {
         setFocusOnElement("#" + previousFocusedElementId);

package/lib/esm/components/footerstateful/FooterStateful.js

@@ -36,7 +36,7 @@ export const FooterStateful = props => {
           Event: TelemetryEvent.DownloadTranscriptButtonClicked,
           Description: "Download Transcript button clicked."
         });
-        await downloadTranscript(chatSDK, downloadTranscriptProps === null || downloadTranscriptProps === void 0 ? void 0 : downloadTranscriptProps.renderMarkDown, downloadTranscriptProps === null || downloadTranscriptProps === void 0 ? void 0 : downloadTranscriptProps.bannerMessageOnError, downloadTranscriptProps === null || downloadTranscriptProps === void 0 ? void 0 : downloadTranscriptProps.attachmentMessage);
+        await downloadTranscript(chatSDK, downloadTranscriptProps === null || downloadTranscriptProps === void 0 ? void 0 : downloadTranscriptProps.renderMarkDown, downloadTranscriptProps === null || downloadTranscriptProps === void 0 ? void 0 : downloadTranscriptProps.bannerMessageOnError, downloadTranscriptProps === null || downloadTranscriptProps === void 0 ? void 0 : downloadTranscriptProps.attachmentMessage, state);
       } catch (ex) {
         TelemetryHelper.logActionEvent(LogLevel.ERROR, {
           Event: TelemetryEvent.DownloadTranscriptFailed,

package/lib/esm/components/footerstateful/downloadtranscriptstateful/DownloadTranscriptStateful.js

@@ -151,8 +151,15 @@ const beautifyChatTranscripts = (chatTranscripts, renderMarkDown, attachmentMess
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const downloadTranscript = async (chatSDK, renderMarkDown, bannerMessageOnError, attachmentMessage) => {
+export const downloadTranscript = async (chatSDK, renderMarkDown, bannerMessageOnError, attachmentMessage, state) => {
+  var _state$domainStates, _state$domainStates2, _state$domainStates2$;
+  // Need to keep existing request id for scenarios when trnascript is downloaded after endchat
+  const existingRequestId = chatSDK.requestId;
+  chatSDK.chatToken = state === null || state === void 0 ? void 0 : (_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : _state$domainStates.chatToken;
+  chatSDK.requestId = state === null || state === void 0 ? void 0 : (_state$domainStates2 = state.domainStates) === null || _state$domainStates2 === void 0 ? void 0 : (_state$domainStates2$ = _state$domainStates2.chatToken) === null || _state$domainStates2$ === void 0 ? void 0 : _state$domainStates2$.requestId;
   let data = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getLiveChatTranscript());
+  // This is used for allowing to start next chat
+  chatSDK.requestId = existingRequestId;
   if (typeof data === Constants.String) {
     data = JSON.parse(data);
   }

package/lib/esm/components/headerstateful/HeaderStateful.js

@@ -7,9 +7,9 @@ import { TelemetryHelper } from "../../common/telemetry/TelemetryHelper";
 import { defaultOutOfOfficeHeaderStyleProps } from "./common/styleProps/defaultOutOfOfficeHeaderStyleProps";
 import useChatAdapterStore from "../../hooks/useChatAdapterStore";
 import useChatContextStore from "../../hooks/useChatContextStore";
-import { ConversationEndEntity } from "../../contexts/common/ConversationEndEntity";
+import { ConfirmationState } from "../../common/Constants";
 export const HeaderStateful = props => {
-  var _state$domainStates$l, _state$domainStates$l2, _headerProps$controlP, _headerProps$controlP2, _headerProps$controlP3, _outOfOfficeHeaderPro;
+  var _state$domainStates$l, _state$domainStates$l2, _state$domainStates, _headerProps$controlP, _headerProps$controlP2, _headerProps$controlP3, _outOfOfficeHeaderPro, _state$domainStates3;
   const [state, dispatch] = useChatContextStore();
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const [adapter] = useChatAdapterStore();
@@ -21,8 +21,9 @@ export const HeaderStateful = props => {
   //Setting OutOfOperatingHours Flag
   const [outOfOperatingHours, setOutOfOperatingHours] = useState(((_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.OutOfOperatingHours) === "True");
   const outOfOfficeStyleProps = Object.assign({}, defaultOutOfOfficeHeaderStyleProps, outOfOfficeHeaderProps === null || outOfOfficeHeaderProps === void 0 ? void 0 : outOfOfficeHeaderProps.styleProps);
-  const conversationState = useRef(state.appStates.conversationState);
-  const conversationEndedBy = useRef(state.appStates.conversationEndedBy);
+
+  // For some reason state object is not getting updated values in this component
+  const localConfirmationPaneState = useRef(state === null || state === void 0 ? void 0 : (_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : _state$domainStates.confirmationState);
   const controlProps = {
     id: "oc-lcw-header",
     dir: state.domainStates.globalDir,
@@ -42,7 +43,7 @@ export const HeaderStateful = props => {
         Event: TelemetryEvent.HeaderCloseButtonClicked,
         Description: "Header Close button clicked."
       });
-      if (conversationState.current === ConversationState.Active || conversationEndedBy.current === ConversationEndEntity.Agent) {
+      if (localConfirmationPaneState.current !== ConfirmationState.Ok) {
         dispatch({
           type: LiveChatWidgetActionType.SET_SHOW_CONFIRMATION,
           payload: true
@@ -62,9 +63,9 @@ export const HeaderStateful = props => {
       }
     },
     ...(headerProps === null || headerProps === void 0 ? void 0 : headerProps.controlProps),
-    hideTitle: state.appStates.conversationState === ConversationState.Loading && !state.appStates.isStartChatFailing || state.appStates.conversationState === ConversationState.PostchatLoading || (headerProps === null || headerProps === void 0 ? void 0 : (_headerProps$controlP = headerProps.controlProps) === null || _headerProps$controlP === void 0 ? void 0 : _headerProps$controlP.hideTitle),
-    hideIcon: state.appStates.conversationState === ConversationState.Loading && !state.appStates.isStartChatFailing || state.appStates.conversationState === ConversationState.PostchatLoading || (headerProps === null || headerProps === void 0 ? void 0 : (_headerProps$controlP2 = headerProps.controlProps) === null || _headerProps$controlP2 === void 0 ? void 0 : _headerProps$controlP2.hideIcon),
-    hideCloseButton: state.appStates.conversationState === ConversationState.Loading && !state.appStates.isStartChatFailing || state.appStates.conversationState === ConversationState.PostchatLoading || state.appStates.conversationState === ConversationState.Prechat || state.appStates.conversationState === ConversationState.ReconnectChat || (headerProps === null || headerProps === void 0 ? void 0 : (_headerProps$controlP3 = headerProps.controlProps) === null || _headerProps$controlP3 === void 0 ? void 0 : _headerProps$controlP3.hideCloseButton)
+    hideTitle: state.appStates.conversationState === ConversationState.Loading && !state.appStates.startChatFailed || state.appStates.conversationState === ConversationState.PostchatLoading || (headerProps === null || headerProps === void 0 ? void 0 : (_headerProps$controlP = headerProps.controlProps) === null || _headerProps$controlP === void 0 ? void 0 : _headerProps$controlP.hideTitle),
+    hideIcon: state.appStates.conversationState === ConversationState.Loading && !state.appStates.startChatFailed || state.appStates.conversationState === ConversationState.PostchatLoading || (headerProps === null || headerProps === void 0 ? void 0 : (_headerProps$controlP2 = headerProps.controlProps) === null || _headerProps$controlP2 === void 0 ? void 0 : _headerProps$controlP2.hideIcon),
+    hideCloseButton: state.appStates.conversationState === ConversationState.Loading && !state.appStates.startChatFailed || state.appStates.conversationState === ConversationState.PostchatLoading || state.appStates.conversationState === ConversationState.Prechat || state.appStates.conversationState === ConversationState.ReconnectChat || (headerProps === null || headerProps === void 0 ? void 0 : (_headerProps$controlP3 = headerProps.controlProps) === null || _headerProps$controlP3 === void 0 ? void 0 : _headerProps$controlP3.hideCloseButton)
   };
   const outOfOfficeControlProps = {
     id: "oc-lcw-header",
@@ -85,11 +86,11 @@ export const HeaderStateful = props => {
     if (state.appStates.outsideOperatingHours) {
       setOutOfOperatingHours(true);
     }
-    if (state.appStates.conversationState) {
-      conversationState.current = state.appStates.conversationState;
-    }
-    conversationEndedBy.current = state.appStates.conversationEndedBy;
-  }, [state.appStates]);
+  }, []);
+  useEffect(() => {
+    var _state$domainStates2;
+    localConfirmationPaneState.current = state === null || state === void 0 ? void 0 : (_state$domainStates2 = state.domainStates) === null || _state$domainStates2 === void 0 ? void 0 : _state$domainStates2.confirmationState;
+  }, [state === null || state === void 0 ? void 0 : (_state$domainStates3 = state.domainStates) === null || _state$domainStates3 === void 0 ? void 0 : _state$domainStates3.confirmationState]);
   return /*#__PURE__*/React.createElement(Header, {
     componentOverrides: headerProps === null || headerProps === void 0 ? void 0 : headerProps.componentOverrides,
     controlProps: outOfOperatingHours || state.appStates.conversationState === ConversationState.OutOfOffice ? outOfOfficeControlProps : controlProps,

package/lib/esm/components/livechatwidget/common/ActivitySubscriber/DefaultActivitySubscriber.js

@@ -3,6 +3,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 export class DefaultActivitySubscriber {
   constructor() {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     _defineProperty(this, "observer", void 0);
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/lib/esm/components/livechatwidget/common/ActivitySubscriber/PauseActivitySubscriber.js

@@ -4,6 +4,7 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
 import { ActivityStreamHandler } from "../ActivityStreamHandler";
 export class PauseActivitySubscriber {
   constructor() {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     _defineProperty(this, "observer", void 0);
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

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

@@ -10,9 +10,11 @@ export class Deferred {
     _defineProperty(this, "_reject", () => {
       return;
     });
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     _defineProperty(this, "resolve", value => {
       this._resolve(value);
     });
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     _defineProperty(this, "reject", value => {
       this._reject(value);
     });
@@ -21,9 +23,6 @@ export class Deferred {
       this._reject = reject;
     });
   }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
   get promise() {
     return this._promise;
   }

package/lib/esm/components/livechatwidget/common/defaultProps/dummyDefaultProps.js

@@ -1789,5 +1789,6 @@ export const dummyDefaultProps = {
     hyperlinkTextOverride: false
   },
   telemetryConfig: undefined,
-  getAuthToken: undefined
+  getAuthToken: undefined,
+  initialCustomContext: undefined
 };

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

@@ -5,60 +5,84 @@ import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidge
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { WebChatStoreLoader } from "../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader";
 import { defaultWebChatContainerStatefulProps } from "../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps";
-import { getWidgetEndChatEventName } from "../../../common/utils";
+import { getWidgetEndChatEventName, isNullOrEmptyString } from "../../../common/utils";
 import { getAuthClientFunction, handleAuthentication } from "./authHelper";
-import { checkPostChatEnabled, initiatePostChat } from "./setPostChatContextAndLoadSurvey";
-import { ConversationEndEntity } from "../../../contexts/common/ConversationEndEntity";
+import { initiatePostChat, getPostChatContext } from "./renderSurveyHelpers";
+import { Constants, ConversationEndEntity, ConfirmationState } from "../../../common/Constants";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const prepareEndChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state) => {
-  //Unable to end chat if token has expired
-  if (props.getAuthToken) {
-    const authClientFunction = getAuthClientFunction(props.chatConfig);
-    if (props.getAuthToken && authClientFunction) {
-      // set auth token to chat sdk before end chat
-      const authSuccess = await handleAuthentication(chatSDK, props.chatConfig, props.getAuthToken);
-      if (!authSuccess) {
-        TelemetryHelper.logActionEvent(LogLevel.ERROR, {
-          Event: TelemetryEvent.GetAuthTokenFailed,
-          ExceptionDetails: {
-            exception: "Unable to get auth token during end chat"
-          }
-        });
+const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, uwid) => {
+  try {
+    var _conversationDetails$, _state$domainStates, _state$domainStates2;
+    const conversationDetails = await getConversationDetails(chatSDK);
+
+    // 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) {
+      var _state$appStates;
+      // If ended by customer, just close chat
+      if ((state === null || state === void 0 ? void 0 : (_state$appStates = state.appStates) === null || _state$appStates === void 0 ? void 0 : _state$appStates.conversationEndedBy) === ConversationEndEntity.Customer) {
+        await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true, uwid);
       }
+      //Use Case: If ended by Agent, stay chat in InActive state
+      return;
     }
-  }
-  const isPostChatEnabled = checkPostChatEnabled(props, state);
-  if (isPostChatEnabled) {
-    try {
-      await initiatePostChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state);
-    } catch (error) {
-      // Ending chat because something went wrong
-      await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, false, true);
-    }
-  } else {
-    if (state.appStates.conversationEndedBy === ConversationEndEntity.Agent) {
-      dispatch({
-        type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
-        payload: undefined
-      });
+
+    // Use Case : Can render post chat scenarios
+    await getPostChatContext(chatSDK, state, dispatch);
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const postchatContext = 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;
+      // For Customer intiated conversations, just close chat widget
+      if ((state === null || state === void 0 ? void 0 : (_state$appStates2 = state.appStates) === null || _state$appStates2 === void 0 ? void 0 : _state$appStates2.conversationEndedBy) === ConversationEndEntity.Customer) {
+        await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true, uwid);
+        return;
+      }
+
+      //For agent initiated end chat, allow to download transcript
       dispatch({
-        type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
-        payload: undefined
+        type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: ConversationState.InActive
       });
-    } else {
-      await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, false, true);
+      return;
+    }
+    endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, true, true, uwid);
+
+    // Initiate post chat render
+    if (state !== null && state !== void 0 && (_state$domainStates2 = state.domainStates) !== null && _state$domainStates2 !== void 0 && _state$domainStates2.postChatContext) {
+      await initiatePostChat(props, conversationDetails, state, dispatch);
+      return;
+    }
+  } catch (error) {
+    var _props$controlProps;
+    TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+      Event: TelemetryEvent.EndChatFailed,
+      ExceptionDetails: {
+        exception: JSON.stringify(error)
+      }
+    });
+
+    //Close chat widget for any failure in embedded to allow to show start chat button
+    if (((_props$controlProps = props.controlProps) === null || _props$controlProps === void 0 ? void 0 : _props$controlProps.hideStartChatButton) === false) {
+      await endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true, uwid);
     }
+  } finally {
+    //Chat token clean up
+    await chatTokenCleanUp(dispatch);
   }
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) => {
-  if (!skipEndChatSDK) {
+const endChat = async function (props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) {
+  let uwid = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : "";
+  if (!skipEndChatSDK && chatSDK.conversation) {
     try {
       TelemetryHelper.logSDKEvent(LogLevel.INFO, {
         Event: TelemetryEvent.EndChatSDKCall
       });
+      //Get auth token again if chat continued for longer time, otherwise gets 401 error
+      await handleAuthenticationIfEnabled(props, chatSDK);
       await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat());
     } catch (ex) {
       TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
@@ -68,25 +92,10 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
         }
       });
       postMessageToOtherTab = false;
+    } finally {
+      await endChatStateCleanUp(dispatch);
     }
   }
-  // Need to clear these states immediately when chat ended from OC.
-  dispatch({
-    type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
-    payload: undefined
-  });
-  dispatch({
-    type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
-    payload: undefined
-  });
-  dispatch({
-    type: LiveChatWidgetActionType.SET_RECONNECT_ID,
-    payload: undefined
-  });
-  dispatch({
-    type: LiveChatWidgetActionType.SET_CHAT_DISCONNECT_EVENT_RECEIVED,
-    payload: false
-  });
   if (!skipCloseChat) {
     try {
       var _props$webChatContain;
@@ -97,49 +106,7 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
         ...((_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : _props$webChatContain.webChatStyles)
       });
       WebChatStoreLoader.store = null;
-      dispatch({
-        type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-        payload: ConversationState.Closed
-      });
-      dispatch({
-        type: LiveChatWidgetActionType.SET_POST_CHAT_WORKFLOW_IN_PROGRESS,
-        payload: false
-      });
-      dispatch({
-        type: LiveChatWidgetActionType.SET_SHOULD_USE_BOT_SURVEY,
-        payload: false
-      });
-      dispatch({
-        type: LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT_EVENT_RECEIVED,
-        payload: false
-      });
-      dispatch({
-        type: LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY,
-        payload: undefined
-      });
-      dispatch({
-        type: LiveChatWidgetActionType.SET_RECONNECT_ID,
-        payload: undefined
-      });
-      dispatch({
-        type: LiveChatWidgetActionType.SET_AUDIO_NOTIFICATION,
-        payload: null
-      });
-      dispatch({
-        type: LiveChatWidgetActionType.SET_PROACTIVE_CHAT_PARAMS,
-        payload: {
-          proactiveChatBodyTitle: "",
-          proactiveChatEnablePrechat: false,
-          proactiveChatInNewWindow: false
-        }
-      });
-      if (postMessageToOtherTab) {
-        var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _props$controlProps;
-        const endChatEventName = 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$controlProps = props.controlProps) === null || _props$controlProps === void 0 ? void 0 : _props$controlProps.widgetInstanceId) ?? "");
-        BroadcastService.postMessage({
-          eventName: endChatEventName
-        });
-      }
+      closeChatStateCleanUp(dispatch);
       TelemetryHelper.logActionEvent(LogLevel.INFO, {
         Event: TelemetryEvent.CloseChatCall,
         Description: "Chat was closed succesfully"
@@ -152,11 +119,141 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
         }
       });
     } finally {
+      var _state$appStates3;
       dispatch({
         type: LiveChatWidgetActionType.SET_UNREAD_MESSAGE_COUNT,
         payload: 0
       });
+      //Always allow to close the chat for embedded mode irrespective of end chat errors
+      if (!(state !== null && state !== void 0 && (_state$appStates3 = state.appStates) !== null && _state$appStates3 !== void 0 && _state$appStates3.hideStartChatButton)) {
+        dispatch({
+          type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+          payload: ConversationState.Closed
+        });
+      }
     }
   }
+  if (postMessageToOtherTab && !isNullOrEmptyString(uwid)) {
+    const endChatEventName = await getEndChatEventName(chatSDK, props);
+    BroadcastService.postMessage({
+      eventName: endChatEventName,
+      payload: uwid
+    });
+  }
+};
+const endChatStateCleanUp = async dispatch => {
+  // Need to clear these states immediately when chat ended from OC.
+  dispatch({
+    type: LiveChatWidgetActionType.SET_CUSTOM_CONTEXT,
+    payload: undefined
+  });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+    payload: undefined
+  });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_RECONNECT_ID,
+    payload: undefined
+  });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_CHAT_DISCONNECT_EVENT_RECEIVED,
+    payload: false
+  });
+};
+const closeChatStateCleanUp = async dispatch => {
+  dispatch({
+    type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
+    payload: undefined
+  });
+  // dispatch({ type: LiveChatWidgetActionType.SET_CONVERSATION_STATE, payload: ConversationState.Closed });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_RECONNECT_ID,
+    payload: undefined
+  });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_AUDIO_NOTIFICATION,
+    payload: null
+  });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY,
+    payload: ConversationEndEntity.NotSet
+  });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_CONFIRMATION_STATE,
+    payload: ConfirmationState.NotSet
+  });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_START_CHAT_FAILING,
+    payload: false
+  });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_PROACTIVE_CHAT_PARAMS,
+    payload: {
+      proactiveChatBodyTitle: "",
+      proactiveChatEnablePrechat: false,
+      proactiveChatInNewWindow: false
+    }
+  });
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const handleAuthenticationIfEnabled = async (props, chatSDK) => {
+  //Unable to end chat if token has expired
+  if (props.getAuthToken) {
+    const authClientFunction = getAuthClientFunction(props.chatConfig);
+    if (props.getAuthToken && authClientFunction) {
+      // set auth token to chat sdk before end chat
+      const authSuccess = await handleAuthentication(chatSDK, props.chatConfig, props.getAuthToken);
+      if (!authSuccess) {
+        TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+          Event: TelemetryEvent.GetAuthTokenFailed,
+          ExceptionDetails: {
+            exception: "Unable to get auth token during end chat"
+          }
+        });
+        throw new Error("handleAuthenticationIfEnabled:Failed to get authentication token");
+      }
+    }
+  }
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const chatTokenCleanUp = async dispatch => {
+  //Just do cleanup here
+  dispatch({
+    type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
+    payload: undefined
+  });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+    payload: undefined
+  });
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const getEndChatEventName = async (chatSDK, props) => {
+  var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _props$controlProps2;
+  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$controlProps2 = props.controlProps) === null || _props$controlProps2 === void 0 ? void 0 : _props$controlProps2.widgetInstanceId) ?? "");
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const getConversationDetails = async chatSDK => {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let conversationDetails = undefined;
+  try {
+    TelemetryHelper.logSDKEvent(LogLevel.INFO, {
+      Event: TelemetryEvent.GetConversationDetailsCallStarted,
+      Description: "Conversation details call started"
+    });
+    conversationDetails = await chatSDK.getConversationDetails();
+  } catch (error) {
+    TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
+      Event: TelemetryEvent.GetConversationDetailsCallFailed,
+      ExceptionDetails: {
+        exception: `Get Conversation Details Call Failed : ${error}`
+      }
+    });
+  }
+  return conversationDetails;
 };
-export { prepareEndChat, endChat };
+export { prepareEndChat, endChat, getConversationDetails };