@microsoft/omnichannel-chat-widget 0.1.0-main.1a61ea0 → 0.1.0-main.1f10a2e

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

@@ -5,12 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.prepareStartChat = exports.initStartChat = void 0;
 
-var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
-
 var _Constants = require("../../../common/Constants");
 
+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");
@@ -23,93 +25,153 @@ var _TelemetryManager = require("../../../common/telemetry/TelemetryManager");
 
 var _createAdapter = require("./createAdapter");
 
+var _newMessageEventHandler = require("../../../plugins/newMessageEventHandler");
+
 var _utils = require("../../../common/utils");
 
 var _reconnectChatHelper = require("./reconnectChatHelper");
 
+var _setPostChatContextAndLoadSurvey = require("./setPostChatContextAndLoadSurvey");
+
 var _updateSessionDataForTelemetry = require("./updateSessionDataForTelemetry");
 
-var _setPostChatContextAndLoadSurvey = require("./setPostChatContextAndLoadSurvey");
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
+let optionalParams = {}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
 const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) => {
-  // 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
+  var _props$reconnectChatP;
 
-  const reconnectId = await (0, _reconnectChatHelper.getReconnectIdForAuthenticatedChat)(props, chatSDK);
+  if (await canConnectToExistingChat(props, chatSDK, state, dispatch, setAdapter)) {
+    return;
+  } // Redirecting if unauthenticated reconnect chat expired
 
-  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
-    });
+
+  if ((_props$reconnectChatP = props.reconnectChatPaneProps) !== null && _props$reconnectChatP !== void 0 && _props$reconnectChatP.reconnectId) {
+    var _props$reconnectChatP2, _props$reconnectChatP3;
+
+    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 {
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: _ConversationState.ConversationState.Loading
-    });
-    await initStartChat(chatSDK, dispatch, setAdapter);
+    // 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
+
+    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);
+    }
   }
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
 exports.prepareStartChat = prepareStartChat;
 
-const initStartChat = async (chatSDK, dispatch, setAdapter, params) => {
+const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedState) => {
   try {
-    var _TelemetryTimers$Widg;
+    var _newAdapter$activity$, _TelemetryTimers$Widg;
+
+    let isStartChatSuccessful = false;
+
+    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: {
+          chatId: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai = persistedState.domainStates) === null || _persistedState$domai === void 0 ? void 0 : (_persistedState$domai2 = _persistedState$domai.liveChatContext) === null || _persistedState$domai2 === void 0 ? void 0 : (_persistedState$domai3 = _persistedState$domai2.chatToken) === null || _persistedState$domai3 === void 0 ? void 0 : _persistedState$domai3.chatId,
+          requestId: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai4 = persistedState.domainStates) === null || _persistedState$domai4 === void 0 ? void 0 : (_persistedState$domai5 = _persistedState$domai4.liveChatContext) === null || _persistedState$domai5 === void 0 ? void 0 : _persistedState$domai5.requestId
+        }
+      });
+    }
 
     try {
-      _TelemetryHelper.TelemetryHelper.logConfigDataEvent(_TelemetryConstants.LogLevel.INFO, {
+      _TelemetryManager.TelemetryTimers.WidgetLoadTimer = (0, _utils.createTimer)();
+
+      _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
         Event: _TelemetryConstants.TelemetryEvent.StartChatSDKCall
       });
 
-      await chatSDK.startChat(params);
-      _TelemetryManager.TelemetryTimers.WidgetLoadTimer = (0, _utils.createTimer)();
+      optionalParams = Object.assign({}, params, optionalParams);
+      await chatSDK.startChat(optionalParams);
+      isStartChatSuccessful = true;
     } catch (error) {
-      _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.ERROR, {
+      _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
         Event: _TelemetryConstants.TelemetryEvent.StartChatMethodException,
         ExceptionDetails: {
           exception: `Failed to setup startChat: ${error}`
         }
       });
+
+      isStartChatSuccessful = false;
     }
 
     const newAdapter = await (0, _createAdapter.createAdapter)(chatSDK);
-    setAdapter(newAdapter); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    setAdapter(newAdapter);
+    const chatToken = await chatSDK.getChatToken();
+    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 (chatSDK !== null && chatSDK !== void 0 && chatSDK.getVoiceVideoCalling) {
+    if (!persistedState) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const chatToken = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatToken());
+      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_CHAT_TOKEN,
-        payload: chatToken
+        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 {
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_WIDGET_STATE,
+        payload: persistedState
+      });
+      await (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch, true);
     }
 
-    await (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch, false);
-    await (0, _updateSessionDataForTelemetry.updateSessionDataForTelemetry)(chatSDK, dispatch); // Set app state to Active
-
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: _ConversationState.ConversationState.Active
-    });
-
     _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
       Event: _TelemetryConstants.TelemetryEvent.WidgetLoadComplete,
       Description: "Widget load complete",
@@ -117,9 +179,9 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params) => {
     });
   } catch (ex) {
     _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.ERROR, {
-      Event: _TelemetryConstants.TelemetryEvent.StartChatFailed,
+      Event: _TelemetryConstants.TelemetryEvent.WidgetLoadFailed,
       ExceptionDetails: {
-        Exception: `Start Chat Failed: ${ex}`
+        Exception: `Widget load Failed: ${ex}`
       }
     });
 
@@ -137,6 +199,42 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params) => {
       });
     }
   }
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+exports.initStartChat = initStartChat;
+
+const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdapter) => {
+  var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _DataStoreManager$cli, _persistedState$domai6;
+
+  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;
+
+  if (persistedState !== null && persistedState !== void 0 && (_persistedState$domai6 = persistedState.domainStates) !== null && _persistedState$domai6 !== void 0 && _persistedState$domai6.liveChatContext) {
+    var _persistedState$domai7;
+
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+      payload: _ConversationState.ConversationState.Loading
+    });
+    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);
+    return true;
+  } else {
+    return false;
+  }
 };
 
-exports.initStartChat = initStartChat;
+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) {
+    optionalParams = Object.assign({}, optionalParams, {
+      customContext: state.domainStates.customContext
+    });
+  }
+};

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

@@ -16,12 +16,12 @@ var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
 var _TelemetryManager = require("../../../common/telemetry/TelemetryManager");
 
 // Defines startProactiveChat callback
-const startProactiveChat = (dispatch, bodyTitle, showPrechat, inNewWindow) => {
+const startProactiveChat = (dispatch, notificationConfig, enablePreChat, inNewWindow) => {
   dispatch({
     type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_PROACTIVE_CHAT_PARAMS,
     payload: {
-      proactiveChatBodyTitle: bodyTitle ?? "",
-      proactiveChatEnablePrechat: showPrechat ?? false,
+      proactiveChatBodyTitle: notificationConfig && notificationConfig.message ? notificationConfig.message : "",
+      proactiveChatEnablePrechat: enablePreChat ?? false,
       proactiveChatInNewWindow: inNewWindow ?? false
     }
   });