@microsoft/omnichannel-chat-widget 1.2.3-main.f8e3363 → 1.2.3

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

@@ -164,6 +164,7 @@ exports.TelemetryEvent = TelemetryEvent;
   TelemetryEvent["SetBotAuthProviderHideCard"] = "SetBotAuthProviderHideCard";
   TelemetryEvent["SetBotAuthProviderDisplayCard"] = "SetBotAuthProviderDisplayCard";
   TelemetryEvent["SetBotAuthProviderNotFound"] = "SetBotAuthProviderNotFound";
+  TelemetryEvent["BotAuthActivityUndefinedSignInId"] = "BotAuthActivityUndefinedSignInId";
   TelemetryEvent["ThirdPartyCookiesBlocked"] = "ThirdPartyCookiesBlocked";
   TelemetryEvent["ProcessingHTMLTextMiddlewareFailed"] = "ProcessingHTMLTextMiddlewareFailed";
   TelemetryEvent["ProcessingSanitizationMiddlewareFailed"] = "ProcessingSanitizationMiddlewareFailed";

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

@@ -83,7 +83,10 @@ class BotAuthActivitySubscriber {
     const signInUrl = attachment.content.buttons[0].value;
     const signInId = extractSignInId(signInUrl);
     if (!signInId) {
-      return;
+      _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.BotAuthActivityUndefinedSignInId
+      });
+      return activity;
     }
     if (this.signInCardSeen.has(signInId)) {
       // Prevents duplicate auth

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

@@ -13,10 +13,11 @@ var _Constants = require("../../../common/Constants");
 var _ConversationState = require("../../../contexts/common/ConversationState");
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
+// Return value: should start normal chat flow when reconnect is enabled
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const handleChatReconnect = async (chatSDK, props, dispatch, setAdapter, initStartChat, state) => {
   var _props$chatConfig, _props$chatConfig$Liv;
-  if (!isReconnectEnabled(props.chatConfig) || isPersistentEnabled(props.chatConfig)) return;
+  if (!isReconnectEnabled(props.chatConfig) || isPersistentEnabled(props.chatConfig)) return false;
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isAuthenticatedChat = (_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && (_props$chatConfig$Liv = _props$chatConfig.LiveChatConfigAuthSettings) !== null && _props$chatConfig$Liv !== void 0 && _props$chatConfig$Liv.msdyn_javascriptclientfunction ? true : false;
@@ -28,14 +29,14 @@ const handleChatReconnect = async (chatSDK, props, dispatch, setAdapter, initSta
   if (reconnectChatContext !== null && reconnectChatContext !== void 0 && reconnectChatContext.redirectURL) {
     var _props$reconnectChatP;
     redirectPage(reconnectChatContext.redirectURL, (_props$reconnectChatP = props.reconnectChatPaneProps) === null || _props$reconnectChatP === void 0 ? void 0 : _props$reconnectChatP.redirectInSameWindow);
-    return;
+    return false;
   }
   if (hasReconnectId(reconnectChatContext)) {
     var _props$reconnectChatP2, _props$reconnectChatP3;
     //if reconnect id is provided in props, don't show reconnect pane
     if ((_props$reconnectChatP2 = props.reconnectChatPaneProps) !== null && _props$reconnectChatP2 !== void 0 && _props$reconnectChatP2.reconnectId && !(0, _utils.isNullOrEmptyString)((_props$reconnectChatP3 = props.reconnectChatPaneProps) === null || _props$reconnectChatP3 === void 0 ? void 0 : _props$reconnectChatP3.reconnectId)) {
-      await setReconnectIdAndStartChat(isAuthenticatedChat, chatSDK, props, dispatch, setAdapter, reconnectChatContext.reconnectId ?? "", initStartChat);
-      return;
+      await setReconnectIdAndStartChat(isAuthenticatedChat, chatSDK, state, props, dispatch, setAdapter, reconnectChatContext.reconnectId ?? "", initStartChat);
+      return false;
     }
 
     //show reconnect pane
@@ -48,8 +49,12 @@ const handleChatReconnect = async (chatSDK, props, dispatch, setAdapter, initSta
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: _ConversationState.ConversationState.ReconnectChat
     });
-    return;
+    return false;
   }
+
+  // If we have reached this point, it means there is no valid reconnect id or redirectUrl
+  // This is a unauth reconnect refresh scenario - returns true so that we can start normal hydration process
+  return true;
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -88,7 +93,7 @@ const getChatReconnectContext = async (chatSDK, chatConfig, props, isAuthenticat
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.getChatReconnectContext = getChatReconnectContext;
-const setReconnectIdAndStartChat = async (isAuthenticatedChat, chatSDK, props, dispatch, setAdapter, reconnectId, initStartChat) => {
+const setReconnectIdAndStartChat = async (isAuthenticatedChat, chatSDK, state, props, dispatch, setAdapter, reconnectId, initStartChat) => {
   if (!isAuthenticatedChat) {
     const startUnauthenticatedReconnectChat = {
       eventName: _TelemetryConstants.BroadcastEvent.StartUnauthenticatedReconnectChat
@@ -106,7 +111,7 @@ const setReconnectIdAndStartChat = async (isAuthenticatedChat, chatSDK, props, d
     type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
     payload: _ConversationState.ConversationState.Loading
   });
-  await initStartChat(chatSDK, dispatch, setAdapter, props, optionalParams);
+  await initStartChat(chatSDK, dispatch, setAdapter, state, props, optionalParams);
 };
 const redirectPage = (redirectURL, redirectInSameWindow) => {
   const redirectPageRequest = {

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

@@ -303,16 +303,17 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const setCustomContextParams = async (state, props) => {
-  var _props$chatConfig, _props$chatConfig$Liv, _persistedState$domai8;
+  var _props$chatConfig, _props$chatConfig$Liv, _state$domainStates, _persistedState$domai8;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isAuthenticatedChat = props !== null && props !== void 0 && (_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && (_props$chatConfig$Liv = _props$chatConfig.LiveChatConfigAuthSettings) !== null && _props$chatConfig$Liv !== void 0 && _props$chatConfig$Liv.msdyn_javascriptclientfunction ? true : false;
   //Should not set custom context for auth chat
   if (isAuthenticatedChat) {
     return;
   }
-  if (state !== null && state !== void 0 && state.domainStates.customContext) {
+  if (state !== null && state !== void 0 && (_state$domainStates = state.domainStates) !== null && _state$domainStates !== void 0 && _state$domainStates.customContext) {
+    var _state$domainStates2;
     optionalParams = Object.assign({}, optionalParams, {
-      customContext: JSON.parse(JSON.stringify(state === null || state === void 0 ? void 0 : state.domainStates.customContext))
+      customContext: JSON.parse(JSON.stringify(state === null || state === void 0 ? void 0 : (_state$domainStates2 = state.domainStates) === null || _state$domainStates2 === void 0 ? void 0 : _state$domainStates2.customContext))
     });
     return;
   }
@@ -360,8 +361,8 @@ const canStartPopoutChat = async props => {
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const checkIfConversationStillValid = async (chatSDK, dispatch, state) => {
-  var _state$domainStates, _state$domainStates$l;
-  const requestIdFromCache = (_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : (_state$domainStates$l = _state$domainStates.liveChatContext) === null || _state$domainStates$l === void 0 ? void 0 : _state$domainStates$l.requestId;
+  var _state$domainStates3, _state$domainStates3$;
+  const requestIdFromCache = (_state$domainStates3 = state.domainStates) === null || _state$domainStates3 === void 0 ? void 0 : (_state$domainStates3$ = _state$domainStates3.liveChatContext) === null || _state$domainStates3$ === void 0 ? void 0 : _state$domainStates3$.requestId;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let conversationDetails = undefined;
 

package/lib/cjs/components/livechatwidget/livechatwidgetstateful/LiveChatWidgetStateful.js

@@ -116,6 +116,16 @@ const LiveChatWidgetStateful = props => {
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const startChat = async (props, localState) => {
+    const isReconnectTriggered = async () => {
+      if ((0, _reconnectChatHelper.isReconnectEnabled)(props.chatConfig) === true && !(0, _reconnectChatHelper.isPersistentEnabled)(props.chatConfig)) {
+        const noValidReconnectId = await (0, _reconnectChatHelper.handleChatReconnect)(chatSDK, props, dispatch, setAdapter, _startChat.initStartChat, state);
+        // If chat reconnect has kicked in chat state will become Active or Reconnect. So just exit, else go next
+        if (!noValidReconnectId && (state.appStates.conversationState === _ConversationState.ConversationState.Active || state.appStates.conversationState === _ConversationState.ConversationState.ReconnectChat)) {
+          return true;
+        }
+      }
+      return false;
+    };
     let isChatValid = false;
     //Start a chat from cache/reconnectid
     if (activeCachedChatExist === true) {
@@ -130,29 +140,20 @@ const LiveChatWidgetStateful = props => {
       //Check if conversation state is not in wrapup or closed state
       isChatValid = await (0, _startChat.checkIfConversationStillValid)(chatSDK, dispatch, state);
       if (isChatValid === true) {
-        //Check if reconnect enabled
-        if ((0, _reconnectChatHelper.isReconnectEnabled)(props.chatConfig) === true && !(0, _reconnectChatHelper.isPersistentEnabled)(props.chatConfig)) {
-          await (0, _reconnectChatHelper.handleChatReconnect)(chatSDK, props, dispatch, setAdapter, _startChat.initStartChat, state);
-          // If chat reconnect has kicked in chat state will become Active or Reconnect. So just exit, else go next
-          if (state.appStates.conversationState === _ConversationState.ConversationState.Active || state.appStates.conversationState === _ConversationState.ConversationState.ReconnectChat) {
-            return;
-          }
+        const reconnectTriggered = await isReconnectTriggered();
+        if (!reconnectTriggered) {
+          await (0, _startChat.initStartChat)(chatSDK, dispatch, setAdapter, state, props, optionalParams);
         }
-        await (0, _startChat.initStartChat)(chatSDK, dispatch, setAdapter, state, props, optionalParams);
         return;
       }
     }
     if (isChatValid === false) {
       if (localState) {
         // adding the reconnect logic for the case when customer tries to reconnect from a new browser or InPrivate browser
-        if ((0, _reconnectChatHelper.isReconnectEnabled)(props.chatConfig) === true && !(0, _reconnectChatHelper.isPersistentEnabled)(props.chatConfig)) {
-          await (0, _reconnectChatHelper.handleChatReconnect)(chatSDK, props, dispatch, setAdapter, _startChat.initStartChat, state);
-          // If chat reconnect has kicked in chat state will become Active or Reconnect. So just exit, else go next
-          if (state.appStates.conversationState === _ConversationState.ConversationState.Active || state.appStates.conversationState === _ConversationState.ConversationState.ReconnectChat) {
-            return;
-          }
+        const reconnectTriggered = await isReconnectTriggered();
+        if (!reconnectTriggered) {
+          await (0, _startChat.setPreChatAndInitiateChat)(chatSDK, dispatch, setAdapter, undefined, undefined, localState, props);
         }
-        await (0, _startChat.setPreChatAndInitiateChat)(chatSDK, dispatch, setAdapter, undefined, undefined, localState, props);
         return;
       } else {
         var _state$appStates4;

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

@@ -51,12 +51,15 @@ const handleSystemMessage = (next, args, card, systemMessageStyleProps) => {
     return () => false;
   }
 
-  // eslint-disable-next-line react/display-name, @typescript-eslint/no-explicit-any
+  // eslint-disable-next-line react/display-name
   return () => /*#__PURE__*/_react.default.createElement("div", {
     key: card.activity.id,
     style: systemMessageStyles,
-    "aria-hidden": "true"
-  }, card.activity.text);
+    "aria-hidden": "true",
+    dangerouslySetInnerHTML: {
+      __html: (0, _utils.escapeHtml)(card.activity.text)
+    }
+  });
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityMiddleware.spec.js

@@ -0,0 +1,190 @@
+"use strict";
+
+var _Constants = require("../../../../../common/Constants");
+var _DirectLineActivityType = require("../../enums/DirectLineActivityType");
+var _DirectLineSenderRole = require("../../enums/DirectLineSenderRole");
+var _MessageType = require("../../enums/MessageType");
+var _TelemetryHelper = require("../../../../../common/telemetry/TelemetryHelper");
+var _activityMiddleware = require("./activityMiddleware");
+describe("activityMiddleware test", () => {
+  it("createActivityMiddleware() with Channel role sender should returns nothing", () => {
+    spyOn(_TelemetryHelper.TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const args = {
+      activity: {
+        channelData: {
+          type: _MessageType.MessageTypes.Thread
+        },
+        from: {
+          role: _DirectLineSenderRole.DirectLineSenderRole.Channel
+        }
+      }
+    };
+    const results = (0, _activityMiddleware.createActivityMiddleware)()()(next)(args);
+    expect(results()).toEqual(false);
+    expect(_TelemetryHelper.TelemetryHelper.logActionEvent).toHaveBeenCalledTimes(1);
+  });
+  it("createActivityMiddleware() with Hidden tag should return nothing", () => {
+    spyOn(_TelemetryHelper.TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const args = {
+      activity: {
+        channelData: {
+          tags: [_Constants.Constants.hiddenTag]
+        },
+        from: {
+          role: _DirectLineSenderRole.DirectLineSenderRole.User
+        }
+      }
+    };
+    const results = (0, _activityMiddleware.createActivityMiddleware)()()(next)(args);
+    expect(results()).toEqual(false);
+    expect(_TelemetryHelper.TelemetryHelper.logActionEvent).toHaveBeenCalledTimes(0);
+  });
+  it("createActivityMiddleware() with System tag should return system message", () => {
+    var _results$props, _results$props$danger;
+    spyOn(_TelemetryHelper.TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const systemMessage = "system message";
+    const args = {
+      activity: {
+        text: systemMessage,
+        channelData: {
+          tags: [_Constants.Constants.systemMessageTag]
+        },
+        from: {
+          role: _DirectLineSenderRole.DirectLineSenderRole.User
+        }
+      }
+    };
+    const results = (0, _activityMiddleware.createActivityMiddleware)()()(next)(args);
+    expect(_TelemetryHelper.TelemetryHelper.logActionEvent).toHaveBeenCalledTimes(0);
+    expect((_results$props = results().props) === null || _results$props === void 0 ? void 0 : (_results$props$danger = _results$props.dangerouslySetInnerHTML) === null || _results$props$danger === void 0 ? void 0 : _results$props$danger.__html).toEqual(systemMessage);
+  });
+  it("createActivityMiddleware() should escape html texts to prevent XSS attacks", () => {
+    var _results$props2, _results$props2$dange;
+    spyOn(_TelemetryHelper.TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const systemMessage = "<img src='' onerror=\"alert('XSS attack')\"/>";
+    const args = {
+      activity: {
+        text: systemMessage,
+        channelData: {
+          tags: [_Constants.Constants.systemMessageTag]
+        },
+        from: {
+          role: _DirectLineSenderRole.DirectLineSenderRole.User
+        }
+      }
+    };
+    const results = (0, _activityMiddleware.createActivityMiddleware)()()(next)(args);
+    expect(_TelemetryHelper.TelemetryHelper.logActionEvent).toHaveBeenCalledTimes(0);
+    expect((_results$props2 = results().props) === null || _results$props2 === void 0 ? void 0 : (_results$props2$dange = _results$props2.dangerouslySetInnerHTML) === null || _results$props2$dange === void 0 ? void 0 : _results$props2$dange.__html).toEqual("&lt;img src=&#39;&#39; onerror=&quot;alert(&#39;XSS attack&#39;)&quot;&#x2F;&gt;");
+  });
+  it("createActivityMiddleware() with QueuePosition tag should log QueuePosition message", () => {
+    spyOn(_TelemetryHelper.TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const systemMessage = "system message";
+    const args = {
+      activity: {
+        text: systemMessage,
+        channelData: {
+          tags: [_Constants.Constants.systemMessageTag, _Constants.Constants.queuePositionMessageTag]
+        },
+        from: {
+          role: _DirectLineSenderRole.DirectLineSenderRole.User
+        }
+      }
+    };
+    (0, _activityMiddleware.createActivityMiddleware)()()(next)(args);
+    expect(_TelemetryHelper.TelemetryHelper.logActionEvent).toHaveBeenCalledTimes(1);
+  });
+  it("createActivityMiddleware() with same clientmessageid with next activity should return nothing", () => {
+    spyOn(_TelemetryHelper.TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const systemMessage = "system message";
+    const args = {
+      activity: {
+        text: systemMessage,
+        channelData: {
+          tags: [_Constants.Constants.systemMessageTag],
+          clientmessageid: "1234"
+        },
+        from: {
+          role: _DirectLineSenderRole.DirectLineSenderRole.User
+        }
+      },
+      nextVisibleActivity: {
+        channelData: {
+          clientmessageid: "1234"
+        }
+      }
+    };
+    const results = (0, _activityMiddleware.createActivityMiddleware)()()(next)(args);
+    expect(results()).toEqual(false);
+  });
+  it("createActivityMiddleware() with same messageid with next activity should return nothing", () => {
+    spyOn(_TelemetryHelper.TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const systemMessage = "system message";
+    const args = {
+      activity: {
+        text: systemMessage,
+        channelData: {
+          tags: [_Constants.Constants.systemMessageTag]
+        },
+        from: {
+          role: _DirectLineSenderRole.DirectLineSenderRole.User
+        },
+        messageid: "1234"
+      },
+      nextVisibleActivity: {
+        messageid: "1234"
+      }
+    };
+    const results = (0, _activityMiddleware.createActivityMiddleware)()()(next)(args);
+    expect(results()).toEqual(false);
+  });
+  it("createActivityMiddleware() should render normal user messages", () => {
+    var _results$props3, _results$props3$child, _results$props3$child2;
+    spyOn(_TelemetryHelper.TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const userMessage = "Hello World";
+    const args = {
+      activity: {
+        text: userMessage,
+        channelId: "webchat",
+        channelData: {
+          isHtmlEncoded: false
+        },
+        from: {
+          role: _DirectLineSenderRole.DirectLineSenderRole.User
+        },
+        type: _DirectLineActivityType.DirectLineActivityType.Message
+      }
+    };
+    const results = (0, _activityMiddleware.createActivityMiddleware)()()(next)(args);
+    expect((_results$props3 = results().props) === null || _results$props3 === void 0 ? void 0 : (_results$props3$child = _results$props3.children) === null || _results$props3$child === void 0 ? void 0 : (_results$props3$child2 = _results$props3$child.activity) === null || _results$props3$child2 === void 0 ? void 0 : _results$props3$child2.text).toEqual(userMessage);
+  });
+  it("createActivityMiddleware() should not render typing messages", () => {
+    var _results$activity;
+    spyOn(_TelemetryHelper.TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const userMessage = "Hello World";
+    const args = {
+      activity: {
+        text: userMessage,
+        channelId: "webchat",
+        channelData: {
+          isHtmlEncoded: false
+        },
+        from: {
+          role: _DirectLineSenderRole.DirectLineSenderRole.User
+        },
+        type: _DirectLineActivityType.DirectLineActivityType.Typing
+      }
+    };
+    const results = (0, _activityMiddleware.createActivityMiddleware)()()(next)(args);
+    expect((_results$activity = results().activity) === null || _results$activity === void 0 ? void 0 : _results$activity.text).toEqual(userMessage);
+  });
+});

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

@@ -158,6 +158,7 @@ export let TelemetryEvent;
   TelemetryEvent["SetBotAuthProviderHideCard"] = "SetBotAuthProviderHideCard";
   TelemetryEvent["SetBotAuthProviderDisplayCard"] = "SetBotAuthProviderDisplayCard";
   TelemetryEvent["SetBotAuthProviderNotFound"] = "SetBotAuthProviderNotFound";
+  TelemetryEvent["BotAuthActivityUndefinedSignInId"] = "BotAuthActivityUndefinedSignInId";
   TelemetryEvent["ThirdPartyCookiesBlocked"] = "ThirdPartyCookiesBlocked";
   TelemetryEvent["ProcessingHTMLTextMiddlewareFailed"] = "ProcessingHTMLTextMiddlewareFailed";
   TelemetryEvent["ProcessingSanitizationMiddlewareFailed"] = "ProcessingSanitizationMiddlewareFailed";

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

@@ -79,7 +79,10 @@ export class BotAuthActivitySubscriber {
     const signInUrl = attachment.content.buttons[0].value;
     const signInId = extractSignInId(signInUrl);
     if (!signInId) {
-      return;
+      TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.BotAuthActivityUndefinedSignInId
+      });
+      return activity;
     }
     if (this.signInCardSeen.has(signInId)) {
       // Prevents duplicate auth

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

@@ -8,10 +8,11 @@ import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 
+// Return value: should start normal chat flow when reconnect is enabled
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const handleChatReconnect = async (chatSDK, props, dispatch, setAdapter, initStartChat, state) => {
   var _props$chatConfig, _props$chatConfig$Liv;
-  if (!isReconnectEnabled(props.chatConfig) || isPersistentEnabled(props.chatConfig)) return;
+  if (!isReconnectEnabled(props.chatConfig) || isPersistentEnabled(props.chatConfig)) return false;
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isAuthenticatedChat = (_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && (_props$chatConfig$Liv = _props$chatConfig.LiveChatConfigAuthSettings) !== null && _props$chatConfig$Liv !== void 0 && _props$chatConfig$Liv.msdyn_javascriptclientfunction ? true : false;
@@ -23,14 +24,14 @@ const handleChatReconnect = async (chatSDK, props, dispatch, setAdapter, initSta
   if (reconnectChatContext !== null && reconnectChatContext !== void 0 && reconnectChatContext.redirectURL) {
     var _props$reconnectChatP;
     redirectPage(reconnectChatContext.redirectURL, (_props$reconnectChatP = props.reconnectChatPaneProps) === null || _props$reconnectChatP === void 0 ? void 0 : _props$reconnectChatP.redirectInSameWindow);
-    return;
+    return false;
   }
   if (hasReconnectId(reconnectChatContext)) {
     var _props$reconnectChatP2, _props$reconnectChatP3;
     //if reconnect id is provided in props, don't show reconnect pane
     if ((_props$reconnectChatP2 = props.reconnectChatPaneProps) !== null && _props$reconnectChatP2 !== void 0 && _props$reconnectChatP2.reconnectId && !isNullOrEmptyString((_props$reconnectChatP3 = props.reconnectChatPaneProps) === null || _props$reconnectChatP3 === void 0 ? void 0 : _props$reconnectChatP3.reconnectId)) {
-      await setReconnectIdAndStartChat(isAuthenticatedChat, chatSDK, props, dispatch, setAdapter, reconnectChatContext.reconnectId ?? "", initStartChat);
-      return;
+      await setReconnectIdAndStartChat(isAuthenticatedChat, chatSDK, state, props, dispatch, setAdapter, reconnectChatContext.reconnectId ?? "", initStartChat);
+      return false;
     }
 
     //show reconnect pane
@@ -43,8 +44,12 @@ const handleChatReconnect = async (chatSDK, props, dispatch, setAdapter, initSta
       type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: ConversationState.ReconnectChat
     });
-    return;
+    return false;
   }
+
+  // If we have reached this point, it means there is no valid reconnect id or redirectUrl
+  // This is a unauth reconnect refresh scenario - returns true so that we can start normal hydration process
+  return true;
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -81,7 +86,7 @@ const getChatReconnectContext = async (chatSDK, chatConfig, props, isAuthenticat
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const setReconnectIdAndStartChat = async (isAuthenticatedChat, chatSDK, props, dispatch, setAdapter, reconnectId, initStartChat) => {
+const setReconnectIdAndStartChat = async (isAuthenticatedChat, chatSDK, state, props, dispatch, setAdapter, reconnectId, initStartChat) => {
   if (!isAuthenticatedChat) {
     const startUnauthenticatedReconnectChat = {
       eventName: BroadcastEvent.StartUnauthenticatedReconnectChat
@@ -99,7 +104,7 @@ const setReconnectIdAndStartChat = async (isAuthenticatedChat, chatSDK, props, d
     type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
     payload: ConversationState.Loading
   });
-  await initStartChat(chatSDK, dispatch, setAdapter, props, optionalParams);
+  await initStartChat(chatSDK, dispatch, setAdapter, state, props, optionalParams);
 };
 const redirectPage = (redirectURL, redirectInSameWindow) => {
   const redirectPageRequest = {

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

@@ -295,16 +295,17 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const setCustomContextParams = async (state, props) => {
-  var _props$chatConfig, _props$chatConfig$Liv, _persistedState$domai8;
+  var _props$chatConfig, _props$chatConfig$Liv, _state$domainStates, _persistedState$domai8;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isAuthenticatedChat = props !== null && props !== void 0 && (_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && (_props$chatConfig$Liv = _props$chatConfig.LiveChatConfigAuthSettings) !== null && _props$chatConfig$Liv !== void 0 && _props$chatConfig$Liv.msdyn_javascriptclientfunction ? true : false;
   //Should not set custom context for auth chat
   if (isAuthenticatedChat) {
     return;
   }
-  if (state !== null && state !== void 0 && state.domainStates.customContext) {
+  if (state !== null && state !== void 0 && (_state$domainStates = state.domainStates) !== null && _state$domainStates !== void 0 && _state$domainStates.customContext) {
+    var _state$domainStates2;
     optionalParams = Object.assign({}, optionalParams, {
-      customContext: JSON.parse(JSON.stringify(state === null || state === void 0 ? void 0 : state.domainStates.customContext))
+      customContext: JSON.parse(JSON.stringify(state === null || state === void 0 ? void 0 : (_state$domainStates2 = state.domainStates) === null || _state$domainStates2 === void 0 ? void 0 : _state$domainStates2.customContext))
     });
     return;
   }
@@ -352,8 +353,8 @@ const canStartPopoutChat = async props => {
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const checkIfConversationStillValid = async (chatSDK, dispatch, state) => {
-  var _state$domainStates, _state$domainStates$l;
-  const requestIdFromCache = (_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : (_state$domainStates$l = _state$domainStates.liveChatContext) === null || _state$domainStates$l === void 0 ? void 0 : _state$domainStates$l.requestId;
+  var _state$domainStates3, _state$domainStates3$;
+  const requestIdFromCache = (_state$domainStates3 = state.domainStates) === null || _state$domainStates3 === void 0 ? void 0 : (_state$domainStates3$ = _state$domainStates3.liveChatContext) === null || _state$domainStates3$ === void 0 ? void 0 : _state$domainStates3$.requestId;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let conversationDetails = undefined;
 

package/lib/esm/components/livechatwidget/livechatwidgetstateful/LiveChatWidgetStateful.js

@@ -108,6 +108,16 @@ export const LiveChatWidgetStateful = props => {
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const startChat = async (props, localState) => {
+    const isReconnectTriggered = async () => {
+      if (isReconnectEnabled(props.chatConfig) === true && !isPersistentEnabled(props.chatConfig)) {
+        const noValidReconnectId = await handleChatReconnect(chatSDK, props, dispatch, setAdapter, initStartChat, state);
+        // If chat reconnect has kicked in chat state will become Active or Reconnect. So just exit, else go next
+        if (!noValidReconnectId && (state.appStates.conversationState === ConversationState.Active || state.appStates.conversationState === ConversationState.ReconnectChat)) {
+          return true;
+        }
+      }
+      return false;
+    };
     let isChatValid = false;
     //Start a chat from cache/reconnectid
     if (activeCachedChatExist === true) {
@@ -122,29 +132,20 @@ export const LiveChatWidgetStateful = props => {
       //Check if conversation state is not in wrapup or closed state
       isChatValid = await checkIfConversationStillValid(chatSDK, dispatch, state);
       if (isChatValid === true) {
-        //Check if reconnect enabled
-        if (isReconnectEnabled(props.chatConfig) === true && !isPersistentEnabled(props.chatConfig)) {
-          await handleChatReconnect(chatSDK, props, dispatch, setAdapter, initStartChat, state);
-          // If chat reconnect has kicked in chat state will become Active or Reconnect. So just exit, else go next
-          if (state.appStates.conversationState === ConversationState.Active || state.appStates.conversationState === ConversationState.ReconnectChat) {
-            return;
-          }
+        const reconnectTriggered = await isReconnectTriggered();
+        if (!reconnectTriggered) {
+          await initStartChat(chatSDK, dispatch, setAdapter, state, props, optionalParams);
         }
-        await initStartChat(chatSDK, dispatch, setAdapter, state, props, optionalParams);
         return;
       }
     }
     if (isChatValid === false) {
       if (localState) {
         // adding the reconnect logic for the case when customer tries to reconnect from a new browser or InPrivate browser
-        if (isReconnectEnabled(props.chatConfig) === true && !isPersistentEnabled(props.chatConfig)) {
-          await handleChatReconnect(chatSDK, props, dispatch, setAdapter, initStartChat, state);
-          // If chat reconnect has kicked in chat state will become Active or Reconnect. So just exit, else go next
-          if (state.appStates.conversationState === ConversationState.Active || state.appStates.conversationState === ConversationState.ReconnectChat) {
-            return;
-          }
+        const reconnectTriggered = await isReconnectTriggered();
+        if (!reconnectTriggered) {
+          await setPreChatAndInitiateChat(chatSDK, dispatch, setAdapter, undefined, undefined, localState, props);
         }
-        await setPreChatAndInitiateChat(chatSDK, dispatch, setAdapter, undefined, undefined, localState, props);
         return;
       } else {
         var _state$appStates4;

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityMiddleware.js

@@ -44,12 +44,15 @@ const handleSystemMessage = (next, args, card, systemMessageStyleProps) => {
     return () => false;
   }
 
-  // eslint-disable-next-line react/display-name, @typescript-eslint/no-explicit-any
+  // eslint-disable-next-line react/display-name
   return () => /*#__PURE__*/React.createElement("div", {
     key: card.activity.id,
     style: systemMessageStyles,
-    "aria-hidden": "true"
-  }, card.activity.text);
+    "aria-hidden": "true",
+    dangerouslySetInnerHTML: {
+      __html: escapeHtml(card.activity.text)
+    }
+  });
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityMiddleware.spec.js

@@ -0,0 +1,188 @@
+import { Constants } from "../../../../../common/Constants";
+import { DirectLineActivityType } from "../../enums/DirectLineActivityType";
+import { DirectLineSenderRole } from "../../enums/DirectLineSenderRole";
+import { MessageTypes } from "../../enums/MessageType";
+import { TelemetryHelper } from "../../../../../common/telemetry/TelemetryHelper";
+import { createActivityMiddleware } from "./activityMiddleware";
+describe("activityMiddleware test", () => {
+  it("createActivityMiddleware() with Channel role sender should returns nothing", () => {
+    spyOn(TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const args = {
+      activity: {
+        channelData: {
+          type: MessageTypes.Thread
+        },
+        from: {
+          role: DirectLineSenderRole.Channel
+        }
+      }
+    };
+    const results = createActivityMiddleware()()(next)(args);
+    expect(results()).toEqual(false);
+    expect(TelemetryHelper.logActionEvent).toHaveBeenCalledTimes(1);
+  });
+  it("createActivityMiddleware() with Hidden tag should return nothing", () => {
+    spyOn(TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const args = {
+      activity: {
+        channelData: {
+          tags: [Constants.hiddenTag]
+        },
+        from: {
+          role: DirectLineSenderRole.User
+        }
+      }
+    };
+    const results = createActivityMiddleware()()(next)(args);
+    expect(results()).toEqual(false);
+    expect(TelemetryHelper.logActionEvent).toHaveBeenCalledTimes(0);
+  });
+  it("createActivityMiddleware() with System tag should return system message", () => {
+    var _results$props, _results$props$danger;
+    spyOn(TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const systemMessage = "system message";
+    const args = {
+      activity: {
+        text: systemMessage,
+        channelData: {
+          tags: [Constants.systemMessageTag]
+        },
+        from: {
+          role: DirectLineSenderRole.User
+        }
+      }
+    };
+    const results = createActivityMiddleware()()(next)(args);
+    expect(TelemetryHelper.logActionEvent).toHaveBeenCalledTimes(0);
+    expect((_results$props = results().props) === null || _results$props === void 0 ? void 0 : (_results$props$danger = _results$props.dangerouslySetInnerHTML) === null || _results$props$danger === void 0 ? void 0 : _results$props$danger.__html).toEqual(systemMessage);
+  });
+  it("createActivityMiddleware() should escape html texts to prevent XSS attacks", () => {
+    var _results$props2, _results$props2$dange;
+    spyOn(TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const systemMessage = "<img src='' onerror=\"alert('XSS attack')\"/>";
+    const args = {
+      activity: {
+        text: systemMessage,
+        channelData: {
+          tags: [Constants.systemMessageTag]
+        },
+        from: {
+          role: DirectLineSenderRole.User
+        }
+      }
+    };
+    const results = createActivityMiddleware()()(next)(args);
+    expect(TelemetryHelper.logActionEvent).toHaveBeenCalledTimes(0);
+    expect((_results$props2 = results().props) === null || _results$props2 === void 0 ? void 0 : (_results$props2$dange = _results$props2.dangerouslySetInnerHTML) === null || _results$props2$dange === void 0 ? void 0 : _results$props2$dange.__html).toEqual("&lt;img src=&#39;&#39; onerror=&quot;alert(&#39;XSS attack&#39;)&quot;&#x2F;&gt;");
+  });
+  it("createActivityMiddleware() with QueuePosition tag should log QueuePosition message", () => {
+    spyOn(TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const systemMessage = "system message";
+    const args = {
+      activity: {
+        text: systemMessage,
+        channelData: {
+          tags: [Constants.systemMessageTag, Constants.queuePositionMessageTag]
+        },
+        from: {
+          role: DirectLineSenderRole.User
+        }
+      }
+    };
+    createActivityMiddleware()()(next)(args);
+    expect(TelemetryHelper.logActionEvent).toHaveBeenCalledTimes(1);
+  });
+  it("createActivityMiddleware() with same clientmessageid with next activity should return nothing", () => {
+    spyOn(TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const systemMessage = "system message";
+    const args = {
+      activity: {
+        text: systemMessage,
+        channelData: {
+          tags: [Constants.systemMessageTag],
+          clientmessageid: "1234"
+        },
+        from: {
+          role: DirectLineSenderRole.User
+        }
+      },
+      nextVisibleActivity: {
+        channelData: {
+          clientmessageid: "1234"
+        }
+      }
+    };
+    const results = createActivityMiddleware()()(next)(args);
+    expect(results()).toEqual(false);
+  });
+  it("createActivityMiddleware() with same messageid with next activity should return nothing", () => {
+    spyOn(TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const systemMessage = "system message";
+    const args = {
+      activity: {
+        text: systemMessage,
+        channelData: {
+          tags: [Constants.systemMessageTag]
+        },
+        from: {
+          role: DirectLineSenderRole.User
+        },
+        messageid: "1234"
+      },
+      nextVisibleActivity: {
+        messageid: "1234"
+      }
+    };
+    const results = createActivityMiddleware()()(next)(args);
+    expect(results()).toEqual(false);
+  });
+  it("createActivityMiddleware() should render normal user messages", () => {
+    var _results$props3, _results$props3$child, _results$props3$child2;
+    spyOn(TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const userMessage = "Hello World";
+    const args = {
+      activity: {
+        text: userMessage,
+        channelId: "webchat",
+        channelData: {
+          isHtmlEncoded: false
+        },
+        from: {
+          role: DirectLineSenderRole.User
+        },
+        type: DirectLineActivityType.Message
+      }
+    };
+    const results = createActivityMiddleware()()(next)(args);
+    expect((_results$props3 = results().props) === null || _results$props3 === void 0 ? void 0 : (_results$props3$child = _results$props3.children) === null || _results$props3$child === void 0 ? void 0 : (_results$props3$child2 = _results$props3$child.activity) === null || _results$props3$child2 === void 0 ? void 0 : _results$props3$child2.text).toEqual(userMessage);
+  });
+  it("createActivityMiddleware() should not render typing messages", () => {
+    var _results$activity;
+    spyOn(TelemetryHelper, "logActionEvent").and.callFake(() => false);
+    const next = args => () => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const userMessage = "Hello World";
+    const args = {
+      activity: {
+        text: userMessage,
+        channelId: "webchat",
+        channelData: {
+          isHtmlEncoded: false
+        },
+        from: {
+          role: DirectLineSenderRole.User
+        },
+        type: DirectLineActivityType.Typing
+      }
+    };
+    const results = createActivityMiddleware()()(next)(args);
+    expect((_results$activity = results().activity) === null || _results$activity === void 0 ? void 0 : _results$activity.text).toEqual(userMessage);
+  });
+});

package/lib/types/common/telemetry/TelemetryConstants.d.ts

@@ -151,6 +151,7 @@ export declare enum TelemetryEvent {
     SetBotAuthProviderHideCard = "SetBotAuthProviderHideCard",
     SetBotAuthProviderDisplayCard = "SetBotAuthProviderDisplayCard",
     SetBotAuthProviderNotFound = "SetBotAuthProviderNotFound",
+    BotAuthActivityUndefinedSignInId = "BotAuthActivityUndefinedSignInId",
     ThirdPartyCookiesBlocked = "ThirdPartyCookiesBlocked",
     ProcessingHTMLTextMiddlewareFailed = "ProcessingHTMLTextMiddlewareFailed",
     ProcessingSanitizationMiddlewareFailed = "ProcessingSanitizationMiddlewareFailed",

package/lib/types/components/livechatwidget/common/reconnectChatHelper.d.ts

@@ -3,7 +3,7 @@ import ChatConfig from "@microsoft/omnichannel-chat-sdk/lib/core/ChatConfig";
 import { Dispatch } from "react";
 import { ILiveChatWidgetAction } from "../../../contexts/common/ILiveChatWidgetAction";
 import { ILiveChatWidgetContext } from "../../../contexts/common/ILiveChatWidgetContext";
-declare const handleChatReconnect: (chatSDK: any, props: any, dispatch: Dispatch<ILiveChatWidgetAction>, setAdapter: any, initStartChat: any, state: ILiveChatWidgetContext) => Promise<void>;
+declare const handleChatReconnect: (chatSDK: any, props: any, dispatch: Dispatch<ILiveChatWidgetAction>, setAdapter: any, initStartChat: any, state: ILiveChatWidgetContext) => Promise<boolean>;
 declare const getChatReconnectContext: (chatSDK: any, chatConfig: ChatConfig, props: any, isAuthenticatedChat: boolean) => Promise<any>;
 declare const isReconnectEnabled: (chatConfig?: ChatConfig | undefined) => boolean;
 declare const isPersistentEnabled: (chatConfig?: ChatConfig | undefined) => boolean;

package/lib/types/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityMiddleware.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/omnichannel-chat-widget",
-  "version": "1.2.3-main.f8e3363",
+  "version": "1.2.3",
   "description": "Microsoft Omnichannel Chat Widget",
   "main": "lib/cjs/index.js",
   "types": "lib/types/index.d.ts",