@microsoft/omnichannel-chat-widget 0.1.0-main.eb80fb1 → 0.1.0-main.ebfc563

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

@@ -3,91 +3,123 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.handleUnauthenticatedReconnectChat = exports.getReconnectIdForAuthenticatedChat = void 0;
-
+exports.isReconnectEnabled = exports.handleChatReconnect = exports.getChatReconnectContext = void 0;
 require("regenerator-runtime/runtime");
-
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
-
-var _Constants = require("../../../common/Constants");
-
+var _authHelper = require("./authHelper");
+var _utils = require("../../../common/utils");
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 var _ConversationState = require("../../../contexts/common/ConversationState");
-
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
-
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const getChatReconnectContext = async (chatSDK, reconnectId) => {
-  try {
-    if (reconnectId) {
-      const chatReconnectOptionalParams = {
-        reconnectId: reconnectId
-      };
-      return await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatReconnectContext(chatReconnectOptionalParams));
-    } else {
-      return await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatReconnectContext());
+const handleChatReconnect = async (chatSDK, props, dispatch, setAdapter, initStartChat, state) => {
+  var _props$chatConfig, _props$chatConfig$Liv;
+  if (!isReconnectEnabled(props.chatConfig)) return;
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const isAuthenticatedChat = (_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && (_props$chatConfig$Liv = _props$chatConfig.LiveChatConfigAuthSettings) !== null && _props$chatConfig$Liv !== void 0 && _props$chatConfig$Liv.msdyn_javascriptclientfunction ? true : false;
+
+  // Get chat reconnect context
+  const reconnectChatContext = await getChatReconnectContext(chatSDK, props.chatConfig, props, isAuthenticatedChat);
+  if (hasReconnectId(reconnectChatContext)) {
+    var _props$reconnectChatP2, _props$reconnectChatP3;
+    //Redirect if enabled
+    if (reconnectChatContext.redirectURL && !(0, _utils.isNullOrEmptyString)(reconnectChatContext.redirectURL)) {
+      var _props$reconnectChatP;
+      redirectPage(reconnectChatContext.redirectURL, (_props$reconnectChatP = props.reconnectChatPaneProps) === null || _props$reconnectChatP === void 0 ? void 0 : _props$reconnectChatP.redirectInSameWindow);
+      return;
     }
-  } catch (ex) {
-    _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
-      Event: _TelemetryConstants.TelemetryEvent.GetChatReconnectContextSDKCallFailed,
-      ExceptionDetails: {
-        exception: ex
-      }
-    });
-  }
-
-  return null;
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
-const getReconnectIdForAuthenticatedChat = async (props, chatSDK) => {
-  var _props$reconnectChatP, _props$reconnectChatP2;
-
-  if ((_props$reconnectChatP = props.reconnectChatPaneProps) !== null && _props$reconnectChatP !== void 0 && _props$reconnectChatP.isReconnectEnabled && (_props$reconnectChatP2 = props.reconnectChatPaneProps) !== null && _props$reconnectChatP2 !== void 0 && _props$reconnectChatP2.authClientFunction // TODO: Implement this after storage is in place
 
-  /* && !isLoadWithState() */
-  ) {
-    const previousActiveSessionResponse = await getChatReconnectContext(chatSDK);
-
-    if (previousActiveSessionResponse && previousActiveSessionResponse.reconnectId) {
-      return previousActiveSessionResponse.reconnectId;
+    //if reconnect id is provided in props, don't show reconnect pane
+    if ((_props$reconnectChatP2 = props.reconnectChatPaneProps) !== null && _props$reconnectChatP2 !== void 0 && _props$reconnectChatP2.reconnectId && !(0, _utils.isNullOrEmptyString)((_props$reconnectChatP3 = props.reconnectChatPaneProps) === null || _props$reconnectChatP3 === void 0 ? void 0 : _props$reconnectChatP3.reconnectId)) {
+      const reconnectChatContext = await getChatReconnectContext(chatSDK, props.chatConfig, props, isAuthenticatedChat);
+      await setReconnectIdAndStartChat(isAuthenticatedChat, chatSDK, props, dispatch, setAdapter, reconnectChatContext.reconnectId ?? "", initStartChat);
+      return;
     }
-  }
-
-  return undefined;
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
-exports.getReconnectIdForAuthenticatedChat = getReconnectIdForAuthenticatedChat;
 
-const handleUnauthenticatedReconnectChat = async (dispatch, reconnectId, initStartChat) => {
-  const reconnectAvailabilityResponse = await getChatReconnectContext(reconnectId);
-
-  if (reconnectAvailabilityResponse && reconnectAvailabilityResponse.redirectURL) {
-    redirectPage(reconnectAvailabilityResponse.redirectURL);
-  } else {
-    const optionalParams = {
-      reconnectId: reconnectId
-    };
+    //show reconnect pane
+    state.appStates.conversationState = _ConversationState.ConversationState.ReconnectChat;
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_RECONNECT_ID,
-      payload: reconnectId
+      payload: reconnectChatContext.reconnectId ?? ""
     });
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: _ConversationState.ConversationState.Loading
+      payload: _ConversationState.ConversationState.ReconnectChat
     });
-    await initStartChat(optionalParams);
+    return;
   }
 };
 
-exports.handleUnauthenticatedReconnectChat = handleUnauthenticatedReconnectChat;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+exports.handleChatReconnect = handleChatReconnect;
+const getChatReconnectContext = async (chatSDK, chatConfig, props, isAuthenticatedChat) => {
+  try {
+    var _props$reconnectChatP4;
+    const chatReconnectOptionalParams = {
+      reconnectId: (_props$reconnectChatP4 = props.reconnectChatPaneProps) === null || _props$reconnectChatP4 === void 0 ? void 0 : _props$reconnectChatP4.reconnectId
+    };
+    if (isAuthenticatedChat) {
+      // Get auth token for for getting chat reconnect context
+      await (0, _authHelper.handleAuthentication)(chatSDK, chatConfig, props.getAuthToken);
+    }
+    const reconnectChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatReconnectContext(chatReconnectOptionalParams));
+    if (isAuthenticatedChat) {
+      // remove auth token after reconnectId is fetched
+      // this will be reset later at start chat
+      (0, _authHelper.removeAuthTokenProvider)(chatSDK);
+    }
+    return reconnectChatContext;
+  } catch (error) {
+    _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
+      Event: _TelemetryConstants.TelemetryEvent.GetChatReconnectContextSDKCallFailed,
+      ExceptionDetails: {
+        exception: error
+      }
+    });
+  }
+};
 
-const redirectPage = newUrl => {
-  const data = {
-    messageName: _Constants.Constants.redirectPageRequest,
-    newUrl: newUrl
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+exports.getChatReconnectContext = getChatReconnectContext;
+const setReconnectIdAndStartChat = async (isAuthenticatedChat, chatSDK, props, dispatch, setAdapter, reconnectId, initStartChat) => {
+  if (!isAuthenticatedChat) {
+    const startUnauthenticatedReconnectChat = {
+      eventName: _TelemetryConstants.BroadcastEvent.StartUnauthenticatedReconnectChat
+    };
+    _omnichannelChatComponents.BroadcastService.postMessage(startUnauthenticatedReconnectChat);
+  }
+  const optionalParams = {
+    reconnectId: reconnectId
   };
-  window.parent.postMessage(data, "*");
+  dispatch({
+    type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_RECONNECT_ID,
+    payload: reconnectId
+  });
+  dispatch({
+    type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+    payload: _ConversationState.ConversationState.Loading
+  });
+  await initStartChat(chatSDK, dispatch, setAdapter, props, optionalParams);
+};
+const redirectPage = (redirectURL, redirectInSameWindow) => {
+  const redirectPageRequest = {
+    eventName: _TelemetryConstants.BroadcastEvent.RedirectPageRequest,
+    payload: {
+      redirectURL: redirectURL
+    }
+  };
+  _omnichannelChatComponents.BroadcastService.postMessage(redirectPageRequest);
+  if (redirectInSameWindow) {
+    window.location.href = redirectURL;
+  }
+};
+const isReconnectEnabled = chatConfig => {
+  var _chatConfig$LiveWSAnd;
+  return chatConfig && ((_chatConfig$LiveWSAnd = chatConfig.LiveWSAndLiveChatEngJoin) === null || _chatConfig$LiveWSAnd === void 0 ? void 0 : _chatConfig$LiveWSAnd.msdyn_enablechatreconnect) && (chatConfig.LiveWSAndLiveChatEngJoin.msdyn_enablechatreconnect === "true" || chatConfig.LiveWSAndLiveChatEngJoin.msdyn_enablechatreconnect === true);
+};
+exports.isReconnectEnabled = isReconnectEnabled;
+const hasReconnectId = reconnectAvailabilityResponse => {
+  return reconnectAvailabilityResponse && !(0, _utils.isNullOrUndefined)(reconnectAvailabilityResponse.reconnectId);
 };

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

@@ -4,68 +4,44 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.registerTelemetryLoggers = void 0;
-
-var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
-
 var _TelemetryManager = require("../../../common/telemetry/TelemetryManager");
-
+var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
-
 var _defaultAriaConfig = require("../../../common/telemetry/defaultConfigs/defaultAriaConfig");
-
 var _defaultTelemetryInternalData = require("../../../common/telemetry/defaultConfigs/defaultTelemetryInternalData");
-
 var _defaultTelemetryConfiguration = require("../../../common/telemetry/defaultConfigs/defaultTelemetryConfiguration");
-
-var _package = require("@microsoft/omnichannel-chat-components/package.json");
-
-var _package2 = require("@microsoft/omnichannel-chat-sdk/package.json");
-
 const registerTelemetryLoggers = (props, dispatch) => {
   var _props$liveChatContex, _props$liveChatContex2;
-
-  let widgetPackageInfo;
-
-  try {
-    widgetPackageInfo = require("@microsoft/omnichannel-chat-widget/package.json");
-  } catch (error) {
-    widgetPackageInfo = "0.0.0-0";
-  }
-
-  const telemetryConfig = { ..._defaultTelemetryConfiguration.defaultTelemetryConfiguration,
+  const telemetryConfig = {
+    ..._defaultTelemetryConfiguration.defaultTelemetryConfiguration,
     ...props.telemetryConfig
   };
-
   if ((_props$liveChatContex = props.liveChatContextFromCache) !== null && _props$liveChatContex !== void 0 && (_props$liveChatContex2 = _props$liveChatContex.domainStates) !== null && _props$liveChatContex2 !== void 0 && _props$liveChatContex2.telemetryInternalData) {
     var _props$liveChatContex3, _props$liveChatContex4;
-
     _TelemetryManager.TelemetryManager.InternalTelemetryData = (_props$liveChatContex3 = props.liveChatContextFromCache) === null || _props$liveChatContex3 === void 0 ? void 0 : (_props$liveChatContex4 = _props$liveChatContex3.domainStates) === null || _props$liveChatContex4 === void 0 ? void 0 : _props$liveChatContex4.telemetryInternalData;
   } else {
     var _props$chatSDK, _props$chatSDK$omnich, _props$chatSDK2, _props$chatSDK2$omnic, _props$chatSDK3, _props$chatSDK3$omnic;
-
-    let telemetryData = { ..._defaultTelemetryInternalData.defaultInternalTelemetryData,
+    let telemetryData = {
+      ..._defaultTelemetryInternalData.defaultInternalTelemetryData,
       telemetryConfig: Object.assign({}, _defaultTelemetryConfiguration.defaultTelemetryConfiguration, telemetryConfig),
       ariaConfig: Object.assign({}, _defaultAriaConfig.defaultAriaConfig, telemetryConfig === null || telemetryConfig === void 0 ? void 0 : telemetryConfig.ariaConfigurations)
     };
-
     if (props.chatConfig) {
       telemetryData = _TelemetryHelper.TelemetryHelper.addChatConfigDataToTelemetry(props === null || props === void 0 ? void 0 : props.chatConfig, telemetryData);
     }
-
     telemetryData = _TelemetryHelper.TelemetryHelper.addWidgetDataToTelemetry(telemetryConfig, telemetryData);
-    telemetryData.OCChatSDKVersion = _package2.version;
-    telemetryData.chatComponentVersion = _package.version;
-    telemetryData.chatWidgetVersion = widgetPackageInfo;
+    telemetryData.OCChatSDKVersion = telemetryConfig.OCChatSDKVersion ?? "0.0.0-0";
+    telemetryData.chatComponentVersion = telemetryConfig.chatComponentVersion ?? "0.0.0-0";
+    telemetryData.chatWidgetVersion = telemetryConfig.chatWidgetVersion ?? "0.0.0-0";
     telemetryData.orgId = (_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;
     telemetryData.widgetId = (_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;
     telemetryData.orgUrl = (_props$chatSDK3 = props.chatSDK) === null || _props$chatSDK3 === void 0 ? void 0 : (_props$chatSDK3$omnic = _props$chatSDK3.omnichannelConfig) === null || _props$chatSDK3$omnic === void 0 ? void 0 : _props$chatSDK3$omnic.orgUrl;
+    _TelemetryManager.TelemetryManager.InternalTelemetryData = telemetryData;
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_TELEMETRY_DATA,
       payload: telemetryData
     });
   }
-
   (0, _TelemetryManager.RegisterLoggers)();
 };
-
 exports.registerTelemetryLoggers = registerTelemetryLoggers;

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

@@ -4,29 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.setPostChatContextAndLoadSurvey = void 0;
-
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
-
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
+var _ConversationState = require("../../../contexts/common/ConversationState");
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
-
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
-
-var _ConversationState = require("../../../contexts/common/ConversationState");
-
-var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat) => {
   try {
     if (!persistedChat) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const context = await chatSDK.getPostChatSurveyContext();
-
       _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
         Event: _TelemetryConstants.TelemetryEvent.PostChatContextCallSucceed,
         Description: "Postchat context call succeed."
       });
-
       dispatch({
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_POST_CHAT_CONTEXT,
         payload: context
@@ -41,16 +33,12 @@ const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat)
     });
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   _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
     });
   });
 };
-
 exports.setPostChatContextAndLoadSurvey = setPostChatContextAndLoadSurvey;

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

@@ -0,0 +1,41 @@
+"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;
+      }
+    };
+  });
+}