@microsoft/omnichannel-chat-widget 1.7.3-main.aa696dc → 1.7.3-main.b61c751

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

@@ -0,0 +1,77 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.HiddenAdaptiveCardActivitySubscriber = void 0;
+var _Constants = require("../../../../common/Constants");
+var _TelemetryConstants = require("../../../../common/telemetry/TelemetryConstants");
+var _TelemetryHelper = require("../../../../common/telemetry/TelemetryHelper");
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+class HiddenAdaptiveCardActivitySubscriber {
+  constructor() {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    _defineProperty(this, "observer", void 0);
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  async apply(activity) {
+    const {
+      attachments,
+      attachment
+    } = activity;
+    this.observer.next(false);
+    _omnichannelChatComponents.BroadcastService.postMessage({
+      eventName: _TelemetryConstants.BroadcastEvent.NewMessageReceived,
+      payload: {
+        attachments: attachments || [attachment],
+        text: "Custom Event"
+      }
+    });
+    return;
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any
+  applicable(activity) {
+    const {
+      attachments,
+      attachment
+    } = activity;
+
+    // Use `attachments` or `attachment` (whichever exists)
+    const cards = attachments || [attachment];
+
+    // Check if contentType is "AdaptiveCard"
+    const adaptiveCard = cards === null || cards === void 0 ? void 0 : cards.find(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    item => _Constants.Constants.supportedAdaptiveCardContentTypes.indexOf(item === null || item === void 0 ? void 0 : item.contentType) >= 0);
+    if (adaptiveCard && adaptiveCard.content) {
+      const {
+        body
+      } = adaptiveCard.content;
+      if (Array.isArray(body)) {
+        // Check if all elements in `body` have `isVisible: false`
+        const allInvisible = body.every(item => item.isVisible === false);
+        if (allInvisible) {
+          _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
+            Event: _TelemetryConstants.TelemetryEvent.BotAuthActivityUndefinedSignInId,
+            Description: "All elements in AdaptiveCard are invisible"
+          });
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  async next(activity) {
+    if (this.applicable(activity)) {
+      return await this.apply(activity);
+    }
+    return activity;
+  }
+}
+exports.HiddenAdaptiveCardActivitySubscriber = HiddenAdaptiveCardActivitySubscriber;

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

@@ -11,6 +11,7 @@ var _defaultMiddlewareLocalizedTexts = require("../../webchatcontainerstateful/c
 var _ChatAdapterShim = require("./ChatAdapterShim");
 var _PauseActivitySubscriber = require("./ActivitySubscriber/PauseActivitySubscriber");
 var _BotAuthActivitySubscriber = require("./ActivitySubscriber/BotAuthActivitySubscriber");
+var _HiddenAdaptiveCardActivitySubscriber = require("./ActivitySubscriber/HiddenAdaptiveCardActivitySubscriber");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const createAdapter = async chatSDK => {
   const chatAdapterOptionalParams = {
@@ -41,6 +42,8 @@ const createAdapter = async chatSDK => {
     adapter = new _ChatAdapterShim.ChatAdapterShim(adapter);
     adapter.addSubscriber(new _PauseActivitySubscriber.PauseActivitySubscriber());
     adapter.addSubscriber(new _BotAuthActivitySubscriber.BotAuthActivitySubscriber());
+    // Remove this code after ICM ID:544623085 is fixed
+    adapter.addSubscriber(new _HiddenAdaptiveCardActivitySubscriber.HiddenAdaptiveCardActivitySubscriber());
     return adapter.chatAdapter;
   }
   return adapter;

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

@@ -209,6 +209,7 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
       isStartChatSuccessful = false;
       throw error;
     }
+    await createAdapterAndSubscribe(chatSDK, dispatch, setAdapter);
 
     // Set app state to Active
     if (isStartChatSuccessful) {
@@ -233,12 +234,12 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
       (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch, true);
       return;
     }
-    await createAdapterAndSubscribe(chatSDK, dispatch, setAdapter);
 
     // Persistent Chat relies on the `reconnectId` retrieved from reconnectablechats API to reconnect upon start chat and not `liveChatContext`
     if (!persistentChatEnabled) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const liveChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getCurrentLiveChatContext());
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       dispatch({
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
         payload: liveChatContext
@@ -264,9 +265,7 @@ const createAdapterAndSubscribe = async (chatSDK, dispatch, setAdapter) => {
   // New adapter creation
   const newAdapter = await (0, _createAdapter.createAdapter)(chatSDK);
   setAdapter(newAdapter);
-
-  //start chat is already seeding the chat token, so no need to get it again
-  const chatToken = await chatSDK.getChatToken(true);
+  const chatToken = await chatSDK.getChatToken();
   dispatch({
     type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
     payload: chatToken

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

@@ -0,0 +1,70 @@
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import { Constants } from "../../../../common/Constants";
+import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../../common/telemetry/TelemetryConstants";
+import { TelemetryHelper } from "../../../../common/telemetry/TelemetryHelper";
+import { BroadcastService } from "@microsoft/omnichannel-chat-components";
+export class HiddenAdaptiveCardActivitySubscriber {
+  constructor() {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    _defineProperty(this, "observer", void 0);
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  async apply(activity) {
+    const {
+      attachments,
+      attachment
+    } = activity;
+    this.observer.next(false);
+    BroadcastService.postMessage({
+      eventName: BroadcastEvent.NewMessageReceived,
+      payload: {
+        attachments: attachments || [attachment],
+        text: "Custom Event"
+      }
+    });
+    return;
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any
+  applicable(activity) {
+    const {
+      attachments,
+      attachment
+    } = activity;
+
+    // Use `attachments` or `attachment` (whichever exists)
+    const cards = attachments || [attachment];
+
+    // Check if contentType is "AdaptiveCard"
+    const adaptiveCard = cards === null || cards === void 0 ? void 0 : cards.find(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    item => Constants.supportedAdaptiveCardContentTypes.indexOf(item === null || item === void 0 ? void 0 : item.contentType) >= 0);
+    if (adaptiveCard && adaptiveCard.content) {
+      const {
+        body
+      } = adaptiveCard.content;
+      if (Array.isArray(body)) {
+        // Check if all elements in `body` have `isVisible: false`
+        const allInvisible = body.every(item => item.isVisible === false);
+        if (allInvisible) {
+          TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
+            Event: TelemetryEvent.BotAuthActivityUndefinedSignInId,
+            Description: "All elements in AdaptiveCard are invisible"
+          });
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  async next(activity) {
+    if (this.applicable(activity)) {
+      return await this.apply(activity);
+    }
+    return activity;
+  }
+}

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

@@ -5,6 +5,7 @@ import { defaultMiddlewareLocalizedTexts } from "../../webchatcontainerstateful/
 import { ChatAdapterShim } from "./ChatAdapterShim";
 import { PauseActivitySubscriber } from "./ActivitySubscriber/PauseActivitySubscriber";
 import { BotAuthActivitySubscriber } from "./ActivitySubscriber/BotAuthActivitySubscriber";
+import { HiddenAdaptiveCardActivitySubscriber } from "./ActivitySubscriber/HiddenAdaptiveCardActivitySubscriber";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const createAdapter = async chatSDK => {
@@ -36,6 +37,8 @@ export const createAdapter = async chatSDK => {
     adapter = new ChatAdapterShim(adapter);
     adapter.addSubscriber(new PauseActivitySubscriber());
     adapter.addSubscriber(new BotAuthActivitySubscriber());
+    // Remove this code after ICM ID:544623085 is fixed
+    adapter.addSubscriber(new HiddenAdaptiveCardActivitySubscriber());
     return adapter.chatAdapter;
   }
   return adapter;

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

@@ -202,6 +202,7 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
       isStartChatSuccessful = false;
       throw error;
     }
+    await createAdapterAndSubscribe(chatSDK, dispatch, setAdapter);
 
     // Set app state to Active
     if (isStartChatSuccessful) {
@@ -226,12 +227,12 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
       setPostChatContextAndLoadSurvey(chatSDK, dispatch, true);
       return;
     }
-    await createAdapterAndSubscribe(chatSDK, dispatch, setAdapter);
 
     // Persistent Chat relies on the `reconnectId` retrieved from reconnectablechats API to reconnect upon start chat and not `liveChatContext`
     if (!persistentChatEnabled) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const liveChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getCurrentLiveChatContext());
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       dispatch({
         type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
         payload: liveChatContext
@@ -256,9 +257,7 @@ const createAdapterAndSubscribe = async (chatSDK, dispatch, setAdapter) => {
   // New adapter creation
   const newAdapter = await createAdapter(chatSDK);
   setAdapter(newAdapter);
-
-  //start chat is already seeding the chat token, so no need to get it again
-  const chatToken = await chatSDK.getChatToken(true);
+  const chatToken = await chatSDK.getChatToken();
   dispatch({
     type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
     payload: chatToken

package/lib/types/components/livechatwidget/common/ActivitySubscriber/HiddenAdaptiveCardActivitySubscriber.d.ts

@@ -0,0 +1,7 @@
+import { IActivitySubscriber } from "./IActivitySubscriber";
+export declare class HiddenAdaptiveCardActivitySubscriber implements IActivitySubscriber {
+    observer: any;
+    apply(activity: any): Promise<void>;
+    applicable(activity: any): boolean;
+    next(activity: any): Promise<any>;
+}

package/package.json

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