@microsoft/omnichannel-chat-widget 1.7.4-main.9d63968 → 1.7.4-main.c391e9f

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

@@ -65,6 +65,7 @@ exports.BroadcastEvent = BroadcastEvent;
   BroadcastEvent["UpdateConversationDataForTelemetry"] = "UpdateConversationDataForTelemetry";
   BroadcastEvent["ContactIdNotFound"] = "ContactIdNotFound";
   BroadcastEvent["SyncMinimize"] = "SyncMinimize";
+  BroadcastEvent["OnWidgetError"] = "OnWidgetError";
 })(BroadcastEvent || (exports.BroadcastEvent = BroadcastEvent = {}));
 let TelemetryEvent;
 exports.TelemetryEvent = TelemetryEvent;

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

@@ -60,6 +60,13 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
     const postchatContext = (await (0, _renderSurveyHelpers.getPostChatContext)(chatSDK, state, dispatch)) ?? (state === null || state === void 0 ? void 0 : (_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : _state$domainStates.postChatContext);
     if (postchatContext === undefined) {
       var _state$appStates2;
+      _omnichannelChatComponents.BroadcastService.postMessage({
+        eventName: _TelemetryConstants.BroadcastEvent.OnWidgetError,
+        payload: {
+          errorMessage: "Widget did not display post chat survey as getPostChatContext returned undefined."
+        }
+      });
+
       // For Customer intiated conversations, just close chat widget
       if ((state === null || state === void 0 ? void 0 : (_state$appStates2 = state.appStates) === null || _state$appStates2 === void 0 ? void 0 : _state$appStates2.conversationEndedBy) === _Constants.ConversationEndEntity.Customer) {
         _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {

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

@@ -7,6 +7,7 @@ exports.initWebChatComposer = void 0;
 var _Constants = require("../../../common/Constants");
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
 var _utils = require("../../../common/utils");
+var _dompurify = _interopRequireDefault(require("dompurify"));
 var _HyperlinkTextOverrideRenderer = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/markdownrenderers/HyperlinkTextOverrideRenderer"));
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
@@ -22,8 +23,10 @@ var _conversationEndMiddleware = _interopRequireDefault(require("../../webchatco
 var _dataMaskingMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/dataMaskingMiddleware"));
 var _createMarkdown = require("./createMarkdown");
 var _maxMessageSizeValidator = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/maxMessageSizeValidator"));
+var _messageSequenceIdOverrideMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/messageSequenceIdOverrideMiddleware"));
 var _messageTimestampMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/messageTimestampMiddleware"));
 var _botframeworkWebchat = require("botframework-webchat");
+var _toastMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/toastMiddleware"));
 var _WebChatLogger = require("../../webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger");
 var _defaultAttachmentProps = require("../../webchatcontainerstateful/common/defaultProps/defaultAttachmentProps");
 var _defaultMiddlewareLocalizedTexts = require("../../webchatcontainerstateful/common/defaultProps/defaultMiddlewareLocalizedTexts");
@@ -34,9 +37,6 @@ var _htmlPlayerMiddleware = _interopRequireDefault(require("../../webchatcontain
 var _htmlTextMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/htmlTextMiddleware"));
 var _preProcessingMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/preProcessingMiddleware"));
 var _sanitizationMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/sanitizationMiddleware"));
-var _dompurify = _interopRequireDefault(require("dompurify"));
-var _messageSequenceIdOverrideMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/messageSequenceIdOverrideMiddleware"));
-var _toastMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/toastMiddleware"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const initWebChatComposer = (props, state, dispatch, chatSDK, endChat) => {
@@ -106,7 +106,11 @@ const initWebChatComposer = (props, state, dispatch, chatSDK, endChat) => {
     markdownRenderers.forEach(renderer => {
       text = renderer.render(text);
     });
-    text = _dompurify.default.sanitize(text);
+    const config = {
+      FORBID_TAGS: ["form", "button", "script", "div"],
+      FORBID_ATTR: ["action"]
+    };
+    text = _dompurify.default.sanitize(text, config);
     return text;
   };
   function postDomPurifyActivities() {

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

@@ -206,6 +206,12 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
           exception: `Failed to setup startChat: ${error}`
         }
       });
+      _omnichannelChatComponents.BroadcastService.postMessage({
+        eventName: _TelemetryConstants.BroadcastEvent.OnWidgetError,
+        payload: {
+          errorMessage: error
+        }
+      });
       isStartChatSuccessful = false;
       throw error;
     }

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

@@ -155,6 +155,12 @@ const LiveChatWidgetStateful = props => {
         }
         return;
       }
+      _omnichannelChatComponents.BroadcastService.postMessage({
+        eventName: _TelemetryConstants.BroadcastEvent.OnWidgetError,
+        payload: {
+          errorMessage: "Chat found in cache but invalid as the conversation status is inactive."
+        }
+      });
     }
     if (isChatValid === false) {
       if (localState) {
@@ -274,6 +280,12 @@ const LiveChatWidgetStateful = props => {
           type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
           payload: _ConversationState.ConversationState.OutOfOffice
         });
+        _omnichannelChatComponents.BroadcastService.postMessage({
+          eventName: _TelemetryConstants.BroadcastEvent.OnWidgetError,
+          payload: {
+            errorMessage: "Out-of-office hours status is shown."
+          }
+        });
         return;
       }
       _omnichannelChatComponents.BroadcastService.postMessage({
@@ -365,9 +377,16 @@ const LiveChatWidgetStateful = props => {
           type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_DISCONNECT_EVENT_RECEIVED,
           payload: true
         });
+        const desc = "Chat disconnected due to timeout, user went offline or blocked the device (including closing laptop)";
         _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
           Event: _TelemetryConstants.TelemetryEvent.ChatDisconnectThreadEventReceived,
-          Description: "Chat disconnected due to timeout, user went offline or blocked the device (including closing laptop)"
+          Description: desc
+        });
+        _omnichannelChatComponents.BroadcastService.postMessage({
+          eventName: _TelemetryConstants.BroadcastEvent.OnWidgetError,
+          payload: {
+            errorMessage: desc
+          }
         });
       }
     });

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

@@ -87,7 +87,8 @@ const createActivityMiddleware = (renderMarkdown, systemMessageStyleProps, userM
     }
     if (isTagIncluded(card, _Constants.Constants.systemMessageTag)) {
       return handleSystemMessage(next, args, card, renderMarkdown, systemMessageStyleProps);
-    } else if (card.activity.text && card.activity.type === _DirectLineActivityType.DirectLineActivityType.Message) {
+    }
+    if (card.activity.text && card.activity.type === _DirectLineActivityType.DirectLineActivityType.Message) {
       if (!card.activity.channelData.isHtmlEncoded && card.activity.channelId === _Constants.Constants.webchatChannelId) {
         card.activity.text = (0, _utils.escapeHtml)(card.activity.text);
         card.activity.channelData.isHtmlEncoded = true;

package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/notification/NotificationHandler.js

@@ -9,6 +9,8 @@ var _NotificationLevel = require("../enums/NotificationLevel");
 var _WebChatActionType = require("../enums/WebChatActionType");
 var _WebChatStoreLoader = require("../WebChatStoreLoader");
 var _utils = require("../../../../common/utils");
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
+var _TelemetryConstants = require("../../../../common/telemetry/TelemetryConstants");
 class NotificationHandler {
   static notify(id, level, message) {
     if (_WebChatStoreLoader.WebChatStoreLoader.store) {
@@ -34,6 +36,12 @@ class NotificationHandler {
     }
   }
   static notifyError(id, message) {
+    _omnichannelChatComponents.BroadcastService.postMessage({
+      eventName: _TelemetryConstants.BroadcastEvent.OnWidgetError,
+      payload: {
+        errorMessage: message
+      }
+    });
     this.notify(id, _NotificationLevel.NotificationLevel.Error, message);
   }
   static notifyWarning(id, message) {

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

@@ -60,6 +60,7 @@ export let BroadcastEvent;
   BroadcastEvent["UpdateConversationDataForTelemetry"] = "UpdateConversationDataForTelemetry";
   BroadcastEvent["ContactIdNotFound"] = "ContactIdNotFound";
   BroadcastEvent["SyncMinimize"] = "SyncMinimize";
+  BroadcastEvent["OnWidgetError"] = "OnWidgetError";
 })(BroadcastEvent || (BroadcastEvent = {}));
 export let TelemetryEvent;
 (function (TelemetryEvent) {

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

@@ -1,5 +1,5 @@
 import { ConfirmationState, Constants, ConversationEndEntity, ParticipantType, PrepareEndChatDescriptionConstants } from "../../../common/Constants";
-import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
+import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
 import { getConversationDetailsCall, getWidgetEndChatEventName } from "../../../common/utils";
 import { getPostChatContext, initiatePostChat } from "./renderSurveyHelpers";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
@@ -55,6 +55,13 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
     const postchatContext = (await getPostChatContext(chatSDK, state, dispatch)) ?? (state === null || state === void 0 ? void 0 : (_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : _state$domainStates.postChatContext);
     if (postchatContext === undefined) {
       var _state$appStates2;
+      BroadcastService.postMessage({
+        eventName: BroadcastEvent.OnWidgetError,
+        payload: {
+          errorMessage: "Widget did not display post chat survey as getPostChatContext returned undefined."
+        }
+      });
+
       // For Customer intiated conversations, just close chat widget
       if ((state === null || state === void 0 ? void 0 : (_state$appStates2 = state.appStates) === null || _state$appStates2 === void 0 ? void 0 : _state$appStates2.conversationEndedBy) === ConversationEndEntity.Customer) {
         TelemetryHelper.logSDKEvent(LogLevel.INFO, {

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

@@ -1,6 +1,7 @@
 import { ConversationEndEntity, ParticipantType } from "../../../common/Constants";
 import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
 import { changeLanguageCodeFormatForWebChat, getConversationDetailsCall } from "../../../common/utils";
+import DOMPurify from "dompurify";
 import HyperlinkTextOverrideRenderer from "../../webchatcontainerstateful/webchatcontroller/markdownrenderers/HyperlinkTextOverrideRenderer";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
@@ -16,8 +17,10 @@ import createConversationEndMiddleware from "../../webchatcontainerstateful/webc
 import createDataMaskingMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/dataMaskingMiddleware";
 import { createMarkdown } from "./createMarkdown";
 import createMaxMessageSizeValidator from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/maxMessageSizeValidator";
+import createMessageSequenceIdOverrideMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/messageSequenceIdOverrideMiddleware";
 import createMessageTimeStampMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/messageTimestampMiddleware";
 import { createStore } from "botframework-webchat";
+import createToastMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/toastMiddleware";
 import { createWebChatTelemetry } from "../../webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger";
 import { defaultAttachmentProps } from "../../webchatcontainerstateful/common/defaultProps/defaultAttachmentProps";
 import { defaultMiddlewareLocalizedTexts } from "../../webchatcontainerstateful/common/defaultProps/defaultMiddlewareLocalizedTexts";
@@ -28,9 +31,6 @@ import htmlPlayerMiddleware from "../../webchatcontainerstateful/webchatcontroll
 import htmlTextMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/htmlTextMiddleware";
 import preProcessingMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/preProcessingMiddleware";
 import sanitizationMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/sanitizationMiddleware";
-import DOMPurify from "dompurify";
-import createMessageSequenceIdOverrideMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/messageSequenceIdOverrideMiddleware";
-import createToastMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/toastMiddleware";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const initWebChatComposer = (props, state, dispatch, chatSDK, endChat) => {
@@ -100,7 +100,11 @@ export const initWebChatComposer = (props, state, dispatch, chatSDK, endChat) =>
     markdownRenderers.forEach(renderer => {
       text = renderer.render(text);
     });
-    text = DOMPurify.sanitize(text);
+    const config = {
+      FORBID_TAGS: ["form", "button", "script", "div"],
+      FORBID_ATTR: ["action"]
+    };
+    text = DOMPurify.sanitize(text, config);
     return text;
   };
   function postDomPurifyActivities() {

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

@@ -199,6 +199,12 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
           exception: `Failed to setup startChat: ${error}`
         }
       });
+      BroadcastService.postMessage({
+        eventName: BroadcastEvent.OnWidgetError,
+        payload: {
+          errorMessage: error
+        }
+      });
       isStartChatSuccessful = false;
       throw error;
     }

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

@@ -147,6 +147,12 @@ export const LiveChatWidgetStateful = props => {
         }
         return;
       }
+      BroadcastService.postMessage({
+        eventName: BroadcastEvent.OnWidgetError,
+        payload: {
+          errorMessage: "Chat found in cache but invalid as the conversation status is inactive."
+        }
+      });
     }
     if (isChatValid === false) {
       if (localState) {
@@ -266,6 +272,12 @@ export const LiveChatWidgetStateful = props => {
           type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
           payload: ConversationState.OutOfOffice
         });
+        BroadcastService.postMessage({
+          eventName: BroadcastEvent.OnWidgetError,
+          payload: {
+            errorMessage: "Out-of-office hours status is shown."
+          }
+        });
         return;
       }
       BroadcastService.postMessage({
@@ -357,9 +369,16 @@ export const LiveChatWidgetStateful = props => {
           type: LiveChatWidgetActionType.SET_CHAT_DISCONNECT_EVENT_RECEIVED,
           payload: true
         });
+        const desc = "Chat disconnected due to timeout, user went offline or blocked the device (including closing laptop)";
         TelemetryHelper.logActionEvent(LogLevel.INFO, {
           Event: TelemetryEvent.ChatDisconnectThreadEventReceived,
-          Description: "Chat disconnected due to timeout, user went offline or blocked the device (including closing laptop)"
+          Description: desc
+        });
+        BroadcastService.postMessage({
+          eventName: BroadcastEvent.OnWidgetError,
+          payload: {
+            errorMessage: desc
+          }
         });
       }
     });

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

@@ -80,7 +80,8 @@ export const createActivityMiddleware = (renderMarkdown, systemMessageStyleProps
     }
     if (isTagIncluded(card, Constants.systemMessageTag)) {
       return handleSystemMessage(next, args, card, renderMarkdown, systemMessageStyleProps);
-    } else if (card.activity.text && card.activity.type === DirectLineActivityType.Message) {
+    }
+    if (card.activity.text && card.activity.type === DirectLineActivityType.Message) {
       if (!card.activity.channelData.isHtmlEncoded && card.activity.channelId === Constants.webchatChannelId) {
         card.activity.text = escapeHtml(card.activity.text);
         card.activity.channelData.isHtmlEncoded = true;

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/notification/NotificationHandler.js

@@ -3,6 +3,8 @@ import { NotificationLevel } from "../enums/NotificationLevel";
 import { WebChatActionType } from "../enums/WebChatActionType";
 import { WebChatStoreLoader } from "../WebChatStoreLoader";
 import { setFocusOnSendBox } from "../../../../common/utils";
+import { BroadcastService } from "@microsoft/omnichannel-chat-components";
+import { BroadcastEvent } from "../../../../common/telemetry/TelemetryConstants";
 export class NotificationHandler {
   static notify(id, level, message) {
     if (WebChatStoreLoader.store) {
@@ -28,6 +30,12 @@ export class NotificationHandler {
     }
   }
   static notifyError(id, message) {
+    BroadcastService.postMessage({
+      eventName: BroadcastEvent.OnWidgetError,
+      payload: {
+        errorMessage: message
+      }
+    });
     this.notify(id, NotificationLevel.Error, message);
   }
   static notifyWarning(id, message) {

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

@@ -53,7 +53,8 @@ export declare enum BroadcastEvent {
     UpdateSessionDataForTelemetry = "UpdateSessionDataForTelemetry",
     UpdateConversationDataForTelemetry = "UpdateConversationDataForTelemetry",
     ContactIdNotFound = "ContactIdNotFound",
-    SyncMinimize = "SyncMinimize"
+    SyncMinimize = "SyncMinimize",
+    OnWidgetError = "OnWidgetError"
 }
 export declare enum TelemetryEvent {
     CallAdded = "CallAdded",

package/package.json

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