@microsoft/omnichannel-chat-widget 0.1.0-main.c461296 → 0.1.0-main.cde77ea

package/lib/esm/components/webchatcontainerstateful/WebChatContainerStateful.js

@@ -8,11 +8,45 @@ import { defaultMiddlewareLocalizedTexts } from "./common/defaultProps/defaultMi
 import { defaultWebChatContainerStatefulProps } from "./common/defaultProps/defaultWebChatContainerStatefulProps";
 import { setFocusOnSendBox } from "../../common/utils";
 import { useChatContextStore } from "../..";
+import { WebChatActionType } from "./webchatcontroller/enums/WebChatActionType";
+import { WebChatStoreLoader } from "./webchatcontroller/WebChatStoreLoader";
+import { Constants } from "../../common/Constants";
+import { BotMagicCodeStore } from "./webchatcontroller/BotMagicCodeStore";
+const broadcastChannelMessageEvent = "message";
+
+const postActivity = activity => {
+  // eslint-disable-line @typescript-eslint/no-explicit-any
+  return {
+    type: WebChatActionType.DIRECT_LINE_POST_ACTIVITY,
+    meta: {
+      method: "keyboard"
+    },
+    payload: {
+      activity: {
+        channelData: undefined,
+        text: "",
+        textFormat: "plain",
+        type: Constants.message,
+        ...activity
+      }
+    }
+  };
+};
+
+const createMagicCodeSuccessResponse = signin => {
+  return {
+    signin,
+    result: "Success"
+  };
+};
+
 export const WebChatContainerStateful = props => {
   const {
     BasicWebChat
   } = Components;
   const [state, dispatch] = useChatContextStore();
+  const magicCodeBroadcastChannel = new BroadcastChannel(Constants.magicCodeBroadcastChannel);
+  const magicCodeResponseBroadcastChannel = new BroadcastChannel(Constants.magicCodeResponseBroadcastChannel);
   const containerStyles = {
     root: Object.assign({}, defaultWebChatContainerStatefulProps.containerStyles, props === null || props === void 0 ? void 0 : props.containerStyles, {
       display: state.appStates.isMinimized ? "none" : ""
@@ -36,6 +70,44 @@ export const WebChatContainerStateful = props => {
       Event: TelemetryEvent.WebChatLoaded
     });
   }, []);
+  useEffect(() => {
+    const eventListener = event => {
+      // eslint-disable-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-empty-function
+      const {
+        data
+      } = event;
+
+      if (BotMagicCodeStore.botOAuthSignInId === data.signin) {
+        const {
+          signin,
+          code
+        } = data;
+        const text = `${code}`;
+        const action = postActivity({
+          text,
+          channelData: {
+            tags: [Constants.hiddenTag]
+          }
+        });
+        WebChatStoreLoader.store.dispatch(action);
+        const response = createMagicCodeSuccessResponse(signin);
+        magicCodeResponseBroadcastChannel.postMessage(response);
+        TelemetryHelper.logActionEvent(LogLevel.INFO, {
+          Event: TelemetryEvent.SuppressBotMagicCodeSucceeded
+        });
+        BotMagicCodeStore.botOAuthSignInId = "";
+        magicCodeBroadcastChannel.close();
+        magicCodeResponseBroadcastChannel.close();
+      } else {
+        TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+          Event: TelemetryEvent.SuppressBotMagicCodeFailed,
+          Description: "Signin does not match"
+        });
+      }
+    };
+
+    magicCodeBroadcastChannel.addEventListener(broadcastChannelMessageEvent, eventListener);
+  }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("style", null, `
         .ms_lcw_webchat_received_message img.webchat__markdown__external-link-icon { 
             background-image : url(data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIzIDMgMTggMTgiICB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxwYXRoIGQ9Ik03LjI1MDEgNC41MDAxN0gxMC43NDk1QzExLjE2MzcgNC41MDAxNyAxMS40OTk1IDQuODM1OTYgMTEuNDk5NSA1LjI1MDE3QzExLjQ5OTUgNS42Mjk4NiAxMS4yMTczIDUuOTQzNjYgMTAuODUxMyA1Ljk5MzMyTDEwLjc0OTUgNi4wMDAxN0g3LjI0OTc0QzYuMDcwNzkgNS45OTk2MSA1LjEwMzQ5IDYuOTA2NTYgNS4wMDc4NiA4LjA2MTEyTDUuMDAwMjggOC4yMjAwM0w1LjAwMzEyIDE2Ljc1MDdDNS4wMDM0MyAxNy45NDE1IDUuOTI4ODUgMTguOTE2MSA3LjA5OTY2IDE4Ljk5NDlMNy4yNTM3MSAxOS4wMDAxTDE1Ljc1MTggMTguOTg4NEMxNi45NDE1IDE4Ljk4NjggMTcuOTE0NSAxOC4wNjIgMTcuOTkzNSAxNi44OTIzTDE3Ljk5ODcgMTYuNzM4NFYxMy4yMzIxQzE3Ljk5ODcgMTIuODE3OSAxOC4zMzQ1IDEyLjQ4MjEgMTguNzQ4NyAxMi40ODIxQzE5LjEyODQgMTIuNDgyMSAxOS40NDIyIDEyLjc2NDMgMTkuNDkxOCAxMy4xMzAzTDE5LjQ5ODcgMTMuMjMyMVYxNi43Mzg0QzE5LjQ5ODcgMTguNzQwNyAxNy45MjkzIDIwLjM3NjkgMTUuOTUyOCAyMC40ODI5TDE1Ljc1MzggMjAuNDg4NEw3LjI1ODI3IDIwLjUwMDFMNy4wNTQ5NSAyMC40OTQ5QzUuMTQyMzkgMjAuMzk1NCAzLjYwODk1IDE4Ljg2MjcgMy41MDgzNyAxNi45NTAyTDMuNTAzMTIgMTYuNzUxMUwzLjUwMDg5IDguMjUyN0wzLjUwNTI5IDguMDUwMkMzLjYwNTM5IDYuMTM3NDkgNS4xMzg2NyA0LjYwNDQ5IDcuMDUwOTYgNC41MDUyN0w3LjI1MDEgNC41MDAxN0gxMC43NDk1SDcuMjUwMVpNMTMuNzQ4MSAzLjAwMTQ2TDIwLjMwMTggMy4wMDE5N0wyMC40MDE0IDMuMDE1NzVMMjAuNTAyMiAzLjA0MzkzTDIwLjU1OSAzLjA2ODAzQzIwLjYxMjIgMy4wOTEyMiAyMC42NjM0IDMuMTIxNjMgMjAuNzExMSAzLjE1ODg1TDIwLjc4MDQgMy4yMjE1NkwyMC44NjQxIDMuMzIwMTRMMjAuOTE4MyAzLjQxMDI1TDIwLjk1NyAzLjUwMDU3TDIwLjk3NjIgMy41NjQ3NkwyMC45ODk4IDMuNjI4NjJMMjAuOTk5MiAzLjcyMjgyTDIwLjk5OTcgMTAuMjU1NEMyMC45OTk3IDEwLjY2OTYgMjAuNjYzOSAxMS4wMDU0IDIwLjI0OTcgMTEuMDA1NEMxOS44NyAxMS4wMDU0IDE5LjU1NjIgMTAuNzIzMiAxOS41MDY1IDEwLjM1NzFMMTkuNDk5NyAxMC4yNTU0TDE5LjQ5ODkgNS41NjE0N0wxMi4yNzk3IDEyLjc4NDdDMTIuMDEzNCAxMy4wNTEgMTEuNTk2OCAxMy4wNzUzIDExLjMwMzEgMTIuODU3NUwxMS4yMTkgMTIuNzg0OUMxMC45NTI3IDEyLjUxODcgMTAuOTI4NCAxMi4xMDIxIDExLjE0NjIgMTEuODA4NEwxMS4yMTg4IDExLjcyNDNMMTguNDM2OSA0LjUwMTQ2SDEzLjc0ODFDMTMuMzY4NCA0LjUwMTQ2IDEzLjA1NDYgNC4yMTkzMSAxMy4wMDUgMy44NTMyNEwxMi45OTgxIDMuNzUxNDZDMTIuOTk4MSAzLjM3MTc3IDEzLjI4MDMgMy4wNTc5NyAxMy42NDY0IDMuMDA4MzFMMTMuNzQ4MSAzLjAwMTQ2WiIgZmlsbD0iI0ZGRkZGRiIgLz48L3N2Zz4) !important;

package/lib/esm/components/webchatcontainerstateful/common/mockchatsdk.js

@@ -4,6 +4,8 @@ import MockAdapter from "./mockadapter";
 export class MockChatSDK {
   constructor() {
     _defineProperty(this, "sleep", ms => new Promise(r => setTimeout(r, ms)));
+
+    _defineProperty(this, "isMockModeOn", true);
   }
 
   async startChat() {

package/lib/esm/components/webchatcontainerstateful/interfaces/IBotMagicCodeConfig.js

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

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/BotMagicCodeStore.js

@@ -0,0 +1,5 @@
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+export class BotMagicCodeStore {}
+
+_defineProperty(BotMagicCodeStore, "botOAuthSignInId", "");

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

@@ -54,6 +54,16 @@ const handleSystemMessage = (next, args, card, systemMessageStyleProps) => {
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
+const isTagIncluded = (card, tag) => {
+  return isDataTagsPresent(card) && card.activity.channelData.tags.includes(tag);
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+const isDataTagsPresent = card => {
+  return card && card.activity && card.activity.channelData && card.activity.channelData.tags && card.activity.channelData.tags.length > 0;
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
 export const createActivityMiddleware = (systemMessageStyleProps, userMessageStyleProps) => () => next => function () {
   for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
     args[_key] = arguments[_key];
@@ -62,7 +72,7 @@ export const createActivityMiddleware = (systemMessageStyleProps, userMessageSty
   const [card] = args;
 
   if (card.activity) {
-    var _card$activity$from, _card$activity$channe4, _card$activity$channe5;
+    var _card$activity$from;
 
     if (((_card$activity$from = card.activity.from) === null || _card$activity$from === void 0 ? void 0 : _card$activity$from.role) === DirectLineSenderRole.Channel) {
       var _card$activity$channe3;
@@ -77,7 +87,11 @@ export const createActivityMiddleware = (systemMessageStyleProps, userMessageSty
       return () => false;
     }
 
-    if ((_card$activity$channe4 = card.activity.channelData) !== null && _card$activity$channe4 !== void 0 && (_card$activity$channe5 = _card$activity$channe4.tags) !== null && _card$activity$channe5 !== void 0 && _card$activity$channe5.includes(Constants.systemMessageTag)) {
+    if (isTagIncluded(card, Constants.hiddenTag)) {
+      return () => false;
+    }
+
+    if (isTagIncluded(card, Constants.systemMessageTag)) {
       return handleSystemMessage(next, args, card, systemMessageStyleProps);
     } else if (card.activity.text && card.activity.type === DirectLineActivityType.Message) {
       if (!card.activity.channelData.isHtmlEncoded && card.activity.channelId === Constants.webchatChannelId) {

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

@@ -0,0 +1,41 @@
+import { BotMagicCodeStore } from "../../BotMagicCodeStore";
+var CardActionType;
+
+(function (CardActionType) {
+  CardActionType["OpenUrl"] = "openUrl";
+  CardActionType["SignIn"] = "signin";
+})(CardActionType || (CardActionType = {}));
+
+const validCardActionTypes = [CardActionType.OpenUrl, CardActionType.SignIn];
+const botOauthUrlRegex = /[\S]+.botframework.com\/api\/oauth\/signin\?signin=([\S]+)/;
+export const createCardActionMiddleware = botMagicCodeConfig => {
+  const cardActionMiddleware = () => next => function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    // eslint-disable-line @typescript-eslint/no-explicit-any
+    const [card] = args;
+
+    if (card.cardAction && validCardActionTypes.indexOf(card.cardAction.type) >= 0 && card.cardAction.value) {
+      // Override signin url only if fwdUrl is valid & feature is enabled
+      if ((botMagicCodeConfig === null || botMagicCodeConfig === void 0 ? void 0 : botMagicCodeConfig.disabled) === true && botMagicCodeConfig !== null && botMagicCodeConfig !== void 0 && botMagicCodeConfig.fwdUrl) {
+        const baseUrl = window.location.origin;
+        const result = botOauthUrlRegex.exec(card.cardAction.value);
+
+        if (result) {
+          BotMagicCodeStore.botOAuthSignInId = `${result[1]}`;
+        } // fwdUrl must be on the same domain as the chat widget
+
+
+        if (botMagicCodeConfig !== null && botMagicCodeConfig !== void 0 && botMagicCodeConfig.fwdUrl.startsWith(baseUrl)) {
+          card.cardAction.value += `&fwdUrl=${botMagicCodeConfig.fwdUrl}`;
+        }
+      }
+    }
+
+    return next(...args);
+  };
+
+  return cardActionMiddleware;
+};

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

@@ -0,0 +1,94 @@
+import "@testing-library/jest-dom/extend-expect";
+import { createCardActionMiddleware } from "./cardActionMiddleware";
+describe("cardActionMiddleware test", () => {
+  it("createCardActionMiddleware() with undefined botMagicCodeConfig should not change the sign in card url", () => {
+    const next = args => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+
+
+    const signInUrl = "https://token.botframework.com/api/oauth/signin?signin=[signin]";
+    const args = {
+      cardAction: {
+        type: "signin",
+        value: signInUrl
+      }
+    };
+    const results = createCardActionMiddleware(undefined)()(next)(args);
+    expect(signInUrl).toEqual(results.cardAction.value);
+  });
+  it("createCardActionMiddleware() with botMagicCode enabled should not change the sign in card url", () => {
+    const botMagicCodeConfig = {
+      disabled: false
+    };
+
+    const next = args => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+
+
+    const signInUrl = "https://token.botframework.com/api/oauth/signin?signin=[signin]";
+    const args = {
+      cardAction: {
+        type: "signin",
+        value: signInUrl
+      }
+    };
+    const results = createCardActionMiddleware(botMagicCodeConfig)()(next)(args);
+    expect(args.cardAction.value).toEqual(results.cardAction.value);
+  });
+  it("createCardActionMiddleware() with botMagicCode disabled & no fwdUrl should not change the sign in card url", () => {
+    const botMagicCodeConfig = {
+      disabled: true
+    };
+
+    const next = args => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+
+
+    const signInUrl = "https://token.botframework.com/api/oauth/signin?signin=[signin]";
+    const args = {
+      cardAction: {
+        type: "signin",
+        value: signInUrl
+      }
+    };
+    const results = createCardActionMiddleware(botMagicCodeConfig)()(next)(args);
+    expect(args.cardAction.value).toEqual(results.cardAction.value);
+  });
+  it("createCardActionMiddleware() with botMagicCode disabled & fwdUrl should append the fwdUrl in the sign in card url", () => {
+    const botMagicCodeConfig = {
+      disabled: true,
+      fwdUrl: "http://localhost/forwarder.html"
+    };
+
+    const next = args => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+
+
+    const signInUrl = "https://token.botframework.com/api/oauth/signin?signin=[signin]";
+    const args = {
+      cardAction: {
+        type: "signin",
+        value: signInUrl
+      }
+    };
+    const results = createCardActionMiddleware(botMagicCodeConfig)()(next)(args);
+    expect(signInUrl === results.cardAction.value).toBe(false);
+    expect(results.cardAction.value === `${signInUrl}&fwdUrl=${botMagicCodeConfig.fwdUrl}`).toBe(true);
+  });
+  it("createCardActionMiddleware() should not append fwdUrl if fwdUrl & sign in card url are not in the same domain", () => {
+    const botMagicCodeConfig = {
+      disabled: true,
+      fwdUrl: "https://localhost/forwarder.html"
+    };
+
+    const next = args => args; // eslint-disable-line @typescript-eslint/no-explicit-any
+
+
+    const signInUrl = "https://token.botframework.com/api/oauth/signin?signin=[signin]";
+    const args = {
+      cardAction: {
+        type: "signin",
+        value: signInUrl
+      }
+    };
+    const results = createCardActionMiddleware(botMagicCodeConfig)()(next)(args);
+    expect(signInUrl === results.cardAction.value).toBe(true);
+    expect(results.cardAction.value === `${signInUrl}&fwdUrl=${botMagicCodeConfig.fwdUrl}`).toBe(false);
+  });
+});

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

@@ -0,0 +1,107 @@
+import { WebChatActionType } from "../../enums/WebChatActionType";
+import { Constants } from "../../../../../common/Constants"; // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
+
+const createMessageTimeStampMiddleware = _ref => {
+  let {
+    dispatch
+  } = _ref;
+  return next => action => {
+    if (isApplicable(action)) {
+      return next(evaluateTagsAndOverrideTimeStamp(action));
+    }
+
+    return next(action);
+  };
+};
+
+const isApplicable = action => {
+  return action.type === WebChatActionType.DIRECT_LINE_INCOMING_ACTIVITY && isPVAConversation(action) && isPayloadValid(action) && isValidChannel(action);
+};
+
+const isPayloadValid = action => {
+  var _action$payload;
+
+  return action === null || action === void 0 ? void 0 : (_action$payload = action.payload) === null || _action$payload === void 0 ? void 0 : _action$payload.activity;
+};
+
+const isValidChannel = action => {
+  var _action$payload2, _action$payload2$acti;
+
+  return (action === null || action === void 0 ? void 0 : (_action$payload2 = action.payload) === null || _action$payload2 === void 0 ? void 0 : (_action$payload2$acti = _action$payload2.activity) === null || _action$payload2$acti === void 0 ? void 0 : _action$payload2$acti.channelId) === Constants.acsChannel;
+};
+
+const isPVAConversation = action => {
+  return !isTagIncluded(action, Constants.systemMessageTag) && !isTagIncluded(action, Constants.publicMessageTag) && !isRoleUserOn(action);
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+const isTagIncluded = (action, tag) => {
+  return isDataTagsPresent(action) && action.payload.activity.channelData.tags.includes(tag);
+};
+
+const isRoleUserOn = action => {
+  var _action$payload3, _action$payload3$acti, _action$payload3$acti2;
+
+  return (action === null || action === void 0 ? void 0 : (_action$payload3 = action.payload) === null || _action$payload3 === void 0 ? void 0 : (_action$payload3$acti = _action$payload3.activity) === null || _action$payload3$acti === void 0 ? void 0 : (_action$payload3$acti2 = _action$payload3$acti.from) === null || _action$payload3$acti2 === void 0 ? void 0 : _action$payload3$acti2.role) === Constants.userMessageTag;
+};
+
+const overrideTimeStamp = (timestampOriginal, timeStampNew) => {
+  return isTimestampValid(timeStampNew) ? timeStampNew : timestampOriginal;
+};
+
+const isTimestampValid = timeStamp => {
+  const regex = /(\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])(T)(\d{2})(:{1})(\d{2})(:{1})(\d{2})(.\d+)([Z]{1}))/;
+  return regex.test(timeStamp);
+};
+
+const isDataTagsPresent = action => {
+  var _action$payload4, _action$payload4$acti, _action$payload4$acti2;
+
+  return (action === null || action === void 0 ? void 0 : (_action$payload4 = action.payload) === null || _action$payload4 === void 0 ? void 0 : (_action$payload4$acti = _action$payload4.activity) === null || _action$payload4$acti === void 0 ? void 0 : (_action$payload4$acti2 = _action$payload4$acti.channelData) === null || _action$payload4$acti2 === void 0 ? void 0 : _action$payload4$acti2.tags) && action.payload.activity.channelData.tags.length > 0;
+};
+
+const evaluateTagsAndOverrideTimeStamp = action => {
+  const tagValue = tagLookup(action, Constants.prefixTimestampTag);
+
+  if (tagValue) {
+    const newTimestamp = extractTimeStamp(tagValue);
+    action.payload.activity.timestamp = overrideTimeStamp(action.payload.activity.timestamp, newTimestamp);
+  }
+
+  return action;
+};
+
+const extractTimeStamp = timeStamp => {
+  if (timeStamp && timeStamp.length > 0) {
+    const ts = timeStamp.split(Constants.prefixTimestampTag);
+
+    if (ts && ts.length > 1) {
+      return ts[1];
+    }
+  }
+
+  return timeStamp;
+};
+
+const tagLookup = (action, tag) => {
+  if (!isDataTagsPresent(action)) {
+    return null;
+  }
+
+  const tags = action.payload.activity.channelData.tags;
+  let value;
+
+  if (tags && tags.length > 0) {
+    for (let i = 0; i < tags.length; i++) {
+      value = tags[i];
+
+      if (value && value.indexOf(tag) > -1) {
+        return value;
+      }
+    }
+  }
+
+  return null;
+};
+
+export default createMessageTimeStampMiddleware;

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger.js

@@ -0,0 +1,32 @@
+import { LogLevel } from "../../../../common/telemetry/TelemetryConstants";
+import { TelemetryHelper } from "../../../../common/telemetry/TelemetryHelper";
+export function createWebChatTelemetry() {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const handleTelemetry = event => {
+    const {
+      level
+    } = event;
+    const loglevel = level ? level.toUpperCase() : "";
+
+    switch (loglevel) {
+      case LogLevel.DEBUG:
+        TelemetryHelper.logWebChatEvent(LogLevel.DEBUG, event);
+        break;
+
+      case LogLevel.WARN:
+        TelemetryHelper.logWebChatEvent(LogLevel.WARN, event);
+        break;
+
+      case LogLevel.ERROR:
+        TelemetryHelper.logWebChatEvent(LogLevel.ERROR, event);
+        break;
+
+      case LogLevel.INFO:
+      default:
+        TelemetryHelper.logWebChatEvent(LogLevel.INFO, event);
+        break;
+    }
+  };
+
+  return handleTelemetry;
+}

package/lib/esm/contexts/common/ConversationState.js

@@ -8,6 +8,7 @@ export let ConversationState;
   ConversationState[ConversationState["ProactiveChat"] = 4] = "ProactiveChat";
   ConversationState[ConversationState["Active"] = 5] = "Active";
   ConversationState[ConversationState["InActive"] = 6] = "InActive";
-  ConversationState[ConversationState["Postchat"] = 7] = "Postchat";
-  ConversationState[ConversationState["Closed"] = 8] = "Closed";
+  ConversationState[ConversationState["PostchatLoading"] = 7] = "PostchatLoading";
+  ConversationState[ConversationState["Postchat"] = 8] = "Postchat";
+  ConversationState[ConversationState["Closed"] = 9] = "Closed";
 })(ConversationState || (ConversationState = {}));

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

@@ -10,13 +10,13 @@ export let LiveChatWidgetActionType;
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_PREVIOUS_FOCUSED_ELEMENT"] = 6] = "SET_PREVIOUS_FOCUSED_ELEMENT";
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_OUTSIDE_OPERATING_HOURS"] = 7] = "SET_OUTSIDE_OPERATING_HOURS";
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_PRE_CHAT_SURVEY_RESPONSE"] = 8] = "SET_PRE_CHAT_SURVEY_RESPONSE";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_SHOW_CONFIRMATION"] = 9] = "SET_SHOW_CONFIRMATION";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_SHOW_EMAIL_TRANSCRIPT_PANE"] = 10] = "SET_SHOW_EMAIL_TRANSCRIPT_PANE";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_PRECHAT_RESPONSE_EMAIL"] = 11] = "SET_PRECHAT_RESPONSE_EMAIL";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_AUDIO_NOTIFICATION"] = 12] = "SET_AUDIO_NOTIFICATION";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_E2VV_ENABLED"] = 13] = "SET_E2VV_ENABLED";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_POST_CHAT_CONTEXT"] = 14] = "SET_POST_CHAT_CONTEXT";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_SHOULD_SHOW_POST_CHAT"] = 15] = "SET_SHOULD_SHOW_POST_CHAT";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_CUSTOM_CONTEXT"] = 9] = "SET_CUSTOM_CONTEXT";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_SHOW_CONFIRMATION"] = 10] = "SET_SHOW_CONFIRMATION";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_SHOW_EMAIL_TRANSCRIPT_PANE"] = 11] = "SET_SHOW_EMAIL_TRANSCRIPT_PANE";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_PRECHAT_RESPONSE_EMAIL"] = 12] = "SET_PRECHAT_RESPONSE_EMAIL";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_AUDIO_NOTIFICATION"] = 13] = "SET_AUDIO_NOTIFICATION";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_E2VV_ENABLED"] = 14] = "SET_E2VV_ENABLED";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_POST_CHAT_CONTEXT"] = 15] = "SET_POST_CHAT_CONTEXT";
   LiveChatWidgetActionType[LiveChatWidgetActionType["SHOW_CALLING_CONTAINER"] = 16] = "SHOW_CALLING_CONTAINER";
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_INCOMING_CALL"] = 17] = "SET_INCOMING_CALL";
   LiveChatWidgetActionType[LiveChatWidgetActionType["DISABLE_VIDEO_CALL"] = 18] = "DISABLE_VIDEO_CALL";
@@ -32,4 +32,6 @@ export let LiveChatWidgetActionType;
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_CONVERSATION_ENDED_BY_AGENT"] = 28] = "SET_CONVERSATION_ENDED_BY_AGENT";
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_WIDGET_STATE"] = 29] = "SET_WIDGET_STATE";
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_LIVE_CHAT_CONTEXT"] = 30] = "SET_LIVE_CHAT_CONTEXT";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_BOT_OAUTH_SIGNIN_ID"] = 31] = "SET_BOT_OAUTH_SIGNIN_ID";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_WIDGET_SIZE"] = 32] = "SET_WIDGET_SIZE";
 })(LiveChatWidgetActionType || (LiveChatWidgetActionType = {}));

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

@@ -18,14 +18,15 @@ export const getLiveChatWidgetContextInitialState = props => {
       postChatContext: undefined,
       telemetryInternalData: {},
       globalDir: "ltr",
-      liveChatContext: undefined
+      liveChatContext: undefined,
+      customContext: undefined,
+      widgetSize: undefined
     },
     appStates: {
       conversationState: ConversationState.Closed,
       isMinimized: false,
       previousElementOnFocusBeforeModalOpen: null,
       outsideOperatingHours: false,
-      shouldShowPostChat: false,
       preChatResponseEmail: "",
       isAudioMuted: null,
       newMessage: false,

package/lib/esm/contexts/createReducer.js

@@ -1,6 +1,5 @@
 /* eslint-disable indent */
 import { LiveChatWidgetActionType } from "./common/LiveChatWidgetActionType";
-import { TelemetryManager } from "../common/telemetry/TelemetryManager";
 export const createReducer = () => {
   const reducer = (state, action) => {
     var _action$payload, _action$payload2, _action$payload3;
@@ -62,6 +61,14 @@ export const createReducer = () => {
           }
         };
 
+      case LiveChatWidgetActionType.SET_CUSTOM_CONTEXT:
+        return { ...state,
+          domainStates: { ...state.domainStates,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            customContext: action.payload
+          }
+        };
+
       case LiveChatWidgetActionType.SET_PREVIOUS_FOCUSED_ELEMENT:
         return { ...state,
           appStates: { ...state.appStates,
@@ -84,13 +91,6 @@ export const createReducer = () => {
           }
         };
 
-      case LiveChatWidgetActionType.SET_SHOULD_SHOW_POST_CHAT:
-        return { ...state,
-          appStates: { ...state.appStates,
-            shouldShowPostChat: action.payload
-          }
-        };
-
       case LiveChatWidgetActionType.SHOW_CALLING_CONTAINER:
         return { ...state,
           uiStates: { ...state.uiStates,
@@ -188,7 +188,6 @@ export const createReducer = () => {
         };
 
       case LiveChatWidgetActionType.SET_TELEMETRY_DATA:
-        TelemetryManager.InternalTelemetryData = action.payload;
         return { ...state,
           domainStates: { ...state.domainStates,
             telemetryInternalData: action.payload
@@ -228,6 +227,14 @@ export const createReducer = () => {
           }
         };
 
+      case LiveChatWidgetActionType.SET_WIDGET_SIZE:
+        return { ...state,
+          domainStates: { ...state.domainStates,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            widgetSize: action.payload
+          }
+        };
+
       default:
         return state;
     }

package/lib/esm/controller/componentController.js

@@ -1,6 +1,6 @@
 import { ConversationState } from "../contexts/common/ConversationState";
 export const shouldShowChatButton = state => {
-  return state.appStates.isMinimized || state.appStates.conversationState === ConversationState.Closed;
+  return (state.appStates.isMinimized || state.appStates.conversationState === ConversationState.Closed) && state.appStates.skipChatButtonRendering == false; // Do not show chat button in case of popout
 };
 export const shouldShowProactiveChatPane = state => {
   return !state.appStates.isMinimized && state.appStates.conversationState === ConversationState.ProactiveChat;
@@ -18,13 +18,13 @@ export const shouldShowWebChatContainer = state => {
   return state.appStates.conversationState === ConversationState.Active || state.appStates.conversationState === ConversationState.InActive;
 };
 export const shouldShowLoadingPane = state => {
-  return !state.appStates.isMinimized && !state.appStates.shouldShowPostChat && state.appStates.conversationState === ConversationState.Loading;
+  return !state.appStates.isMinimized && state.appStates.conversationState === ConversationState.Loading;
 };
 export const shouldShowReconnectChatPane = state => {
   return !state.appStates.isMinimized && state.appStates.conversationState === ConversationState.ReconnectChat;
 };
 export const shouldShowPostChatLoadingPane = state => {
-  return !state.appStates.isMinimized && state.appStates.shouldShowPostChat && state.appStates.conversationState === ConversationState.Loading;
+  return !state.appStates.isMinimized && state.appStates.conversationState === ConversationState.PostchatLoading;
 };
 export const shouldShowOutOfOfficeHoursPane = state => {
   return !state.appStates.isMinimized && state.appStates.conversationState === ConversationState.OutOfOffice;

package/lib/esm/plugins/newMessageEventHandler.js

@@ -2,7 +2,6 @@ import { BroadcastEvent, LogLevel, TelemetryEvent } from "../common/telemetry/Te
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { Constants } from "../common/Constants";
 import { TelemetryHelper } from "../common/telemetry/TelemetryHelper";
-import { TelemetryManager } from "../common/telemetry/TelemetryManager";
 export const createOnNewAdapterActivityHandler = (chatId, userId) => {
   const onNewAdapterActivityHandler = activity => {
     var _activity$channelData, _activity$channelData2, _activity$channelData3;
@@ -17,18 +16,16 @@ export const createOnNewAdapterActivityHandler = (chatId, userId) => {
 
   const raiseMessageEvent = activity => {
     if ((activity === null || activity === void 0 ? void 0 : activity.type) === Constants.message) {
-      var _TelemetryManager$Int, _activity$from;
+      var _text, _text2, _activity$channelData4, _activity$from;
 
       const payload = {
+        // To identify hidden contents vs empty content
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        text: activity === null || activity === void 0 ? void 0 : activity.text,
-        id: activity === null || activity === void 0 ? void 0 : activity.id,
+        text: (activity === null || activity === void 0 ? void 0 : (_text = activity.text) === null || _text === void 0 ? void 0 : _text.length) >= 1 ? `*contents hidden (${activity === null || activity === void 0 ? void 0 : (_text2 = activity.text) === null || _text2 === void 0 ? void 0 : _text2.length} chars)*` : "",
         type: activity === null || activity === void 0 ? void 0 : activity.type,
         timestamp: activity === null || activity === void 0 ? void 0 : activity.timestamp,
-        chatId: chatId,
         userId: userId,
-        conversationId: ((_TelemetryManager$Int = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int === void 0 ? void 0 : _TelemetryManager$Int.conversationId) ?? "",
-        channelData: activity === null || activity === void 0 ? void 0 : activity.channelData,
+        tags: activity === null || activity === void 0 ? void 0 : (_activity$channelData4 = activity.channelData) === null || _activity$channelData4 === void 0 ? void 0 : _activity$channelData4.tags,
         messageType: ""
       };
 
@@ -45,18 +42,18 @@ export const createOnNewAdapterActivityHandler = (chatId, userId) => {
           Description: "New message sent"
         });
       } else {
-        var _activity$channelData4, _activity$channelData5;
+        var _activity$channelData5, _activity$channelData6;
 
-        if (activity !== null && activity !== void 0 && (_activity$channelData4 = activity.channelData) !== null && _activity$channelData4 !== void 0 && (_activity$channelData5 = _activity$channelData4.tags) !== null && _activity$channelData5 !== void 0 && _activity$channelData5.includes(Constants.systemMessageTag)) {
+        if (activity !== null && activity !== void 0 && (_activity$channelData5 = activity.channelData) !== null && _activity$channelData5 !== void 0 && (_activity$channelData6 = _activity$channelData5.tags) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.includes(Constants.systemMessageTag)) {
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           payload.messageType = Constants.systemMessageTag;
         } else {
-          var _activity$channelData6, _activity$channelData7, _activity$channelData8;
+          var _activity$channelData7, _activity$channelData8, _activity$channelData9;
 
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           const messageHasNoText = !(activity !== null && activity !== void 0 && activity.text); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-          const messageHasNoTags = !(activity !== null && activity !== void 0 && activity.channelData) || !(activity !== null && activity !== void 0 && (_activity$channelData6 = activity.channelData) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.tags) || (activity === null || activity === void 0 ? void 0 : (_activity$channelData7 = activity.channelData) === null || _activity$channelData7 === void 0 ? void 0 : (_activity$channelData8 = _activity$channelData7.tags) === null || _activity$channelData8 === void 0 ? void 0 : _activity$channelData8.length) === 0; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          const messageHasNoTags = !(activity !== null && activity !== void 0 && activity.channelData) || !(activity !== null && activity !== void 0 && (_activity$channelData7 = activity.channelData) !== null && _activity$channelData7 !== void 0 && _activity$channelData7.tags) || (activity === null || activity === void 0 ? void 0 : (_activity$channelData8 = activity.channelData) === null || _activity$channelData8 === void 0 ? void 0 : (_activity$channelData9 = _activity$channelData8.tags) === null || _activity$channelData9 === void 0 ? void 0 : _activity$channelData9.length) === 0; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
           const messageHasNoAttachments = !(activity !== null && activity !== void 0 && activity.attachments) || (activity === null || activity === void 0 ? void 0 : activity.attachments.length) === 0;
 
@@ -74,7 +71,8 @@ export const createOnNewAdapterActivityHandler = (chatId, userId) => {
         BroadcastService.postMessage(newMessageReceivedEvent);
         TelemetryHelper.logActionEvent(LogLevel.INFO, {
           Event: TelemetryEvent.MessageReceived,
-          Description: "New message received"
+          Description: "New message received",
+          Data: payload
         });
       }
     }