@microsoft/omnichannel-chat-widget 0.1.0-main.d48dae2 → 0.1.0-main.d553f80

package/lib/cjs/components/webchatcontainerstateful/interfaces/IAdaptiveCardStyles.js

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

package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityStatusMiddleware.js

@@ -76,7 +76,8 @@ const activityStatusMiddleware = () => next => args => {
       args: args,
       role: current_role,
       name: current_name
-    }));
+    })) // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ;
   }
 };
 

package/lib/cjs/contexts/common/LiveChatWidgetActionType.js

@@ -41,4 +41,5 @@ exports.LiveChatWidgetActionType = LiveChatWidgetActionType;
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_LIVE_CHAT_CONTEXT"] = 30] = "SET_LIVE_CHAT_CONTEXT";
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_BOT_OAUTH_SIGNIN_ID"] = 31] = "SET_BOT_OAUTH_SIGNIN_ID";
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_WIDGET_SIZE"] = 32] = "SET_WIDGET_SIZE";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_WIDGET_INSTANCE_ID"] = 33] = "SET_WIDGET_INSTANCE_ID";
 })(LiveChatWidgetActionType || (exports.LiveChatWidgetActionType = LiveChatWidgetActionType = {}));

package/lib/cjs/contexts/common/LiveChatWidgetContextInitialState.js

@@ -29,7 +29,8 @@ const getLiveChatWidgetContextInitialState = props => {
       globalDir: "ltr",
       liveChatContext: undefined,
       customContext: undefined,
-      widgetSize: undefined
+      widgetSize: undefined,
+      widgetInstanceId: ""
     },
     appStates: {
       conversationState: _ConversationState.ConversationState.Closed,

package/lib/cjs/contexts/createReducer.js

@@ -243,6 +243,14 @@ const createReducer = () => {
           }
         };
 
+      case _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_WIDGET_INSTANCE_ID:
+        return { ...state,
+          domainStates: { ...state.domainStates,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            widgetInstanceId: action.payload
+          }
+        };
+
       default:
         return state;
     }

package/lib/esm/common/Constants.js

@@ -160,6 +160,8 @@ _defineProperty(Constants, "ChatWidgetStateChangedPrefix", "ChatWidgetStateChang
 
 _defineProperty(Constants, "PostChatLoadingDurationInMs", 2000);
 
+_defineProperty(Constants, "BrowserUnloadConfirmationMessage", "Do you want to leave chat?");
+
 export const Regex = (_class = class Regex {}, _defineProperty(_class, "EmailRegex", "(?:[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-zA-Z0-9-]*[a-zA-Z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])"), _class);
 export class HtmlIdNames {}
 

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

@@ -159,6 +159,8 @@ export let TelemetryEvent;
   TelemetryEvent["MessageSent"] = "MessageSent";
   TelemetryEvent["MessageReceived"] = "MessageReceived";
   TelemetryEvent["CustomContextReceived"] = "CustomContextReceived";
+  TelemetryEvent["NetworkDisconnected"] = "NetworkDisconnected";
+  TelemetryEvent["NetworkReconnected"] = "NetworkReconnected";
 })(TelemetryEvent || (TelemetryEvent = {}));
 
 export class TelemetryConstants {
@@ -205,6 +207,8 @@ export class TelemetryConstants {
       case TelemetryEvent.MessageReceived:
       case TelemetryEvent.CustomContextReceived:
       case TelemetryEvent.BrowserUnloadEventStarted:
+      case TelemetryEvent.NetworkDisconnected:
+      case TelemetryEvent.NetworkReconnected:
         return ScenarioType.ACTIONS;
 
       case TelemetryEvent.StartChatSDKCall:

package/lib/esm/common/utils.js

@@ -2,6 +2,7 @@ import { AriaTelemetryConstants, Constants, LocaleConstants } from "./Constants"
 import { DataStoreManager } from "./contextDataStore/DataStoreManager";
 import { KeyCodes } from "./KeyCodes";
 import { BroadcastEvent } from "./telemetry/TelemetryConstants";
+import { Md5 } from "md5-typescript";
 
 const getElementBySelector = selector => {
   let element;
@@ -290,20 +291,25 @@ export const getDomain = hostValue => {
 
   return AriaTelemetryConstants.Public;
 };
-export const getWidgetCacheId = (orgId, widgetId) => {
-  return `${Constants.ChatWidgetStateChangedPrefix}_${orgId}_${widgetId}`;
+export const getWidgetCacheId = (orgId, widgetId, widgetInstanceId) => {
+  const widgetCacheId = `${widgetInstanceId}_${orgId}_${widgetId}`;
+  return Md5.init(widgetCacheId);
 };
-export const getWidgetEndChatEventName = (orgId, widgetId) => {
+export const getWidgetEndChatEventName = (orgId, widgetId, widgetInstanceId) => {
+  if (!isNullOrEmptyString(widgetInstanceId)) {
+    return `${BroadcastEvent.ChatEnded}_${widgetInstanceId}_${orgId}_${widgetId}`;
+  }
+
   return `${BroadcastEvent.ChatEnded}_${orgId}_${widgetId}`;
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-export const getStateFromCache = (orgId, widgetId) => {
+export const getStateFromCache = (orgId, widgetId, widgetInstanceId) => {
   // Getting updated state from cache
   try {
     if (DataStoreManager.clientDataStore) {
       var _DataStoreManager$cli;
 
-      const widgetStateEventName = getWidgetCacheId(orgId, widgetId);
+      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 persistedState = widgetStateFromCache ? JSON.parse(widgetStateFromCache) : undefined;
       return persistedState;
@@ -330,4 +336,7 @@ export const isUndefinedOrEmpty = object => {
 
 export const addDelayInMs = ms => {
   return new Promise(resolve => setTimeout(resolve, ms));
+};
+export const getBroadcastChannelName = (widgetId, widgetInstanceId) => {
+  return widgetInstanceId && !isNullOrEmptyString(widgetInstanceId) ? `${widgetInstanceId}_${widgetId}` : widgetId;
 };

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

@@ -49,7 +49,8 @@ export const HeaderStateful = props => {
       } else {
         const skipEndChatSDK = true;
         const skipCloseChat = false;
-        await endChat(adapter, skipEndChatSDK, skipCloseChat);
+        const postMessageToOtherTabs = true;
+        await endChat(adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTabs);
       }
 
       dispatch({

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

@@ -0,0 +1,34 @@
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+import { Deferred } from "./Deferred";
+export class ActivityStreamHandler {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+  /**
+   * Use of a deferred pattern, to hold the execution of the activity.
+   * 
+   * */
+  static cork() {
+    ActivityStreamHandler.restoreDeferred = new Deferred();
+    ActivityStreamHandler.restorePromise = ActivityStreamHandler.restoreDeferred.promise;
+  }
+  /**
+   * Resolve the promise, releasing it to continue with the execution of the activity.
+   * 
+   * */
+
+
+  static uncork() {
+    ActivityStreamHandler.restoreDeferred.resolve();
+  }
+
+}
+
+_defineProperty(ActivityStreamHandler, "restoreDeferred", {
+  resolve: () => {
+    return "initialState";
+  }
+});
+
+_defineProperty(ActivityStreamHandler, "restorePromise", void 0);

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

@@ -0,0 +1,29 @@
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+import { ActivityStreamHandler } from "../ActivityStreamHandler";
+export class PauseActivitySubscriber {
+  constructor() {
+    _defineProperty(this, "observer", void 0);
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  async apply(activity) {
+    await ActivityStreamHandler.restorePromise;
+    return activity;
+  } // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any
+
+
+  applicable(activity) {
+    return true;
+  } // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+  async next(activity) {
+    if (this.applicable(activity)) {
+      return await this.apply(activity);
+    }
+
+    return activity;
+  }
+
+}

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

@@ -0,0 +1,33 @@
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+export class Deferred {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  constructor() {
+    _defineProperty(this, "_promise", void 0);
+
+    _defineProperty(this, "_resolve", void 0);
+
+    _defineProperty(this, "_reject", () => {
+      return;
+    });
+
+    _defineProperty(this, "resolve", value => {
+      this._resolve(value);
+    });
+
+    _defineProperty(this, "reject", value => {
+      this._reject(value);
+    });
+
+    this._promise = new Promise((resolve, reject) => {
+      this._resolve = resolve;
+      this._reject = reject;
+    });
+  } // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+  get promise() {
+    return this._promise;
+  }
+
+}

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

@@ -0,0 +1,39 @@
+import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
+import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
+import { isNullOrEmptyString } from "../../../common/utils"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+const handleAuthentication = async (chatSDK, chatConfig, getAuthToken) => {
+  let authClientFunction = undefined;
+
+  if (chatConfig !== null && chatConfig !== void 0 && chatConfig.LiveChatConfigAuthSettings) {
+    var _chatConfig$LiveChatC;
+
+    authClientFunction = (chatConfig === null || chatConfig === void 0 ? void 0 : (_chatConfig$LiveChatC = chatConfig.LiveChatConfigAuthSettings) === null || _chatConfig$LiveChatC === void 0 ? void 0 : _chatConfig$LiveChatC.msdyn_javascriptclientfunction) ?? undefined;
+  }
+
+  if (getAuthToken && authClientFunction) {
+    TelemetryHelper.logActionEvent(LogLevel.INFO, {
+      Event: TelemetryEvent.GetAuthTokenCalled
+    });
+    const token = await getAuthToken(authClientFunction);
+
+    if (!isNullOrEmptyString(token)) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      chatSDK.setAuthTokenProvider(async () => {
+        return token;
+      });
+    } else {
+      TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+        Event: TelemetryEvent.ReceivedNullOrEmptyToken
+      });
+    }
+  }
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+const removeAuthTokenProvider = chatSDK => {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  chatSDK.authenticatedUserToken = null;
+};
+
+export { handleAuthentication, removeAuthTokenProvider };

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

@@ -2,7 +2,8 @@ import { NotificationHandler } from "../../webchatcontainerstateful/webchatcontr
 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"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import { ChatAdapterShim } from "./ChatAdapterShim";
+import { PauseActivitySubscriber } from "./ActivitySubscriber/PauseActivitySubscriber"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 export const createAdapter = async chatSDK => {
   const chatAdapterOptionalParams = {
@@ -28,6 +29,7 @@ export const createAdapter = async chatSDK => {
 
   if (chatSDK.isMockModeOn !== true) {
     adapter = new ChatAdapterShim(adapter);
+    adapter.addSubscriber(new PauseActivitySubscriber());
     return adapter.chatAdapter;
   }
 

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

@@ -2,6 +2,8 @@ import { Constants } from "../../../common/Constants";
 import { NotificationHandler } from "../../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler";
 import { NotificationScenarios } from "../../webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios";
 import { defaultMiddlewareLocalizedTexts } from "../../webchatcontainerstateful/common/defaultProps/defaultMiddlewareLocalizedTexts";
+import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
+import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
 
 const isInternetConnected = async () => {
   try {
@@ -18,8 +20,14 @@ export const createInternetConnectionChangeHandler = async () => {
     const connected = await isInternetConnected();
 
     if (!connected) {
+      TelemetryHelper.logActionEvent(LogLevel.WARN, {
+        Event: TelemetryEvent.NetworkDisconnected
+      });
       NotificationHandler.notifyError(NotificationScenarios.InternetConnection, defaultMiddlewareLocalizedTexts.MIDDLEWARE_BANNER_NO_INTERNET_CONNECTION);
     } else {
+      TelemetryHelper.logActionEvent(LogLevel.WARN, {
+        Event: TelemetryEvent.NetworkReconnected
+      });
       NotificationHandler.notifySuccess(NotificationScenarios.InternetConnection, defaultMiddlewareLocalizedTexts.MIDDLEWARE_BANNER_INTERNET_BACK_ONLINE);
     }
   }; // Checking connection status on online & offline events due to possible false positives

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

@@ -318,7 +318,8 @@ export const dummyDefaultProps = {
       hideChatTitle: false,
       hideNotificationBubble: true,
       unreadMessageString: "new messages",
-      largeUnreadMessageString: "99+"
+      largeUnreadMessageString: "99+",
+      ariaLabelUnreadMessageString: "you have new messages"
     },
     styleProps: {
       generalStyleProps: {
@@ -1681,6 +1682,10 @@ export const dummyDefaultProps = {
     botMagicCode: {
       disabled: false,
       fwdUrl: ""
+    },
+    adaptiveCardStyles: {
+      background: "white",
+      color: "black"
     }
   },
   telemetryConfig: undefined,

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

@@ -31,7 +31,7 @@ const prepareEndChat = async (props, chatSDK, setAdapter, setWebChatStyles, disp
   if (isPostChatEnabled === "true" && ((_conversationDetails = conversationDetails) === null || _conversationDetails === void 0 ? void 0 : _conversationDetails.canRenderPostChat) === Constants.truePascal) {
     const skipEndChatSDK = false;
     const skipCloseChat = true;
-    await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat, true);
+    await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat, false);
 
     if (postChatSurveyMode === PostChatSurveyMode.Embed) {
       dispatch({
@@ -129,9 +129,9 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
       });
 
       if (postMessageToOtherTab) {
-        var _chatSDK$omnichannelC, _chatSDK$omnichannelC2;
+        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);
+        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
         });

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

@@ -83,6 +83,10 @@ export const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatS
           });
         }
       } else {
+        dispatch({
+          type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+          payload: ConversationState.InActive
+        });
         dispatch({
           type: LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT,
           payload: true

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

@@ -3,25 +3,34 @@ import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/teleme
 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"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-const getChatReconnectContext = async (chatSDK, reconnectId) => {
-  try {
-    if (reconnectId) {
-      const chatReconnectOptionalParams = {
-        reconnectId: reconnectId
-      };
-      return await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatReconnectContext(chatReconnectOptionalParams));
-    } else {
-      return await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatReconnectContext());
-    }
-  } catch (ex) {
-    TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
-      Event: TelemetryEvent.GetChatReconnectContextSDKCallFailed,
-      ExceptionDetails: {
-        exception: ex
+import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
+import { handleAuthentication, removeAuthTokenProvider } from "./authHelper"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+const getChatReconnectContext = async (chatSDK, chatConfig, getAuthToken, isReconnectEnabled, reconnectId) => {
+  if (isReconnectEnabled) {
+    try {
+      if (reconnectId) {
+        const chatReconnectOptionalParams = {
+          reconnectId: reconnectId
+        };
+        return await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatReconnectContext(chatReconnectOptionalParams));
+      } else {
+        // set auth token to chat sdk to get reconnectId for auth chat
+        await handleAuthentication(chatSDK, chatConfig, getAuthToken);
+        const reconnectChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatReconnectContext()); // remove auth token after reconnectId is fetched
+        // this will be reset later at start chat
+
+        removeAuthTokenProvider(chatSDK);
+        return reconnectChatContext;
       }
-    });
+    } catch (ex) {
+      TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
+        Event: TelemetryEvent.GetChatReconnectContextSDKCallFailed,
+        ExceptionDetails: {
+          exception: ex
+        }
+      });
+    }
   }
 
   return null;
@@ -43,7 +52,9 @@ const getReconnectIdForAuthenticatedChat = async (props, chatSDK) => {
 
   /* && !isLoadWithState() */
   ) {
-    const previousActiveSessionResponse = await getChatReconnectContext(chatSDK);
+    var _props$reconnectChatP2;
+
+    const previousActiveSessionResponse = await getChatReconnectContext(chatSDK, props.chatConfig, props.getAuthToken, (_props$reconnectChatP2 = props.reconnectChatPaneProps) === null || _props$reconnectChatP2 === void 0 ? void 0 : _props$reconnectChatP2.isReconnectEnabled);
 
     if (previousActiveSessionResponse && previousActiveSessionResponse.reconnectId) {
       return previousActiveSessionResponse.reconnectId;
@@ -54,8 +65,8 @@ const getReconnectIdForAuthenticatedChat = async (props, chatSDK) => {
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-const handleUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat, redirectInSameWindow) => {
-  const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, reconnectId);
+const handleUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, isReconnectEnabled, reconnectId, initStartChat, redirectInSameWindow) => {
+  const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, chatConfig, getAuthToken, isReconnectEnabled, reconnectId);
 
   if (shouldRedirectOrStartNewChat(reconnectAvailabilityResponse)) {
     await redirectOrStartNewChat(reconnectAvailabilityResponse, chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, redirectInSameWindow);
@@ -65,8 +76,8 @@ const handleUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthTo
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-const startUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat) => {
-  const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, reconnectId);
+const startUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, isReconnectEnabled, reconnectId, initStartChat) => {
+  const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, chatConfig, getAuthToken, isReconnectEnabled, reconnectId);
 
   if (!shouldRedirectOrStartNewChat(reconnectAvailabilityResponse)) {
     await setReconnectIdAndStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat);
@@ -140,8 +151,8 @@ const startNewChatEmptyRedirectionUrl = async (chatSDK, chatConfig, getAuthToken
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-const handleRedirectUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, reconnectId, redirectInSameWindow) => {
-  const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, reconnectId);
+const handleRedirectUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, isReconnectEnabled, reconnectId, redirectInSameWindow) => {
+  const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, chatConfig, getAuthToken, isReconnectEnabled, reconnectId);
 
   if (shouldRedirectOrStartNewChat(reconnectAvailabilityResponse)) {
     await redirectOrStartNewChat(reconnectAvailabilityResponse, chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, redirectInSameWindow);

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

@@ -8,19 +8,24 @@ import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { TelemetryTimers } from "../../../common/telemetry/TelemetryManager";
 import { createAdapter } from "./createAdapter";
 import { createOnNewAdapterActivityHandler } from "../../../plugins/newMessageEventHandler";
-import { createTimer, getStateFromCache, isNullOrEmptyString, isUndefinedOrEmpty } from "../../../common/utils";
+import { createTimer, getStateFromCache, isUndefinedOrEmpty } from "../../../common/utils";
 import { getReconnectIdForAuthenticatedChat, handleRedirectUnauthenticatedReconnectChat } from "./reconnectChatHelper";
 import { setPostChatContextAndLoadSurvey } from "./setPostChatContextAndLoadSurvey";
 import { updateSessionDataForTelemetry } from "./updateSessionDataForTelemetry";
-import { BroadcastService } from "@microsoft/omnichannel-chat-components"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import { BroadcastService } from "@microsoft/omnichannel-chat-components";
+import { ActivityStreamHandler } from "./ActivityStreamHandler";
+import { handleAuthentication } from "./authHelper"; // 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, _props$reconnectChatP;
 
   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;
@@ -28,9 +33,9 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
 
 
   if ((_props$reconnectChatP = props.reconnectChatPaneProps) !== null && _props$reconnectChatP !== void 0 && _props$reconnectChatP.reconnectId) {
-    var _props$reconnectChatP2, _props$reconnectChatP3;
+    var _props$reconnectChatP2, _props$reconnectChatP3, _props$reconnectChatP4;
 
-    await handleRedirectUnauthenticatedReconnectChat(chatSDK, props.chatConfig, props.getAuthToken, 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);
+    await handleRedirectUnauthenticatedReconnectChat(chatSDK, props.chatConfig, props.getAuthToken, dispatch, setAdapter, initStartChat, (_props$reconnectChatP2 = props.reconnectChatPaneProps) === null || _props$reconnectChatP2 === void 0 ? void 0 : _props$reconnectChatP2.isReconnectEnabled, (_props$reconnectChatP3 = props.reconnectChatPaneProps) === null || _props$reconnectChatP3 === void 0 ? void 0 : _props$reconnectChatP3.reconnectId, (_props$reconnectChatP4 = props.reconnectChatPaneProps) === null || _props$reconnectChatP4 === void 0 ? void 0 : _props$reconnectChatP4.redirectInSameWindow);
     return;
   } // Getting reconnectId for authenticated chat
 
@@ -47,10 +52,8 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
       payload: ConversationState.ReconnectChat
     });
     return;
-  } // Set custom context params
-
+  } // Setting Proactive chat settings
 
-  setCustomContextParams(props, chatSDK); // Setting Proactive chat settings
 
   const isProactiveChat = state.appStates.conversationState === ConversationState.ProactiveChat;
   const isPreChatEnabledInProactiveChat = state.appStates.proactiveChatStates.proactiveChatEnablePrechat; //Setting PreChat and intiate chat
@@ -86,35 +89,6 @@ const setPreChatAndInitiateChat = async (chatSDK, chatConfig, getAuthToken, disp
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-const handleAuthentication = async (chatSDK, chatConfig, getAuthToken) => {
-  if (getAuthToken) {
-    TelemetryHelper.logActionEvent(LogLevel.INFO, {
-      Event: TelemetryEvent.GetAuthTokenCalled
-    });
-    let authClientFunction = undefined;
-
-    if (chatConfig !== null && chatConfig !== void 0 && chatConfig.LiveChatConfigAuthSettings) {
-      var _chatConfig$LiveChatC;
-
-      authClientFunction = (chatConfig === null || chatConfig === void 0 ? void 0 : (_chatConfig$LiveChatC = chatConfig.LiveChatConfigAuthSettings) === null || _chatConfig$LiveChatC === void 0 ? void 0 : _chatConfig$LiveChatC.msdyn_javascriptclientfunction) ?? undefined;
-    }
-
-    const token = await getAuthToken(authClientFunction);
-
-    if (!isNullOrEmptyString(token)) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      chatSDK.setAuthTokenProvider(async () => {
-        return token;
-      });
-    } else {
-      TelemetryHelper.logActionEvent(LogLevel.ERROR, {
-        Event: TelemetryEvent.ReceivedNullOrEmptyToken
-      });
-    }
-  }
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
 const initStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, params, persistedState) => {
   try {
     var _newAdapter$activity$, _TelemetryTimers$Widg;
@@ -138,8 +112,9 @@ const initStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAda
       TelemetryTimers.WidgetLoadTimer = createTimer();
       TelemetryHelper.logSDKEvent(LogLevel.INFO, {
         Event: TelemetryEvent.StartChatSDKCall
-      }); // Set optional params
+      }); // Set custom context params
 
+      setCustomContextParams(chatSDK);
       optionalParams = Object.assign({}, params, optionalParams); // set auth token to chat sdk before start chat
 
       await handleAuthentication(chatSDK, chatConfig, getAuthToken);
@@ -193,6 +168,7 @@ const initStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAda
     await updateSessionDataForTelemetry(chatSDK, dispatch); // Set app state to Active
 
     if (isStartChatSuccessful) {
+      ActivityStreamHandler.uncork();
       dispatch({
         type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: ConversationState.Active
@@ -225,19 +201,20 @@ const initStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAda
     }
   } finally {
     optionalParams = {};
+    widgetInstanceId = "";
   }
 }; // 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$controlProps2, _persistedState$domai6, _persistedState$appSt;
 
   // By pass this function in case of popout chat
   if (state.appStates.skipChatButtonRendering === true) {
     return false;
   }
 
-  const persistedState = 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
+  const persistedState = 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$controlProps2 = props.controlProps) === null || _props$controlProps2 === void 0 ? void 0 : _props$controlProps2.widgetInstanceId) ?? ""); //Connect to only active chat session
 
   if (persistedState && !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.Active) {
     var _persistedState$domai7;
@@ -257,17 +234,28 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-const setCustomContextParams = (props, chatSDK) => {
-  var _chatSDK$omnichannelC3, _chatSDK$omnichannelC4, _props$chatConfig, _persistedState$domai8;
+const setCustomContextParams = chatSDK => {
+  var _chatSDK$omnichannelC3, _chatSDK$omnichannelC4, _persistedState$domai8;
 
   // Add custom context only for unauthenticated chat
-  const persistedState = 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 = 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 (!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 (!((_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && _props$chatConfig.LiveChatConfigAuthSettings) && !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;
+    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.logSDKEvent(LogLevel.WARN, {
+        Event: TelemetryEvent.StartChatMethodException,
+        ExceptionDetails: {
+          exception: errorMessage
+        }
+      });
+      throw new Error(errorMessage);
+    }
 
     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
+      customContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai10 = persistedState.domainStates) === null || _persistedState$domai10 === void 0 ? void 0 : _persistedState$domai10.customContext
     });
   }
 };