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

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

@@ -215,6 +215,7 @@ exports.TelemetryEvent = TelemetryEvent;
   TelemetryEvent["PostChatSurveyLoadingPaneLoaded"] = "PostChatSurveyLoadingPaneLoaded";
   TelemetryEvent["PostChatSurveyLoaded"] = "PostChatSurveyLoaded";
   TelemetryEvent["ChatDisconnectThreadEventReceived"] = "ChatDisconnectThreadEventReceived";
+  TelemetryEvent["HiddenAdaptiveCardMessageReceived"] = "HiddenAdaptiveCardMessageReceived";
 })(TelemetryEvent || (exports.TelemetryEvent = TelemetryEvent = {}));
 class TelemetryConstants {
   static map(eventTypeOrScenarioType) {

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

@@ -13,8 +13,6 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
 const supportedSignInCardContentTypes = ["application/vnd.microsoft.card.signin", "application/vnd.microsoft.card.oauth"];
 const botOauthUrlRegex = /[\S]+.botframework.com\/api\/oauth\/signin\?signin=([\S]+)/;
 const delay = t => new Promise(resolve => setTimeout(resolve, t));
-const fetchBotAuthConfigRetries = 3;
-const fetchBotAuthConfigRetryInterval = 1000;
 let response;
 const extractSignInId = signInUrl => {
   const result = botOauthUrlRegex.exec(signInUrl);
@@ -43,7 +41,7 @@ const extractSasUrl = async attachment => {
   }
   return sasUrl;
 };
-const fetchBotAuthConfig = async retries => {
+const fetchBotAuthConfig = async (retries, interval) => {
   _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
     Event: _TelemetryConstants.TelemetryEvent.SetBotAuthProviderFetchConfig
   });
@@ -64,14 +62,25 @@ const fetchBotAuthConfig = async retries => {
     // Base Case
     throw new Error();
   }
-  await delay(fetchBotAuthConfigRetryInterval);
-  return await fetchBotAuthConfig(--retries);
+  await delay(interval);
+  return await fetchBotAuthConfig(--retries, interval);
 };
 class BotAuthActivitySubscriber {
   constructor() {
+    let optionalParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     _defineProperty(this, "observer", void 0);
     _defineProperty(this, "signInCardSeen", void 0);
+    _defineProperty(this, "fetchBotAuthConfigRetries", void 0);
+    _defineProperty(this, "fetchBotAuthConfigRetryInterval", void 0);
     this.signInCardSeen = new Set();
+    this.fetchBotAuthConfigRetries = 3;
+    this.fetchBotAuthConfigRetryInterval = 1000;
+    if (optionalParams.fetchBotAuthConfigRetries) {
+      this.fetchBotAuthConfigRetries = optionalParams.fetchBotAuthConfigRetries;
+    }
+    if (optionalParams.fetchBotAuthConfigRetryInterval) {
+      this.fetchBotAuthConfigRetryInterval = optionalParams.fetchBotAuthConfigRetryInterval;
+    }
   }
   applicable(activity) {
     var _activity$attachments;
@@ -110,7 +119,7 @@ class BotAuthActivitySubscriber {
       _omnichannelChatComponents.BroadcastService.postMessage(event);
     }
     try {
-      const response = await fetchBotAuthConfig(fetchBotAuthConfigRetries);
+      const response = await fetchBotAuthConfig(this.fetchBotAuthConfigRetries, this.fetchBotAuthConfigRetryInterval);
       if (response === false) {
         _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
           Event: _TelemetryConstants.TelemetryEvent.SetBotAuthProviderHideCard

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

@@ -56,7 +56,7 @@ class HiddenAdaptiveCardActivitySubscriber {
         const allInvisible = body.every(item => item.isVisible === false);
         if (allInvisible) {
           _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
-            Event: _TelemetryConstants.TelemetryEvent.BotAuthActivityUndefinedSignInId,
+            Event: _TelemetryConstants.TelemetryEvent.HiddenAdaptiveCardMessageReceived,
             Description: "All elements in AdaptiveCard are invisible"
           });
           return true;

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

@@ -12,8 +12,13 @@ var _ChatAdapterShim = require("./ChatAdapterShim");
 var _PauseActivitySubscriber = require("./ActivitySubscriber/PauseActivitySubscriber");
 var _BotAuthActivitySubscriber = require("./ActivitySubscriber/BotAuthActivitySubscriber");
 var _HiddenAdaptiveCardActivitySubscriber = require("./ActivitySubscriber/HiddenAdaptiveCardActivitySubscriber");
+const defaultBotAuthConfig = {
+  fetchBotAuthConfigRetries: 3,
+  fetchBotAuthConfigRetryInterval: 1000
+};
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const createAdapter = async chatSDK => {
+const createAdapter = async (chatSDK, props) => {
   const chatAdapterOptionalParams = {
     IC3Adapter: {
       options: {
@@ -39,9 +44,14 @@ const createAdapter = async chatSDK => {
   let adapter = await chatSDK.createChatAdapter(chatAdapterOptionalParams);
   //so far, there is no need to convert to the shim adapter when using visual tests
   if (chatSDK.isMockModeOn !== true) {
+    var _props$webChatContain, _props$webChatContain2, _props$webChatContain3, _props$webChatContain4;
+    const botAuthActivitySubscriberOptionalParams = {
+      fetchBotAuthConfigRetries: (props === null || props === void 0 ? void 0 : (_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : (_props$webChatContain2 = _props$webChatContain.botAuthConfig) === null || _props$webChatContain2 === void 0 ? void 0 : _props$webChatContain2.fetchBotAuthConfigRetries) || defaultBotAuthConfig.fetchBotAuthConfigRetries,
+      fetchBotAuthConfigRetryInterval: (props === null || props === void 0 ? void 0 : (_props$webChatContain3 = props.webChatContainerProps) === null || _props$webChatContain3 === void 0 ? void 0 : (_props$webChatContain4 = _props$webChatContain3.botAuthConfig) === null || _props$webChatContain4 === void 0 ? void 0 : _props$webChatContain4.fetchBotAuthConfigRetryInterval) || defaultBotAuthConfig.fetchBotAuthConfigRetryInterval
+    };
     adapter = new _ChatAdapterShim.ChatAdapterShim(adapter);
     adapter.addSubscriber(new _PauseActivitySubscriber.PauseActivitySubscriber());
-    adapter.addSubscriber(new _BotAuthActivitySubscriber.BotAuthActivitySubscriber());
+    adapter.addSubscriber(new _BotAuthActivitySubscriber.BotAuthActivitySubscriber(botAuthActivitySubscriberOptionalParams));
     // Remove this code after ICM ID:544623085 is fixed
     adapter.addSubscriber(new _HiddenAdaptiveCardActivitySubscriber.HiddenAdaptiveCardActivitySubscriber());
     return adapter.chatAdapter;

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

@@ -209,7 +209,7 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
       isStartChatSuccessful = false;
       throw error;
     }
-    await createAdapterAndSubscribe(chatSDK, dispatch, setAdapter);
+    await createAdapterAndSubscribe(chatSDK, dispatch, setAdapter, props);
 
     // Set app state to Active
     if (isStartChatSuccessful) {
@@ -260,10 +260,10 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.initStartChat = initStartChat;
-const createAdapterAndSubscribe = async (chatSDK, dispatch, setAdapter) => {
+const createAdapterAndSubscribe = async (chatSDK, dispatch, setAdapter, props) => {
   var _newAdapter$activity$;
   // New adapter creation
-  const newAdapter = await (0, _createAdapter.createAdapter)(chatSDK);
+  const newAdapter = await (0, _createAdapter.createAdapter)(chatSDK, props);
   setAdapter(newAdapter);
   const chatToken = await chatSDK.getChatToken();
   dispatch({

package/lib/cjs/components/livechatwidget/interfaces/IBotAuthActivitySubscriberOptionalParams.js

@@ -0,0 +1 @@
+"use strict";

package/lib/cjs/components/webchatcontainerstateful/interfaces/IBotAuthConfig.js

@@ -0,0 +1 @@
+"use strict";

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

@@ -209,6 +209,7 @@ export let TelemetryEvent;
   TelemetryEvent["PostChatSurveyLoadingPaneLoaded"] = "PostChatSurveyLoadingPaneLoaded";
   TelemetryEvent["PostChatSurveyLoaded"] = "PostChatSurveyLoaded";
   TelemetryEvent["ChatDisconnectThreadEventReceived"] = "ChatDisconnectThreadEventReceived";
+  TelemetryEvent["HiddenAdaptiveCardMessageReceived"] = "HiddenAdaptiveCardMessageReceived";
 })(TelemetryEvent || (TelemetryEvent = {}));
 export class TelemetryConstants {
   static map(eventTypeOrScenarioType) {

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

@@ -9,8 +9,6 @@ import { TelemetryHelper } from "../../../../common/telemetry/TelemetryHelper";
 const supportedSignInCardContentTypes = ["application/vnd.microsoft.card.signin", "application/vnd.microsoft.card.oauth"];
 const botOauthUrlRegex = /[\S]+.botframework.com\/api\/oauth\/signin\?signin=([\S]+)/;
 const delay = t => new Promise(resolve => setTimeout(resolve, t));
-const fetchBotAuthConfigRetries = 3;
-const fetchBotAuthConfigRetryInterval = 1000;
 let response;
 const extractSignInId = signInUrl => {
   const result = botOauthUrlRegex.exec(signInUrl);
@@ -39,7 +37,7 @@ const extractSasUrl = async attachment => {
   }
   return sasUrl;
 };
-const fetchBotAuthConfig = async retries => {
+const fetchBotAuthConfig = async (retries, interval) => {
   TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
     Event: TelemetryEvent.SetBotAuthProviderFetchConfig
   });
@@ -60,14 +58,25 @@ const fetchBotAuthConfig = async retries => {
     // Base Case
     throw new Error();
   }
-  await delay(fetchBotAuthConfigRetryInterval);
-  return await fetchBotAuthConfig(--retries);
+  await delay(interval);
+  return await fetchBotAuthConfig(--retries, interval);
 };
 export class BotAuthActivitySubscriber {
   constructor() {
+    let optionalParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     _defineProperty(this, "observer", void 0);
     _defineProperty(this, "signInCardSeen", void 0);
+    _defineProperty(this, "fetchBotAuthConfigRetries", void 0);
+    _defineProperty(this, "fetchBotAuthConfigRetryInterval", void 0);
     this.signInCardSeen = new Set();
+    this.fetchBotAuthConfigRetries = 3;
+    this.fetchBotAuthConfigRetryInterval = 1000;
+    if (optionalParams.fetchBotAuthConfigRetries) {
+      this.fetchBotAuthConfigRetries = optionalParams.fetchBotAuthConfigRetries;
+    }
+    if (optionalParams.fetchBotAuthConfigRetryInterval) {
+      this.fetchBotAuthConfigRetryInterval = optionalParams.fetchBotAuthConfigRetryInterval;
+    }
   }
   applicable(activity) {
     var _activity$attachments;
@@ -106,7 +115,7 @@ export class BotAuthActivitySubscriber {
       BroadcastService.postMessage(event);
     }
     try {
-      const response = await fetchBotAuthConfig(fetchBotAuthConfigRetries);
+      const response = await fetchBotAuthConfig(this.fetchBotAuthConfigRetries, this.fetchBotAuthConfigRetryInterval);
       if (response === false) {
         TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
           Event: TelemetryEvent.SetBotAuthProviderHideCard

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

@@ -50,7 +50,7 @@ export class HiddenAdaptiveCardActivitySubscriber {
         const allInvisible = body.every(item => item.isVisible === false);
         if (allInvisible) {
           TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
-            Event: TelemetryEvent.BotAuthActivityUndefinedSignInId,
+            Event: TelemetryEvent.HiddenAdaptiveCardMessageReceived,
             Description: "All elements in AdaptiveCard are invisible"
           });
           return true;

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

@@ -6,9 +6,13 @@ import { ChatAdapterShim } from "./ChatAdapterShim";
 import { PauseActivitySubscriber } from "./ActivitySubscriber/PauseActivitySubscriber";
 import { BotAuthActivitySubscriber } from "./ActivitySubscriber/BotAuthActivitySubscriber";
 import { HiddenAdaptiveCardActivitySubscriber } from "./ActivitySubscriber/HiddenAdaptiveCardActivitySubscriber";
+const defaultBotAuthConfig = {
+  fetchBotAuthConfigRetries: 3,
+  fetchBotAuthConfigRetryInterval: 1000
+};
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const createAdapter = async chatSDK => {
+export const createAdapter = async (chatSDK, props) => {
   const chatAdapterOptionalParams = {
     IC3Adapter: {
       options: {
@@ -34,9 +38,14 @@ export const createAdapter = async chatSDK => {
   let adapter = await chatSDK.createChatAdapter(chatAdapterOptionalParams);
   //so far, there is no need to convert to the shim adapter when using visual tests
   if (chatSDK.isMockModeOn !== true) {
+    var _props$webChatContain, _props$webChatContain2, _props$webChatContain3, _props$webChatContain4;
+    const botAuthActivitySubscriberOptionalParams = {
+      fetchBotAuthConfigRetries: (props === null || props === void 0 ? void 0 : (_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : (_props$webChatContain2 = _props$webChatContain.botAuthConfig) === null || _props$webChatContain2 === void 0 ? void 0 : _props$webChatContain2.fetchBotAuthConfigRetries) || defaultBotAuthConfig.fetchBotAuthConfigRetries,
+      fetchBotAuthConfigRetryInterval: (props === null || props === void 0 ? void 0 : (_props$webChatContain3 = props.webChatContainerProps) === null || _props$webChatContain3 === void 0 ? void 0 : (_props$webChatContain4 = _props$webChatContain3.botAuthConfig) === null || _props$webChatContain4 === void 0 ? void 0 : _props$webChatContain4.fetchBotAuthConfigRetryInterval) || defaultBotAuthConfig.fetchBotAuthConfigRetryInterval
+    };
     adapter = new ChatAdapterShim(adapter);
     adapter.addSubscriber(new PauseActivitySubscriber());
-    adapter.addSubscriber(new BotAuthActivitySubscriber());
+    adapter.addSubscriber(new BotAuthActivitySubscriber(botAuthActivitySubscriberOptionalParams));
     // Remove this code after ICM ID:544623085 is fixed
     adapter.addSubscriber(new HiddenAdaptiveCardActivitySubscriber());
     return adapter.chatAdapter;

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

@@ -202,7 +202,7 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
       isStartChatSuccessful = false;
       throw error;
     }
-    await createAdapterAndSubscribe(chatSDK, dispatch, setAdapter);
+    await createAdapterAndSubscribe(chatSDK, dispatch, setAdapter, props);
 
     // Set app state to Active
     if (isStartChatSuccessful) {
@@ -252,10 +252,10 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const createAdapterAndSubscribe = async (chatSDK, dispatch, setAdapter) => {
+const createAdapterAndSubscribe = async (chatSDK, dispatch, setAdapter, props) => {
   var _newAdapter$activity$;
   // New adapter creation
-  const newAdapter = await createAdapter(chatSDK);
+  const newAdapter = await createAdapter(chatSDK, props);
   setAdapter(newAdapter);
   const chatToken = await chatSDK.getChatToken();
   dispatch({

package/lib/esm/components/livechatwidget/interfaces/IBotAuthActivitySubscriberOptionalParams.js

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

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

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

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

@@ -201,7 +201,8 @@ export declare enum TelemetryEvent {
     PostChatContextCallFailed = "PostChatContextCallFailed",
     PostChatSurveyLoadingPaneLoaded = "PostChatSurveyLoadingPaneLoaded",
     PostChatSurveyLoaded = "PostChatSurveyLoaded",
-    ChatDisconnectThreadEventReceived = "ChatDisconnectThreadEventReceived"
+    ChatDisconnectThreadEventReceived = "ChatDisconnectThreadEventReceived",
+    HiddenAdaptiveCardMessageReceived = "HiddenAdaptiveCardMessageReceived"
 }
 export interface TelemetryInput {
     scenarioType: ScenarioType;

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

@@ -1,8 +1,11 @@
 import { IActivitySubscriber } from "./IActivitySubscriber";
+import { IBotAuthActivitySubscriberOptionalParams } from "../../interfaces/IBotAuthActivitySubscriberOptionalParams";
 export declare class BotAuthActivitySubscriber implements IActivitySubscriber {
     observer: any;
     private signInCardSeen;
-    constructor();
+    private fetchBotAuthConfigRetries;
+    private fetchBotAuthConfigRetryInterval;
+    constructor(optionalParams?: IBotAuthActivitySubscriberOptionalParams);
     applicable(activity: any): boolean;
     apply(activity: any): Promise<any>;
     next(activity: any): Promise<any>;

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

@@ -1 +1,2 @@
-export declare const createAdapter: (chatSDK: any) => Promise<any>;
+import { ILiveChatWidgetProps } from "../interfaces/ILiveChatWidgetProps";
+export declare const createAdapter: (chatSDK: any, props?: ILiveChatWidgetProps | undefined) => Promise<any>;

package/lib/types/components/livechatwidget/interfaces/IBotAuthActivitySubscriberOptionalParams.d.ts

@@ -0,0 +1,4 @@
+export interface IBotAuthActivitySubscriberOptionalParams {
+    fetchBotAuthConfigRetries?: number;
+    fetchBotAuthConfigRetryInterval?: number;
+}

package/lib/types/components/webchatcontainerstateful/interfaces/IBotAuthConfig.d.ts

@@ -0,0 +1,4 @@
+export interface IBotAuthConfig {
+    fetchBotAuthConfigRetries?: number;
+    fetchBotAuthConfigRetryInterval?: number;
+}

package/lib/types/components/webchatcontainerstateful/interfaces/IWebChatContainerStatefulProps.d.ts

@@ -5,6 +5,7 @@ import { IStyle } from "@fluentui/react";
 import { IWebChatProps } from "./IWebChatProps";
 import { StyleOptions } from "botframework-webchat-api";
 import { IAdaptiveCardStyles } from "./IAdaptiveCardStyles";
+import { IBotAuthConfig } from "./IBotAuthConfig";
 export interface IWebChatContainerStatefulProps {
     containerStyles?: IStyle;
     disableNewLineMarkdownSupport?: boolean;
@@ -16,6 +17,7 @@ export interface IWebChatContainerStatefulProps {
     renderingMiddlewareProps?: IRenderingMiddlewareProps;
     localizedTexts?: ILiveChatWidgetLocalizedTexts;
     botMagicCode?: IBotMagicCodeConfig;
+    botAuthConfig?: IBotAuthConfig;
     hyperlinkTextOverride?: boolean;
     adaptiveCardStyles?: IAdaptiveCardStyles;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/omnichannel-chat-widget",
-  "version": "1.7.3-main.b61c751",
+  "version": "1.7.3-main.c5e352d",
   "description": "Microsoft Omnichannel Chat Widget",
   "main": "lib/cjs/index.js",
   "types": "lib/types/index.d.ts",
@@ -75,7 +75,7 @@
   },
   "dependencies": {
     "@microsoft/omnichannel-chat-components": "1.1.5",
-    "@microsoft/omnichannel-chat-sdk": "^1.9.6",
+    "@microsoft/omnichannel-chat-sdk": "^1.9.9",
     "abort-controller-es5": "^2.0.1",
     "dompurify": "^2.5.4",
     "markdown-it": "^12.3.2",