@microsoft/omnichannel-chat-widget 0.1.0-main.a7e4e7d → 0.1.0-main.acb91cf

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

@@ -43,10 +43,6 @@ const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat)
 
 
   _omnichannelChatComponents.BroadcastService.getMessageByEventName("LoadPostChatSurvey").subscribe(msg => {
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: _ConversationState.ConversationState.Loading
-    });
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: _ConversationState.ConversationState.Postchat

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

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shareObservable = shareObservable;
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function shareObservable(observable) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let observers = []; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+  let subscription; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+  return new window.Observable(observer => {
+    if (!subscription) {
+      subscription = observable.subscribe({
+        complete() {
+          observers.forEach(observer => observer.complete());
+        },
+
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        error(err) {
+          observers.forEach(observer => observer.error(err));
+        },
+
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        next(value) {
+          observers.forEach(observer => observer.next(value));
+        }
+
+      });
+    }
+
+    observers.push(observer);
+    return () => {
+      observers = observers.filter(o => o !== observer);
+
+      if (!observers.length) {
+        subscription.unsubscribe();
+        subscription = null;
+      }
+    };
+  });
+}

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.prepareStartChat = exports.initStartChat = void 0;
+exports.setPreChatAndInitiateChat = exports.prepareStartChat = exports.initStartChat = void 0;
 
 var _Constants = require("../../../common/Constants");
 
@@ -11,8 +11,6 @@ var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants"
 
 var _ConversationState = require("../../../contexts/common/ConversationState");
 
-var _DataStoreManager = require("../../../common/contextDataStore/DataStoreManager");
-
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
 
 var _NotificationHandler = require("../../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler");
@@ -37,11 +35,21 @@ var _updateSessionDataForTelemetry = require("./updateSessionDataForTelemetry");
 
 var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 
+var _ActivityStreamHandler = require("./ActivityStreamHandler");
+
+var _authHelper = require("./authHelper");
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let optionalParams = {}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
+let widgetInstanceId; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
 const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) => {
-  var _props$reconnectChatP;
+  var _props$controlProps, _props$reconnectChatP;
+
+  optionalParams = {}; //Resetting to ensure no stale values
+
+  widgetInstanceId = props === null || props === void 0 ? void 0 : (_props$controlProps = props.controlProps) === null || _props$controlProps === void 0 ? void 0 : _props$controlProps.widgetInstanceId; // Can connect to existing chat session
 
   if (await canConnectToExistingChat(props, chatSDK, state, dispatch, setAdapter)) {
     return;
@@ -49,60 +57,86 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
 
 
   if ((_props$reconnectChatP = props.reconnectChatPaneProps) !== null && _props$reconnectChatP !== void 0 && _props$reconnectChatP.reconnectId) {
-    var _props$reconnectChatP2, _props$reconnectChatP3;
+    var _props$reconnectChatP2, _props$reconnectChatP3, _props$reconnectChatP4;
 
-    await (0, _reconnectChatHelper.handleRedirectUnauthenticatedReconnectChat)(chatSDK, dispatch, setAdapter, initStartChat, (_props$reconnectChatP2 = props.reconnectChatPaneProps) === null || _props$reconnectChatP2 === void 0 ? void 0 : _props$reconnectChatP2.reconnectId, (_props$reconnectChatP3 = props.reconnectChatPaneProps) === null || _props$reconnectChatP3 === void 0 ? void 0 : _props$reconnectChatP3.redirectInSameWindow);
-  } else {
-    // Getting PreChat Survey Context
-    const parseToJson = false;
-    const preChatSurveyResponse = await chatSDK.getPreChatSurvey(parseToJson);
-    const showPrechat = state.appStates.conversationState === _ConversationState.ConversationState.ProactiveChat ? preChatSurveyResponse && state.appStates.proactiveChatStates.proactiveChatEnablePrechat : preChatSurveyResponse; // Getting reconnectId for authenticated chat
+    await (0, _reconnectChatHelper.handleRedirectUnauthenticatedReconnectChat)(chatSDK, props.chatConfig, props.getAuthToken, dispatch, setAdapter, initStartChat, (_props$reconnectChatP2 = props.reconnectChatPaneProps) === null || _props$reconnectChatP2 === void 0 ? void 0 : _props$reconnectChatP2.isReconnectEnabled, (_props$reconnectChatP3 = props.reconnectChatPaneProps) === null || _props$reconnectChatP3 === void 0 ? void 0 : _props$reconnectChatP3.reconnectId, (_props$reconnectChatP4 = props.reconnectChatPaneProps) === null || _props$reconnectChatP4 === void 0 ? void 0 : _props$reconnectChatP4.redirectInSameWindow);
+    return;
+  } // Getting reconnectId for authenticated chat
 
-    const reconnectId = await (0, _reconnectChatHelper.getReconnectIdForAuthenticatedChat)(props, chatSDK);
 
-    if (reconnectId) {
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_RECONNECT_ID,
-        payload: reconnectId
-      });
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-        payload: _ConversationState.ConversationState.ReconnectChat
-      });
-    } else if (showPrechat) {
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_PRE_CHAT_SURVEY_RESPONSE,
-        payload: preChatSurveyResponse
-      });
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-        payload: _ConversationState.ConversationState.Prechat
-      });
-      setCustomContextParams(props, state);
-    } else {
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-        payload: _ConversationState.ConversationState.Loading
-      });
-      setCustomContextParams(props, state);
-      await initStartChat(chatSDK, dispatch, setAdapter);
-    }
-  }
+  const reconnectId = await (0, _reconnectChatHelper.getReconnectIdForAuthenticatedChat)(props, chatSDK);
+
+  if (reconnectId) {
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_RECONNECT_ID,
+      payload: reconnectId
+    });
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+      payload: _ConversationState.ConversationState.ReconnectChat
+    });
+    return;
+  } // Setting Proactive chat settings
+
+
+  const isProactiveChat = state.appStates.conversationState === _ConversationState.ConversationState.ProactiveChat;
+  const isPreChatEnabledInProactiveChat = state.appStates.proactiveChatStates.proactiveChatEnablePrechat; //Setting PreChat and intiate chat
+
+  setPreChatAndInitiateChat(chatSDK, props.chatConfig, props.getAuthToken, dispatch, setAdapter, isProactiveChat, isPreChatEnabledInProactiveChat);
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
 exports.prepareStartChat = prepareStartChat;
 
-const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedState) => {
+const setPreChatAndInitiateChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, isProactiveChat, proactiveChatEnablePrechatState) => {
+  // Getting prechat Survey Context
+  const parseToJson = false;
+  const preChatSurveyResponse = await chatSDK.getPreChatSurvey(parseToJson);
+  const showPrechat = isProactiveChat ? preChatSurveyResponse && proactiveChatEnablePrechatState : preChatSurveyResponse;
+
+  if (showPrechat) {
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_PRE_CHAT_SURVEY_RESPONSE,
+      payload: preChatSurveyResponse
+    });
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+      payload: _ConversationState.ConversationState.Prechat
+    });
+    return;
+  } //Initiate start chat
+
+
+  dispatch({
+    type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+    payload: _ConversationState.ConversationState.Loading
+  });
+  await initStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter);
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+exports.setPreChatAndInitiateChat = setPreChatAndInitiateChat;
+
+const initStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, params, persistedState) => {
   try {
     var _newAdapter$activity$, _TelemetryTimers$Widg;
 
-    let isStartChatSuccessful = false;
+    const authClientFunction = (0, _authHelper.getAuthClientFunction)(chatConfig);
+
+    if (getAuthToken && authClientFunction) {
+      // set auth token to chat sdk before start chat
+      const authSuccess = await (0, _authHelper.handleAuthentication)(chatSDK, chatConfig, getAuthToken);
+
+      if (!authSuccess) {
+        return;
+      }
+    }
+
+    let isStartChatSuccessful = false; //Check if chat retrieved from cache
 
     if (persistedState || params !== null && params !== void 0 && params.liveChatContext) {
       var _persistedState$domai, _persistedState$domai2, _persistedState$domai3, _persistedState$domai4, _persistedState$domai5;
 
-      // Broadcasting limited cached chat details
       _omnichannelChatComponents.BroadcastService.postMessage({
         eventName: _TelemetryConstants.BroadcastEvent.ChatRetrievedFromCache,
         payload: {
@@ -113,12 +147,15 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
     }
 
     try {
+      //Start widget load timer
       _TelemetryManager.TelemetryTimers.WidgetLoadTimer = (0, _utils.createTimer)();
 
       _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
         Event: _TelemetryConstants.TelemetryEvent.StartChatSDKCall
-      });
+      }); // Set custom context params
 
+
+      setCustomContextParams(chatSDK);
       optionalParams = Object.assign({}, params, optionalParams);
       await chatSDK.startChat(optionalParams);
       isStartChatSuccessful = true;
@@ -130,46 +167,53 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
         }
       });
 
-      isStartChatSuccessful = false;
-    }
+      isStartChatSuccessful = false; // Resetting the widget state to Closed, for recent introduction of OC rate limiting(429 Error) 
+      // TODO : How to diplay a proper UI message to customer to try after sometime at this point - cool down scenario
+
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: _ConversationState.ConversationState.Closed
+      });
+      return;
+    } // New adapter creation
+
 
     const newAdapter = await (0, _createAdapter.createAdapter)(chatSDK);
     setAdapter(newAdapter);
     const chatToken = await chatSDK.getChatToken();
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
+      payload: chatToken
+    });
     newAdapter === null || newAdapter === void 0 ? void 0 : (_newAdapter$activity$ = newAdapter.activity$) === null || _newAdapter$activity$ === void 0 ? void 0 : _newAdapter$activity$.subscribe((0, _newMessageEventHandler.createOnNewAdapterActivityHandler)(chatToken === null || chatToken === void 0 ? void 0 : chatToken.chatId, chatToken === null || chatToken === void 0 ? void 0 : chatToken.visitorId));
 
-    if (!persistedState) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      if (chatSDK !== null && chatSDK !== void 0 && chatSDK.getVoiceVideoCalling) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const chatToken = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatToken());
-        dispatch({
-          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
-          payload: chatToken
-        });
-      } // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
-      const liveChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getCurrentLiveChatContext());
-      dispatch({
-        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
-        payload: liveChatContext
-      });
-      await (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch);
-      await (0, _updateSessionDataForTelemetry.updateSessionDataForTelemetry)(chatSDK, dispatch); // Set app state to Active
-
-      if (isStartChatSuccessful) {
-        dispatch({
-          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-          payload: _ConversationState.ConversationState.Active
-        });
-      }
-    } else {
+    if (persistedState) {
       dispatch({
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_WIDGET_STATE,
         payload: persistedState
       });
       await (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch, true);
+      return;
+    } // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+    const liveChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getCurrentLiveChatContext());
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+      payload: liveChatContext
+    }); // Set post chat context in state, no survey load
+
+    await (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch); // Updating chat session detail for telemetry
+
+    await (0, _updateSessionDataForTelemetry.updateSessionDataForTelemetry)(chatSDK, dispatch); // Set app state to Active
+
+    if (isStartChatSuccessful) {
+      _ActivityStreamHandler.ActivityStreamHandler.uncork();
+
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: _ConversationState.ConversationState.Active
+      });
     }
 
     _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
@@ -198,6 +242,9 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
         payload: _ConversationState.ConversationState.OutOfOffice
       });
     }
+  } finally {
+    optionalParams = {};
+    widgetInstanceId = "";
   }
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
@@ -205,13 +252,16 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
 exports.initStartChat = initStartChat;
 
 const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdapter) => {
-  var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _DataStoreManager$cli, _persistedState$domai6;
+  var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _props$controlProps2, _persistedState$domai6, _persistedState$appSt;
 
-  const widgetStateEventName = (0, _utils.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.DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(widgetStateEventName, "localStorage");
-  const persistedState = widgetStateFromCache ? JSON.parse(widgetStateFromCache) : undefined;
+  // By pass this function in case of popout chat
+  if (state.appStates.skipChatButtonRendering === true) {
+    return false;
+  }
 
-  if (persistedState !== null && persistedState !== void 0 && (_persistedState$domai6 = persistedState.domainStates) !== null && _persistedState$domai6 !== void 0 && _persistedState$domai6.liveChatContext) {
+  const persistedState = (0, _utils.getStateFromCache)(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, (props === null || props === void 0 ? void 0 : (_props$controlProps2 = props.controlProps) === null || _props$controlProps2 === void 0 ? void 0 : _props$controlProps2.widgetInstanceId) ?? ""); //Connect to only active chat session
+
+  if (persistedState && !(0, _utils.isUndefinedOrEmpty)(persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai6 = persistedState.domainStates) === null || _persistedState$domai6 === void 0 ? void 0 : _persistedState$domai6.liveChatContext) && (persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$appSt = persistedState.appStates) === null || _persistedState$appSt === void 0 ? void 0 : _persistedState$appSt.conversationState) === _ConversationState.ConversationState.Active) {
     var _persistedState$domai7;
 
     dispatch({
@@ -221,20 +271,38 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
     const optionalParams = {
       liveChatContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai7 = persistedState.domainStates) === null || _persistedState$domai7 === void 0 ? void 0 : _persistedState$domai7.liveChatContext
     };
-    await initStartChat(chatSDK, dispatch, setAdapter, optionalParams, persistedState);
+    await initStartChat(chatSDK, props.chatConfig, props.getAuthToken, dispatch, setAdapter, optionalParams, persistedState);
     return true;
   } else {
     return false;
   }
-};
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-const setCustomContextParams = (props, state) => {
-  var _props$chatConfig, _state$domainStates;
 
-  // Add custom context if any only for unauthenticated chat
-  if (!((_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && _props$chatConfig.LiveChatConfigAuthSettings) && (_state$domainStates = state.domainStates) !== null && _state$domainStates !== void 0 && _state$domainStates.customContext) {
+const setCustomContextParams = chatSDK => {
+  var _chatSDK$omnichannelC3, _chatSDK$omnichannelC4, _persistedState$domai8;
+
+  // Add custom context only for unauthenticated chat
+  const persistedState = (0, _utils.getStateFromCache)(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, widgetInstanceId ?? "");
+
+  if (!(0, _utils.isUndefinedOrEmpty)(persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai8 = persistedState.domainStates) === null || _persistedState$domai8 === void 0 ? void 0 : _persistedState$domai8.customContext)) {
+    var _persistedState$domai9, _persistedState$domai10;
+
+    if (persistedState !== null && persistedState !== void 0 && (_persistedState$domai9 = persistedState.domainStates.liveChatConfig) !== null && _persistedState$domai9 !== void 0 && _persistedState$domai9.LiveChatConfigAuthSettings) {
+      const errorMessage = "Use of custom context with authenticated chat is deprecated. The chat would not go through.";
+
+      _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.WARN, {
+        Event: _TelemetryConstants.TelemetryEvent.StartChatMethodException,
+        ExceptionDetails: {
+          exception: errorMessage
+        }
+      });
+
+      throw new Error(errorMessage);
+    }
+
     optionalParams = Object.assign({}, optionalParams, {
-      customContext: state.domainStates.customContext
+      customContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai10 = persistedState.domainStates) === null || _persistedState$domai10 === void 0 ? void 0 : _persistedState$domai10.customContext
     });
   }
 };