@microsoft/omnichannel-chat-widget 0.1.0-main.886e5cf → 0.1.0-main.8cded52

package/lib/cjs/common/Constants.js

@@ -169,6 +169,8 @@ _defineProperty(Constants, "ChatWidgetStateChangedPrefix", "ChatWidgetStateChang
 
 _defineProperty(Constants, "PostChatLoadingDurationInMs", 2000);
 
+_defineProperty(Constants, "BrowserUnloadConfirmationMessage", "Do you want to leave chat?");
+
 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);
 exports.Regex = Regex;
 

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

@@ -143,6 +143,8 @@ exports.TelemetryEvent = TelemetryEvent;
   TelemetryEvent["SuppressBotMagicCodeFailed"] = "SuppressBotMagicCodeFailed";
   TelemetryEvent["GetConversationDetailsException"] = "GetConversationDetailsException";
   TelemetryEvent["BrowserUnloadEventStarted"] = "BrowserUnloadEventStarted";
+  TelemetryEvent["GetAuthTokenCalled"] = "GetAuthTokenCalled";
+  TelemetryEvent["ReceivedNullOrEmptyToken"] = "ReceivedNullOrEmptyToken";
   TelemetryEvent["ProcessingHTMLTextMiddlewareFailed"] = "ProcessingHTMLTextMiddlewareFailed";
   TelemetryEvent["ProcessingSanitizationMiddlewareFailed"] = "ProcessingSanitizationMiddlewareFailed";
   TelemetryEvent["FormatTagsMiddlewareJSONStringifyFailed"] = "FormatTagsMiddlewareJSONStringifyFailed";

package/lib/cjs/common/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setTabIndices = exports.setFocusOnSendBox = exports.setFocusOnElement = exports.preventFocusToMoveOutOfElement = exports.parseAdaptiveCardPayload = exports.newGuid = exports.isUndefinedOrEmpty = exports.isNullOrUndefined = exports.isNullOrEmptyString = exports.getWidgetEndChatEventName = exports.getWidgetCacheId = exports.getTimestampHourMinute = exports.getStateFromCache = exports.getLocaleDirection = exports.getIconText = exports.getDomain = exports.findParentFocusableElementsWithoutChildContainer = exports.findAllFocusableElement = exports.extractPreChatSurveyResponseValues = exports.escapeHtml = exports.createTimer = exports.changeLanguageCodeFormatForWebChat = exports.addDelayInMs = void 0;
+exports.setTabIndices = exports.setFocusOnSendBox = exports.setFocusOnElement = exports.preventFocusToMoveOutOfElement = exports.parseAdaptiveCardPayload = exports.newGuid = exports.isUndefinedOrEmpty = exports.isNullOrUndefined = exports.isNullOrEmptyString = exports.getWidgetEndChatEventName = exports.getWidgetCacheId = exports.getTimestampHourMinute = exports.getStateFromCache = exports.getLocaleDirection = exports.getIconText = exports.getDomain = exports.getBroadcastChannelName = exports.findParentFocusableElementsWithoutChildContainer = exports.findAllFocusableElement = exports.extractPreChatSurveyResponseValues = exports.escapeHtml = exports.createTimer = exports.changeLanguageCodeFormatForWebChat = exports.addDelayInMs = void 0;
 
 var _Constants = require("./Constants");
 
@@ -13,6 +13,8 @@ var _KeyCodes = require("./KeyCodes");
 
 var _TelemetryConstants = require("./telemetry/TelemetryConstants");
 
+var _md5Typescript = require("md5-typescript");
+
 const getElementBySelector = selector => {
   let element;
 
@@ -354,26 +356,31 @@ const getDomain = hostValue => {
 
 exports.getDomain = getDomain;
 
-const getWidgetCacheId = (orgId, widgetId) => {
-  return `${_Constants.Constants.ChatWidgetStateChangedPrefix}_${orgId}_${widgetId}`;
+const getWidgetCacheId = (orgId, widgetId, widgetInstanceId) => {
+  const widgetCacheId = `${widgetInstanceId}_${orgId}_${widgetId}`;
+  return _md5Typescript.Md5.init(widgetCacheId);
 };
 
 exports.getWidgetCacheId = getWidgetCacheId;
 
-const getWidgetEndChatEventName = (orgId, widgetId) => {
+const getWidgetEndChatEventName = (orgId, widgetId, widgetInstanceId) => {
+  if (!isNullOrEmptyString(widgetInstanceId)) {
+    return `${_TelemetryConstants.BroadcastEvent.ChatEnded}_${widgetInstanceId}_${orgId}_${widgetId}`;
+  }
+
   return `${_TelemetryConstants.BroadcastEvent.ChatEnded}_${orgId}_${widgetId}`;
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
 exports.getWidgetEndChatEventName = getWidgetEndChatEventName;
 
-const getStateFromCache = (orgId, widgetId) => {
+const getStateFromCache = (orgId, widgetId, widgetInstanceId) => {
   // Getting updated state from cache
   try {
     if (_DataStoreManager.DataStoreManager.clientDataStore) {
       var _DataStoreManager$cli;
 
-      const widgetStateEventName = getWidgetCacheId(orgId, widgetId);
+      const widgetStateEventName = getWidgetCacheId(orgId, widgetId, widgetInstanceId);
       const widgetStateFromCache = (_DataStoreManager$cli = _DataStoreManager.DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(widgetStateEventName, "localStorage");
       const persistedState = widgetStateFromCache ? JSON.parse(widgetStateFromCache) : undefined;
       return persistedState;
@@ -408,4 +415,10 @@ const addDelayInMs = ms => {
   return new Promise(resolve => setTimeout(resolve, ms));
 };
 
-exports.addDelayInMs = addDelayInMs;
+exports.addDelayInMs = addDelayInMs;
+
+const getBroadcastChannelName = (widgetId, widgetInstanceId) => {
+  return widgetInstanceId && !isNullOrEmptyString(widgetInstanceId) ? `${widgetInstanceId}_${widgetId}` : widgetId;
+};
+
+exports.getBroadcastChannelName = getBroadcastChannelName;

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

@@ -72,7 +72,8 @@ 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/cjs/components/livechatwidget/common/ActivityStreamHandler.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ActivityStreamHandler = void 0;
+
+var _Deferred = require("./Deferred");
+
+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; }
+
+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.Deferred();
+    ActivityStreamHandler.restorePromise = ActivityStreamHandler.restoreDeferred.promise;
+  }
+  /**
+   * Resolve the promise, releasing it to continue with the execution of the activity.
+   * 
+   * */
+
+
+  static uncork() {
+    ActivityStreamHandler.restoreDeferred.resolve();
+  }
+
+}
+
+exports.ActivityStreamHandler = ActivityStreamHandler;
+
+_defineProperty(ActivityStreamHandler, "restoreDeferred", {
+  resolve: () => {
+    return "initialState";
+  }
+});
+
+_defineProperty(ActivityStreamHandler, "restorePromise", void 0);

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

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DefaultActivitySubscriber = void 0;
+
+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; }
+
+class DefaultActivitySubscriber {
+  constructor() {
+    _defineProperty(this, "observer", void 0);
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  async next(activity) {
+    this.observer.next(activity);
+    return false;
+  }
+
+}
+
+exports.DefaultActivitySubscriber = DefaultActivitySubscriber;

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

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PauseActivitySubscriber = void 0;
+
+var _ActivityStreamHandler = require("../ActivityStreamHandler");
+
+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; }
+
+class PauseActivitySubscriber {
+  constructor() {
+    _defineProperty(this, "observer", void 0);
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  async apply(activity) {
+    await _ActivityStreamHandler.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;
+  }
+
+}
+
+exports.PauseActivitySubscriber = PauseActivitySubscriber;

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

@@ -0,0 +1,70 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ChatAdapterShim = void 0;
+
+var _DefaultActivitySubscriber = require("./ActivitySubscriber/DefaultActivitySubscriber");
+
+var _shareObservable = require("./shareObservable");
+
+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; }
+
+class ChatAdapterShim {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  constructor(chatAdapter) {
+    _defineProperty(this, "chatAdapter", void 0);
+
+    _defineProperty(this, "activityObserver", void 0);
+
+    _defineProperty(this, "subscribers", void 0);
+
+    this.subscribers = [];
+    this.chatAdapter = { ...chatAdapter,
+      activity$: (0, _shareObservable.shareObservable)( // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      new window.Observable(observer => {
+        this.activityObserver = observer; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+        const abortController = new window.AbortController();
+
+        (async () => {
+          try {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            for await (let activity of chatAdapter.activities({
+              signal: abortController.signal
+            })) {
+              for (const subscriber of [...this.subscribers, new _DefaultActivitySubscriber.DefaultActivitySubscriber()]) {
+                subscriber.observer = this.activityObserver;
+                activity = await subscriber.next(activity);
+
+                if (!activity) {
+                  break;
+                }
+              }
+            }
+
+            observer.complete();
+          } catch (error) {
+            observer.error(error);
+          }
+        })();
+
+        return () => {
+          abortController.abort();
+        };
+      }))
+    };
+  } // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+  addSubscriber(subscriber) {
+    this.subscribers.push(subscriber);
+  }
+
+}
+
+exports.ChatAdapterShim = ChatAdapterShim;

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

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Deferred = void 0;
+
+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; }
+
+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;
+  }
+
+}
+
+exports.Deferred = Deferred;

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

@@ -13,6 +13,10 @@ var _NotificationScenarios = require("../../webchatcontainerstateful/webchatcont
 
 var _defaultMiddlewareLocalizedTexts = require("../../webchatcontainerstateful/common/defaultProps/defaultMiddlewareLocalizedTexts");
 
+var _ChatAdapterShim = require("./ChatAdapterShim");
+
+var _PauseActivitySubscriber = require("./ActivitySubscriber/PauseActivitySubscriber");
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const createAdapter = async chatSDK => {
   const chatAdapterOptionalParams = {
@@ -34,7 +38,15 @@ const createAdapter = async chatSDK => {
       }
     }
   };
-  return await chatSDK.createChatAdapter(chatAdapterOptionalParams);
+  let adapter = await chatSDK.createChatAdapter(chatAdapterOptionalParams); //so far, there is no need to convert to the shim adapter when using visual tests
+
+  if (chatSDK.isMockModeOn !== true) {
+    adapter = new _ChatAdapterShim.ChatAdapterShim(adapter);
+    adapter.addSubscriber(new _PauseActivitySubscriber.PauseActivitySubscriber());
+    return adapter.chatAdapter;
+  }
+
+  return adapter;
 };
 
 exports.createAdapter = createAdapter;

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

@@ -26,26 +26,40 @@ const createMarkdown = (disableMarkdownMessageFormatting, disableNewLineMarkdown
       breaks: !disableNewLineMarkdownSupport
     }); // ToDo: Commenting below usage of plugin until deferred bug is resolved: https://github.com/mayashavin/markdown-it-slack/issues/1
     // markdown.use(MarkdownSlack);
-    // Markdown override for open link in new tab
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any, quotes
+  } else {
+    markdown = new _markdownIt.default(_Constants.Constants.Zero, {
+      html: true,
+      linkify: true,
+      breaks: !disableNewLineMarkdownSupport
+    });
+    markdown.enable(["entity", // Rule to process html entity - {, ¯, "
+    "linkify", // Rule to replace link-like texts with link nodes
+    "html_block", // Rule to process html blocks and paragraphs
+    "html_inline", // Rule to process html tags
+    "newline" // Rule to proceess '\n'
+    ]);
+  } // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-    markdown.use(_markdownItForInline.default, "url_new_win", "link_open", function (tokens, idx, env) {
-      const targetAttrIndex = tokens[idx].attrIndex(_Constants.Constants.Target); // Put a transparent pixel instead of the "open in new window" icon, so developers can easily modify the icon in CSS.
 
-      const TRANSPARENT_GIF = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7";
+  markdown.use(_markdownItForInline.default, "url_new_win", "link_open", function (tokens, idx, env) {
+    const targetAttrIndex = tokens[idx].attrIndex(_Constants.Constants.Target); // Put a transparent pixel instead of the "open in new window" icon, so developers can easily modify the icon in CSS.
 
-      if (~targetAttrIndex) {
-        tokens[idx].attrs[targetAttrIndex][1] = _Constants.Constants.Blank;
-      } else {
-        tokens[idx].attrPush([_Constants.Constants.Target, _Constants.Constants.Blank]);
-      }
+    const TRANSPARENT_GIF = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7";
+
+    if (~targetAttrIndex) {
+      tokens[idx].attrs[targetAttrIndex][1] = _Constants.Constants.Blank;
+    } else {
+      tokens[idx].attrPush([_Constants.Constants.Target, _Constants.Constants.Blank]);
+    }
+
+    const relAttrIndex = tokens[idx].attrIndex(_Constants.Constants.TargetRelationship);
 
-      const relAttrIndex = tokens[idx].attrIndex(_Constants.Constants.TargetRelationship);
+    if (~relAttrIndex) {
+      tokens[idx].attrs[relAttrIndex][1] = _Constants.Constants.TargetRelationshipAttributes;
+    } else {
+      tokens[idx].attrPush([_Constants.Constants.TargetRelationship, _Constants.Constants.TargetRelationshipAttributes]);
 
-      if (~relAttrIndex) {
-        tokens[idx].attrs[relAttrIndex][1] = _Constants.Constants.TargetRelationshipAttributes;
-      } else {
-        tokens[idx].attrPush([_Constants.Constants.TargetRelationship, _Constants.Constants.TargetRelationshipAttributes]);
+      if (!disableMarkdownMessageFormatting) {
         tokens[idx].attrPush([_Constants.Constants.Title, _defaultMarkdownLocalizedTexts.defaultMarkdownLocalizedTexts.MARKDOWN_EXTERNAL_LINK_ALT]); // eslint-disable-next-line quotes
 
         const iconTokens = markdown.parseInline(`![${_defaultMarkdownLocalizedTexts.defaultMarkdownLocalizedTexts.MARKDOWN_EXTERNAL_LINK_ALT}](${TRANSPARENT_GIF})`, env)[0].children;
@@ -55,21 +69,8 @@ const createMarkdown = (disableMarkdownMessageFormatting, disableNewLineMarkdown
           tokens.splice(idx + 2, 0, ...iconTokens);
         }
       }
-    });
-  } else {
-    markdown = new _markdownIt.default(_Constants.Constants.Zero, {
-      html: true,
-      linkify: true,
-      breaks: !disableNewLineMarkdownSupport
-    });
-    markdown.enable(["entity", // Rule to process html entity - {, ¯, "
-    "linkify", // Rule to replace link-like texts with link nodes
-    "html_block", // Rule to process html blocks and paragraphs
-    "html_inline", // Rule to process html tags
-    "newline" // Rule to proceess '\n'
-    ]);
-  }
-
+    }
+  });
   return markdown;
 };
 

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

@@ -1704,10 +1704,7 @@ const dummyDefaultProps = {
       fwdUrl: ""
     }
   },
-  authProps: {
-    authClientFunction: undefined,
-    setAuthTokenProviderToChatSdk: undefined
-  },
-  telemetryConfig: undefined
+  telemetryConfig: undefined,
+  getAuthToken: undefined
 };
 exports.dummyDefaultProps = dummyDefaultProps;

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

@@ -48,7 +48,7 @@ const prepareEndChat = async (props, chatSDK, setAdapter, setWebChatStyles, disp
   if (isPostChatEnabled === "true" && ((_conversationDetails = conversationDetails) === null || _conversationDetails === void 0 ? void 0 : _conversationDetails.canRenderPostChat) === _Constants.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.PostChatSurveyMode.Embed) {
       dispatch({
@@ -151,9 +151,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 = (0, _utils.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 = (0, _utils.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) ?? "");
 
         _omnichannelChatComponents.BroadcastService.postMessage({
           eventName: endChatEventName

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

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

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

@@ -44,9 +44,17 @@ const getChatReconnectContext = async (chatSDK, reconnectId) => {
 exports.getChatReconnectContext = getChatReconnectContext;
 
 const getReconnectIdForAuthenticatedChat = async (props, chatSDK) => {
-  var _props$reconnectChatP, _props$authProps;
+  var _props$chatConfig, _props$reconnectChatP;
 
-  if ((_props$reconnectChatP = props.reconnectChatPaneProps) !== null && _props$reconnectChatP !== void 0 && _props$reconnectChatP.isReconnectEnabled && (_props$authProps = props.authProps) !== null && _props$authProps !== void 0 && _props$authProps.authClientFunction // TODO: Implement this after storage is in place
+  let authClientFunction = undefined;
+
+  if ((_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && _props$chatConfig.LiveChatConfigAuthSettings) {
+    var _props$chatConfig2, _props$chatConfig2$Li;
+
+    authClientFunction = ((_props$chatConfig2 = props.chatConfig) === null || _props$chatConfig2 === void 0 ? void 0 : (_props$chatConfig2$Li = _props$chatConfig2.LiveChatConfigAuthSettings) === null || _props$chatConfig2$Li === void 0 ? void 0 : _props$chatConfig2$Li.msdyn_javascriptclientfunction) ?? undefined;
+  }
+
+  if ((_props$reconnectChatP = props.reconnectChatPaneProps) !== null && _props$reconnectChatP !== void 0 && _props$reconnectChatP.isReconnectEnabled && authClientFunction // TODO: Implement this after storage is in place
 
   /* && !isLoadWithState() */
   ) {
@@ -63,31 +71,31 @@ const getReconnectIdForAuthenticatedChat = async (props, chatSDK) => {
 
 exports.getReconnectIdForAuthenticatedChat = getReconnectIdForAuthenticatedChat;
 
-const handleUnauthenticatedReconnectChat = async (chatSDK, authProps, dispatch, setAdapter, reconnectId, initStartChat, redirectInSameWindow) => {
+const handleUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat, redirectInSameWindow) => {
   const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, reconnectId);
 
   if (shouldRedirectOrStartNewChat(reconnectAvailabilityResponse)) {
-    await redirectOrStartNewChat(reconnectAvailabilityResponse, chatSDK, authProps, dispatch, setAdapter, initStartChat, redirectInSameWindow);
+    await redirectOrStartNewChat(reconnectAvailabilityResponse, chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, redirectInSameWindow);
   } else {
-    await setReconnectIdAndStartChat(chatSDK, authProps, dispatch, setAdapter, reconnectId, initStartChat);
+    await setReconnectIdAndStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat);
   }
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
 exports.handleUnauthenticatedReconnectChat = handleUnauthenticatedReconnectChat;
 
-const startUnauthenticatedReconnectChat = async (chatSDK, authProps, dispatch, setAdapter, reconnectId, initStartChat) => {
+const startUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat) => {
   const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, reconnectId);
 
   if (!shouldRedirectOrStartNewChat(reconnectAvailabilityResponse)) {
-    await setReconnectIdAndStartChat(chatSDK, authProps, dispatch, setAdapter, reconnectId, initStartChat);
+    await setReconnectIdAndStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat);
   }
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
 exports.startUnauthenticatedReconnectChat = startUnauthenticatedReconnectChat;
 
-const setReconnectIdAndStartChat = async (chatSDK, authProps, dispatch, setAdapter, reconnectId, initStartChat) => {
+const setReconnectIdAndStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat) => {
   const startUnauthenticatedReconnectChat = {
     eventName: _TelemetryConstants.BroadcastEvent.StartUnauthenticatedReconnectChat
   };
@@ -105,7 +113,7 @@ const setReconnectIdAndStartChat = async (chatSDK, authProps, dispatch, setAdapt
     type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
     payload: _ConversationState.ConversationState.Loading
   });
-  await initStartChat(chatSDK, authProps, dispatch, setAdapter, optionalParams);
+  await initStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, optionalParams);
 };
 
 const redirectPage = (redirectURL, redirectInSameWindow) => {
@@ -128,7 +136,7 @@ const shouldRedirectOrStartNewChat = reconnectAvailabilityResponse => {
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-const startNewChatEmptyRedirectionUrl = async (chatSDK, authProps, dispatch, setAdapter, initStartChat) => {
+const startNewChatEmptyRedirectionUrl = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat) => {
   const startUnauthenticatedReconnectChat = {
     eventName: _TelemetryConstants.BroadcastEvent.StartUnauthenticatedReconnectChat
   };
@@ -153,26 +161,26 @@ const startNewChatEmptyRedirectionUrl = async (chatSDK, authProps, dispatch, set
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: _ConversationState.ConversationState.Loading
     });
-    await initStartChat(chatSDK, authProps, dispatch, setAdapter);
+    await initStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter);
   }
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-const handleRedirectUnauthenticatedReconnectChat = async (chatSDK, authProps, dispatch, setAdapter, initStartChat, reconnectId, redirectInSameWindow) => {
+const handleRedirectUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, reconnectId, redirectInSameWindow) => {
   const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, reconnectId);
 
   if (shouldRedirectOrStartNewChat(reconnectAvailabilityResponse)) {
-    await redirectOrStartNewChat(reconnectAvailabilityResponse, chatSDK, authProps, dispatch, setAdapter, initStartChat, redirectInSameWindow);
+    await redirectOrStartNewChat(reconnectAvailabilityResponse, chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, redirectInSameWindow);
   }
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
 exports.handleRedirectUnauthenticatedReconnectChat = handleRedirectUnauthenticatedReconnectChat;
 
-const redirectOrStartNewChat = async (reconnectAvailabilityResponse, chatSDK, authProps, dispatch, setAdapter, initStartChat, redirectInSameWindow) => {
+const redirectOrStartNewChat = async (reconnectAvailabilityResponse, chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, redirectInSameWindow) => {
   if (reconnectAvailabilityResponse.redirectURL) {
     redirectPage(reconnectAvailabilityResponse.redirectURL, redirectInSameWindow);
   } else {
-    await startNewChatEmptyRedirectionUrl(chatSDK, authProps, dispatch, setAdapter, initStartChat);
+    await startNewChatEmptyRedirectionUrl(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat);
   }
 };

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

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shareObservable = shareObservable;
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function shareObservable(observable) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let observers = []; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+  let subscription; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+  return new window.Observable(observer => {
+    if (!subscription) {
+      subscription = observable.subscribe({
+        complete() {
+          observers.forEach(observer => observer.complete());
+        },
+
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        error(err) {
+          observers.forEach(observer => observer.error(err));
+        },
+
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        next(value) {
+          observers.forEach(observer => observer.next(value));
+        }
+
+      });
+    }
+
+    observers.push(observer);
+    return () => {
+      observers = observers.filter(o => o !== observer);
+
+      if (!observers.length) {
+        subscription.unsubscribe();
+        subscription = null;
+      }
+    };
+  });
+}