@microsoft/omnichannel-chat-widget 0.1.0-main.ae27766 → 0.1.0-main.c2417f9

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

@@ -4,7 +4,7 @@ import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/teleme
 import { BroadcastService, decodeComponentString } from "@microsoft/omnichannel-chat-components";
 import { Stack } from "@fluentui/react";
 import React, { useEffect, useRef, useState } from "react";
-import { createTimer, getLocaleDirection } from "../../../common/utils";
+import { createTimer, getLocaleDirection, getWidgetCacheId, getWidgetEndChatEventName } from "../../../common/utils";
 import { getReconnectIdForAuthenticatedChat, handleUnauthenticatedReconnectChat, startUnauthenticatedReconnectChat } from "../common/reconnectChatHelper";
 import { initStartChat, prepareStartChat } from "../common/startChat";
 import { shouldShowCallingContainer, shouldShowChatButton, shouldShowConfirmationPane, shouldShowEmailTranscriptPane, shouldShowHeader, shouldShowLoadingPane, shouldShowOutOfOfficeHoursPane, shouldShowPostChatLoadingPane, shouldShowPostChatSurveyPane, shouldShowPreChatSurveyPane, shouldShowProactiveChatPane, shouldShowReconnectChatPane, shouldShowWebChatContainer } from "../../../controller/componentController";
@@ -53,7 +53,8 @@ export const LiveChatWidgetStateful = props => {
     ...((_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : _props$webChatContain.webChatStyles)
   }); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-  const chatSDK = useChatSDKStore();
+  const chatSDK = useChatSDKStore(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
   const [voiceVideoCallingSDK, setVoiceVideoCallingSDK] = useState(undefined);
   const {
     Composer
@@ -67,6 +68,7 @@ export const LiveChatWidgetStateful = props => {
   TelemetryTimers.LcwLoadToChatButtonTimer = createTimer();
   const widgetElementId = ((_props$controlProps = props.controlProps) === null || _props$controlProps === void 0 ? void 0 : _props$controlProps.id) || "oc-lcw";
   const currentMessageCountRef = useRef(0);
+  let widgetStateEventName = "";
   useEffect(() => {
     var _props$controlProps2, _props$controlProps3, _props$reconnectChatP, _props$controlProps4, _props$chatConfig, _props$chatConfig$Cha, _state$domainStates;
 
@@ -81,6 +83,10 @@ export const LiveChatWidgetStateful = props => {
       type: LiveChatWidgetActionType.SET_SKIP_CHAT_BUTTON_RENDERING,
       payload: ((_props$controlProps2 = props.controlProps) === null || _props$controlProps2 === void 0 ? void 0 : _props$controlProps2.skipChatButtonRendering) || false
     });
+    dispatch({
+      type: LiveChatWidgetActionType.SET_E2VV_ENABLED,
+      payload: false
+    });
     initCallingSdk(chatSDK, setVoiceVideoCallingSDK).then(sdkCreated => {
       sdkCreated && dispatch({
         type: LiveChatWidgetActionType.SET_E2VV_ENABLED,
@@ -109,7 +115,8 @@ export const LiveChatWidgetStateful = props => {
       };
       initStartChat(chatSDK, dispatch, setAdapter, optionalParams);
     }
-  }, []);
+  }, []); // useEffect for when skip chat button rendering
+
   useEffect(() => {
     if (state.appStates.skipChatButtonRendering) {
       var _props$reconnectChatP3;
@@ -143,9 +150,23 @@ export const LiveChatWidgetStateful = props => {
         });
       }
     }
-  }, [state.appStates.skipChatButtonRendering]);
+  }, [state.appStates.skipChatButtonRendering]); // useEffect for when skip chat button rendering
+
   useEffect(() => {
-    BroadcastService.getMessageByEventName("StartProactiveChat").subscribe(msg => {
+    var _chatSDK$omnichannelC3, _chatSDK$omnichannelC4;
+
+    // Add the custom context on receiving the SetCustomContext event
+    BroadcastService.getMessageByEventName(BroadcastEvent.SetCustomContext).subscribe(msg => {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.CustomContextReceived,
+        Description: "CustomContext received."
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CUSTOM_CONTEXT,
+        payload: msg === null || msg === void 0 ? void 0 : msg.payload
+      });
+    });
+    BroadcastService.getMessageByEventName(BroadcastEvent.StartProactiveChat).subscribe(msg => {
       TelemetryHelper.logActionEvent(LogLevel.INFO, {
         Event: TelemetryEvent.StartProactiveChatEventReceived,
         Description: "Start proactive chat event received."
@@ -161,48 +182,113 @@ export const LiveChatWidgetStateful = props => {
           Description: "Start proactive chat method called, when chat was already triggered."
         });
       }
-    }); // start chat from SDK Event
+    }); // Start chat from SDK Event
+
+    BroadcastService.getMessageByEventName(BroadcastEvent.StartChat).subscribe(() => {
+      var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _DataStoreManager$cli;
 
-    BroadcastService.getMessageByEventName("StartChat").subscribe(() => {
       TelemetryHelper.logActionEvent(LogLevel.INFO, {
         Event: TelemetryEvent.StartChatEventRecevied,
         Description: "Start chat event received."
-      });
+      }); // Getting updated state from cache
+
+      const widgetStateEventName = getWidgetCacheId((chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC === void 0 ? void 0 : _chatSDK$omnichannelC.orgId) ?? "", (chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC2 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC2 === void 0 ? void 0 : _chatSDK$omnichannelC2.widgetId) ?? "");
+      const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(widgetStateEventName, "localStorage");
+      const persistedState = widgetStateFromCache ? JSON.parse(widgetStateFromCache) : undefined;
+
+      if (persistedState.appStates.conversationState === ConversationState.Closed || persistedState.appStates.conversationState === ConversationState.InActive || persistedState.appStates.conversationState === ConversationState.Postchat) {
+        BroadcastService.postMessage({
+          eventName: BroadcastEvent.ChatInitiated
+        });
+        prepareStartChat(props, chatSDK, state, dispatch, setAdapter);
+      } else {
+        var _persistedState$domai, _persistedState$domai2, _persistedState$domai3, _persistedState$domai4;
 
-      if (state.appStates.isMinimized) {
         dispatch({
           type: LiveChatWidgetActionType.SET_MINIMIZED,
           payload: false
         });
-      } else {
-        prepareStartChat(props, chatSDK, state, dispatch, setAdapter);
+        BroadcastService.postMessage({
+          eventName: BroadcastEvent.MaximizeChat,
+          payload: {
+            height: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai = persistedState.domainStates) === null || _persistedState$domai === void 0 ? void 0 : (_persistedState$domai2 = _persistedState$domai.widgetSize) === null || _persistedState$domai2 === void 0 ? void 0 : _persistedState$domai2.height,
+            width: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai3 = persistedState.domainStates) === null || _persistedState$domai3 === void 0 ? void 0 : (_persistedState$domai4 = _persistedState$domai3.widgetSize) === null || _persistedState$domai4 === void 0 ? void 0 : _persistedState$domai4.width
+          }
+        });
       }
-    }); // end chat from SDK Event
+    }); // End chat
+
+    BroadcastService.getMessageByEventName(BroadcastEvent.InitiateEndChat).subscribe(async msg => {
+      var _msg$payload4, _msg$payload5;
 
-    BroadcastService.getMessageByEventName("EndChat").subscribe(async () => {
+      const isChatUnloading = ((_msg$payload4 = msg.payload) === null || _msg$payload4 === void 0 ? void 0 : _msg$payload4.chatUnloading) ?? false;
+      const isSdkCall = ((_msg$payload5 = msg.payload) === null || _msg$payload5 === void 0 ? void 0 : _msg$payload5.isSdkCall) ?? false;
+      const eventDescription = isChatUnloading ? "End chat event received from unload." : "End chat event received.";
       TelemetryHelper.logActionEvent(LogLevel.INFO, {
         Event: TelemetryEvent.EndChatEventReceived,
-        Description: "End chat event received."
+        Description: eventDescription
       });
 
-      if (canEndChat.current) {
+      if (isChatUnloading) {
+        var _DataStoreManager$cli2;
+
+        //Browser close scenario/no room for PCS/so just end chat and notify agent immidiately
+        endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, false, false); // Clean local storage
+
+        (_DataStoreManager$cli2 = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli2 === void 0 ? void 0 : _DataStoreManager$cli2.removeData(widgetStateEventName, "localStorage");
+      } else if (canEndChat.current) {
         prepareEndChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state);
       } else {
         const skipEndChatSDK = true;
         const skipCloseChat = false;
         endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat);
+      } // Raise chatClose for SDK events
+
+
+      if (isSdkCall) {
+        BroadcastService.postMessage({
+          eventName: BroadcastEvent.CloseChat
+        });
       }
-    });
+    }); // reset proactive chat params
+
+    BroadcastService.getMessageByEventName(BroadcastEvent.ResetProactiveChatParams).subscribe(async () => {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_PROACTIVE_CHAT_PARAMS,
+        payload: {
+          proactiveChatBodyTitle: "",
+          proactiveChatEnablePrechat: false,
+          proactiveChatInNewWindow: false
+        }
+      });
+    }); // Listen to end chat event from other tabs
+
+    const endChatEventName = getWidgetEndChatEventName(chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC3 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC3 === void 0 ? void 0 : _chatSDK$omnichannelC3.orgId, chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC4 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC4 === void 0 ? void 0 : _chatSDK$omnichannelC4.widgetId);
+    BroadcastService.getMessageByEventName(endChatEventName).subscribe(async () => {
+      endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, false, false);
+    }); // Close popout window
+
     window.addEventListener("beforeunload", () => {
+      TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.WindowClosed,
+        Description: "Closed window."
+      });
       disposeTelemetryLoggers();
     });
 
     if (state.appStates.conversationEndedByAgent) {
       endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter);
-    }
+    } //Listen to WidgetSize
+
+
+    BroadcastService.getMessageByEventName("WidgetSize").subscribe(msg => {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_WIDGET_SIZE,
+        payload: msg === null || msg === void 0 ? void 0 : msg.payload
+      });
+    });
   }, []);
   useEffect(() => {
-    canStartProactiveChat.current = state.appStates.conversationState === ConversationState.Closed;
     canEndChat.current = state.appStates.conversationState === ConversationState.Active;
 
     if (state.appStates.conversationState === ConversationState.Active) {
@@ -223,7 +309,10 @@ export const LiveChatWidgetStateful = props => {
         });
       });
     }
-  }, [state.appStates.conversationState]); // Reset the UnreadMessageCount when minimized is toggled and broadcast it.
+  }, [state.appStates.conversationState]);
+  useEffect(() => {
+    canStartProactiveChat.current = state.appStates.conversationState === ConversationState.Closed && !state.appStates.proactiveChatStates.proactiveChatInNewWindow;
+  }, [state.appStates.conversationState, state.appStates.proactiveChatStates.proactiveChatInNewWindow]); // Reset the UnreadMessageCount when minimized is toggled and broadcast it.
 
   useEffect(() => {
     currentMessageCountRef.current = -1;
@@ -255,7 +344,19 @@ export const LiveChatWidgetStateful = props => {
     setWebChatStyles({ ...webChatStyles,
       ...((_props$webChatContain2 = props.webChatContainerProps) === null || _props$webChatContain2 === void 0 ? void 0 : _props$webChatContain2.webChatStyles)
     });
-  }, [(_props$webChatContain3 = props.webChatContainerProps) === null || _props$webChatContain3 === void 0 ? void 0 : _props$webChatContain3.webChatStyles]);
+  }, [(_props$webChatContain3 = props.webChatContainerProps) === null || _props$webChatContain3 === void 0 ? void 0 : _props$webChatContain3.webChatStyles]); // Publish chat widget state
+
+  useEffect(() => {
+    var _props$chatSDK, _props$chatSDK$omnich, _props$chatSDK2, _props$chatSDK2$omnic;
+
+    widgetStateEventName = getWidgetCacheId(props === null || props === void 0 ? void 0 : (_props$chatSDK = props.chatSDK) === null || _props$chatSDK === void 0 ? void 0 : (_props$chatSDK$omnich = _props$chatSDK.omnichannelConfig) === null || _props$chatSDK$omnich === void 0 ? void 0 : _props$chatSDK$omnich.orgId, props === null || props === void 0 ? void 0 : (_props$chatSDK2 = props.chatSDK) === null || _props$chatSDK2 === void 0 ? void 0 : (_props$chatSDK2$omnic = _props$chatSDK2.omnichannelConfig) === null || _props$chatSDK2$omnic === void 0 ? void 0 : _props$chatSDK2$omnic.widgetId);
+    const chatWidgetStateChangeEvent = {
+      eventName: widgetStateEventName,
+      payload: { ...state
+      }
+    };
+    BroadcastService.postMessage(chatWidgetStateChangeEvent);
+  }, [state]);
   const webChatProps = initWebChatComposer(props, chatSDK, state, dispatch, setWebChatStyles);
 
   const setPostChatContextRelay = () => setPostChatContextAndLoadSurvey(chatSDK, dispatch); // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -271,16 +372,7 @@ export const LiveChatWidgetStateful = props => {
 
   const initStartChatRelay = (optionalParams, persistedState) => initStartChat(chatSDK, dispatch, setAdapter, optionalParams, persistedState);
 
-  const confirmationPaneProps = initConfirmationPropsComposer(props); // publish chat widget state
-
-  useEffect(() => {
-    const chatWidgetStateChangeEvent = {
-      eventName: BroadcastEvent.ChatWidgetStateChanged,
-      payload: { ...state
-      }
-    };
-    BroadcastService.postMessage(chatWidgetStateChangeEvent);
-  }, [state]);
+  const confirmationPaneProps = initConfirmationPropsComposer(props);
   return /*#__PURE__*/React.createElement(Composer, _extends({}, webChatProps, {
     styleOptions: webChatStyles,
     directLine: ((_props$webChatContain4 = props.webChatContainerProps) === null || _props$webChatContain4 === void 0 ? void 0 : _props$webChatContain4.directLine) ?? adapter ?? defaultWebChatContainerStatefulProps.directLine

package/lib/esm/components/prechatsurveypanestateful/PreChatSurveyPaneStateful.js

@@ -1,7 +1,7 @@
-import { Constants, HtmlAttributeNames, Regex } from "../../common/Constants";
+import { HtmlAttributeNames, Regex } from "../../common/Constants";
 import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
 import React, { useEffect } from "react";
-import { extractPreChatSurveyResponseValues, findAllFocusableElement, parseAdaptiveCardPayload } from "../../common/utils";
+import { extractPreChatSurveyResponseValues, findAllFocusableElement, getWidgetCacheId, parseAdaptiveCardPayload } from "../../common/utils";
 import { ConversationState } from "../../contexts/common/ConversationState";
 import { DataStoreManager } from "../../common/contextDataStore/DataStoreManager";
 import { LiveChatWidgetActionType } from "../../contexts/common/LiveChatWidgetActionType";
@@ -67,9 +67,10 @@ export const PreChatSurveyPaneStateful = props => {
       });
 
       try {
-        var _DataStoreManager$cli, _persistedState$domai;
+        var _state$domainStates, _state$domainStates$t, _state$domainStates$t2, _DataStoreManager$cli, _persistedState$domai;
 
-        const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(Constants.widgetStateDataKey, "localStorage");
+        const widgetStateCacheId = getWidgetCacheId(((_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : (_state$domainStates$t = _state$domainStates.telemetryInternalData) === null || _state$domainStates$t === void 0 ? void 0 : _state$domainStates$t.orgId) ?? "", ((_state$domainStates$t2 = state.domainStates.telemetryInternalData) === null || _state$domainStates$t2 === void 0 ? void 0 : _state$domainStates$t2.widgetId) ?? "");
+        const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(widgetStateCacheId, "localStorage");
         const persistedState = widgetStateFromCache ? JSON.parse(widgetStateFromCache) : undefined;
         let optionalParams = {};
 
@@ -83,9 +84,7 @@ export const PreChatSurveyPaneStateful = props => {
         } else {
           const prechatResponseValues = extractPreChatSurveyResponseValues(state.domainStates.preChatSurveyResponse, values);
           optionalParams = {
-            initContext: {
-              preChatResponse: prechatResponseValues
-            }
+            preChatResponse: prechatResponseValues
           };
           setPreChatResponseEmail(values);
           await initStartChat(optionalParams);

package/lib/esm/components/proactivechatpanestateful/ProactiveChatPaneStateful.js

@@ -24,6 +24,14 @@ export const ProactiveChatPaneStateful = props => {
   const handleProactiveChatInviteTimeout = () => {
     if (!timeoutRemoved) {
       setTimeoutRemoved(true);
+      dispatch({
+        type: LiveChatWidgetActionType.SET_PROACTIVE_CHAT_PARAMS,
+        payload: {
+          proactiveChatBodyTitle: "",
+          proactiveChatEnablePrechat: false,
+          proactiveChatInNewWindow: false
+        }
+      });
       dispatch({
         type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: ConversationState.Closed
@@ -81,6 +89,14 @@ export const ProactiveChatPaneStateful = props => {
         Event: TelemetryEvent.ProactiveChatClosed,
         Description: "Proactive chat closed."
       });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_PROACTIVE_CHAT_PARAMS,
+        payload: {
+          proactiveChatBodyTitle: "",
+          proactiveChatEnablePrechat: false,
+          proactiveChatInNewWindow: false
+        }
+      });
       dispatch({
         type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: ConversationState.Closed

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/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);
+  });
+});