@microsoft/omnichannel-chat-widget 0.1.0-main.edd8c2a → 0.1.0-main.fdf1fdf

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

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.handleUnauthenticatedReconnectChat = exports.getReconnectIdForAuthenticatedChat = void 0;
+exports.startUnauthenticatedReconnectChat = exports.handleUnauthenticatedReconnectChat = exports.handleRedirectUnauthenticatedReconnectChat = exports.getReconnectIdForAuthenticatedChat = exports.getChatReconnectContext = void 0;
 
 require("regenerator-runtime/runtime");
 
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
 
-var _Constants = require("../../../common/Constants");
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 
 var _ConversationState = require("../../../contexts/common/ConversationState");
 
@@ -17,38 +17,60 @@ var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidget
 
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
 
+var _authHelper = require("./authHelper");
+
 // 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());
-    }
-  } catch (ex) {
-    _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
-      Event: _TelemetryConstants.TelemetryEvent.GetChatReconnectContextSDKCallFailed,
-      ExceptionDetails: {
-        exception: ex
+const getChatReconnectContext = async (chatSDK, chatConfig, getAuthToken, isReconnectEnabled, reconnectId) => {
+  if (isReconnectEnabled) {
+    try {
+      if (reconnectId) {
+        const chatReconnectOptionalParams = {
+          reconnectId: reconnectId
+        };
+        return await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatReconnectContext(chatReconnectOptionalParams));
+      } else {
+        // set auth token to chat sdk to get reconnectId for auth chat
+        await (0, _authHelper.handleAuthentication)(chatSDK, chatConfig, getAuthToken);
+        const reconnectChatContext = await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.getChatReconnectContext()); // remove auth token after reconnectId is fetched
+        // this will be reset later at start chat
+
+        (0, _authHelper.removeAuthTokenProvider)(chatSDK);
+        return reconnectChatContext;
       }
-    });
+    } 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
 
 
+exports.getChatReconnectContext = getChatReconnectContext;
+
 const getReconnectIdForAuthenticatedChat = async (props, chatSDK) => {
-  var _props$reconnectChatP, _props$reconnectChatP2;
+  var _props$chatConfig, _props$reconnectChatP;
+
+  let authClientFunction = undefined;
 
-  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
+  if ((_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && _props$chatConfig.LiveChatConfigAuthSettings) {
+    var _props$chatConfig2, _props$chatConfig2$Li;
+
+    authClientFunction = ((_props$chatConfig2 = props.chatConfig) === null || _props$chatConfig2 === void 0 ? void 0 : (_props$chatConfig2$Li = _props$chatConfig2.LiveChatConfigAuthSettings) === null || _props$chatConfig2$Li === void 0 ? void 0 : _props$chatConfig2$Li.msdyn_javascriptclientfunction) ?? undefined;
+  }
+
+  if ((_props$reconnectChatP = props.reconnectChatPaneProps) !== null && _props$reconnectChatP !== void 0 && _props$reconnectChatP.isReconnectEnabled && authClientFunction // TODO: Implement this after storage is in place
 
   /* && !isLoadWithState() */
   ) {
-    const previousActiveSessionResponse = await getChatReconnectContext(chatSDK);
+    var _props$reconnectChatP2;
+
+    const previousActiveSessionResponse = await getChatReconnectContext(chatSDK, props.chatConfig, props.getAuthToken, (_props$reconnectChatP2 = props.reconnectChatPaneProps) === null || _props$reconnectChatP2 === void 0 ? void 0 : _props$reconnectChatP2.isReconnectEnabled);
 
     if (previousActiveSessionResponse && previousActiveSessionResponse.reconnectId) {
       return previousActiveSessionResponse.reconnectId;
@@ -61,33 +83,116 @@ const getReconnectIdForAuthenticatedChat = async (props, chatSDK) => {
 
 exports.getReconnectIdForAuthenticatedChat = getReconnectIdForAuthenticatedChat;
 
-const handleUnauthenticatedReconnectChat = async (dispatch, reconnectId, initStartChat) => {
-  const reconnectAvailabilityResponse = await getChatReconnectContext(reconnectId);
+const handleUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, isReconnectEnabled, reconnectId, initStartChat, redirectInSameWindow) => {
+  const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, chatConfig, getAuthToken, isReconnectEnabled, reconnectId);
 
-  if (reconnectAvailabilityResponse && reconnectAvailabilityResponse.redirectURL) {
-    redirectPage(reconnectAvailabilityResponse.redirectURL);
+  if (shouldRedirectOrStartNewChat(reconnectAvailabilityResponse)) {
+    await redirectOrStartNewChat(reconnectAvailabilityResponse, chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, redirectInSameWindow);
   } else {
-    const optionalParams = {
-      reconnectId: reconnectId
-    };
+    await setReconnectIdAndStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat);
+  }
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+exports.handleUnauthenticatedReconnectChat = handleUnauthenticatedReconnectChat;
+
+const startUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, isReconnectEnabled, reconnectId, initStartChat) => {
+  const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, chatConfig, getAuthToken, isReconnectEnabled, reconnectId);
+
+  if (!shouldRedirectOrStartNewChat(reconnectAvailabilityResponse)) {
+    await setReconnectIdAndStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat);
+  }
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+exports.startUnauthenticatedReconnectChat = startUnauthenticatedReconnectChat;
+
+const setReconnectIdAndStartChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, reconnectId, initStartChat) => {
+  const startUnauthenticatedReconnectChat = {
+    eventName: _TelemetryConstants.BroadcastEvent.StartUnauthenticatedReconnectChat
+  };
+
+  _omnichannelChatComponents.BroadcastService.postMessage(startUnauthenticatedReconnectChat);
+
+  const optionalParams = {
+    reconnectId: reconnectId
+  };
+  dispatch({
+    type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_RECONNECT_ID,
+    payload: reconnectId
+  });
+  dispatch({
+    type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+    payload: _ConversationState.ConversationState.Loading
+  });
+  await initStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, 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 shouldRedirectOrStartNewChat = reconnectAvailabilityResponse => {
+  return reconnectAvailabilityResponse && !reconnectAvailabilityResponse.reconnectId;
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+const startNewChatEmptyRedirectionUrl = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat) => {
+  const startUnauthenticatedReconnectChat = {
+    eventName: _TelemetryConstants.BroadcastEvent.StartUnauthenticatedReconnectChat
+  };
+
+  _omnichannelChatComponents.BroadcastService.postMessage(startUnauthenticatedReconnectChat); // Getting PreChat Survey Context
+
+
+  const parseToJson = false;
+  const preChatSurveyResponse = await chatSDK.getPreChatSurvey(parseToJson);
+
+  if (preChatSurveyResponse) {
     dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_RECONNECT_ID,
-      payload: reconnectId
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_PRE_CHAT_SURVEY_RESPONSE,
+      payload: preChatSurveyResponse
     });
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+      payload: _ConversationState.ConversationState.Prechat
+    });
+  } else {
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: _ConversationState.ConversationState.Loading
     });
-    await initStartChat(optionalParams);
+    await initStartChat(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter);
   }
-};
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-exports.handleUnauthenticatedReconnectChat = handleUnauthenticatedReconnectChat;
 
-const redirectPage = newUrl => {
-  const data = {
-    messageName: _Constants.Constants.redirectPageRequest,
-    newUrl: newUrl
-  };
-  window.parent.postMessage(data, "*");
+const handleRedirectUnauthenticatedReconnectChat = async (chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, isReconnectEnabled, reconnectId, redirectInSameWindow) => {
+  const reconnectAvailabilityResponse = await getChatReconnectContext(chatSDK, chatConfig, getAuthToken, isReconnectEnabled, reconnectId);
+
+  if (shouldRedirectOrStartNewChat(reconnectAvailabilityResponse)) {
+    await redirectOrStartNewChat(reconnectAvailabilityResponse, chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, redirectInSameWindow);
+  }
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+exports.handleRedirectUnauthenticatedReconnectChat = handleRedirectUnauthenticatedReconnectChat;
+
+const redirectOrStartNewChat = async (reconnectAvailabilityResponse, chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat, redirectInSameWindow) => {
+  if (reconnectAvailabilityResponse.redirectURL) {
+    redirectPage(reconnectAvailabilityResponse.redirectURL, redirectInSameWindow);
+  } else {
+    await startNewChatEmptyRedirectionUrl(chatSDK, chatConfig, getAuthToken, dispatch, setAdapter, initStartChat);
+  }
 };

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

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 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");
@@ -17,10 +17,6 @@ var _defaultTelemetryInternalData = require("../../../common/telemetry/defaultCo
 
 var _defaultTelemetryConfiguration = require("../../../common/telemetry/defaultConfigs/defaultTelemetryConfiguration");
 
-var _package = _interopRequireDefault(require("@microsoft/omnichannel-chat-sdk/package.json"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const registerTelemetryLoggers = (props, dispatch) => {
   var _props$liveChatContex, _props$liveChatContex2;
 
@@ -33,6 +29,8 @@ const registerTelemetryLoggers = (props, dispatch) => {
 
     _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,
       telemetryConfig: Object.assign({}, _defaultTelemetryConfiguration.defaultTelemetryConfiguration, telemetryConfig),
       ariaConfig: Object.assign({}, _defaultAriaConfig.defaultAriaConfig, telemetryConfig === null || telemetryConfig === void 0 ? void 0 : telemetryConfig.ariaConfigurations)
@@ -43,7 +41,13 @@ const registerTelemetryLoggers = (props, dispatch) => {
     }
 
     telemetryData = _TelemetryHelper.TelemetryHelper.addWidgetDataToTelemetry(telemetryConfig, telemetryData);
-    telemetryData.OCChatSDKVersion = _package.default.version;
+    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

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

@@ -7,27 +7,31 @@ 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");
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, loadSurvey) => {
+const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat) => {
   try {
-    // 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
-    });
+    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
+      });
+    }
   } catch (ex) {
     _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
       Event: _TelemetryConstants.TelemetryEvent.PostChatContextCallFailed,
@@ -35,21 +39,15 @@ const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, loadSurvey) =>
         exception: ex
       }
     });
-  }
-  /* -true:   setPostChatContextAndLoadSurvey is called after passing all checks from ConfirmationPane and endChatMiddleware in usual scenario.
-     -false:  Below if condition is needed for multi-tab scenarios. So when agent ends a chat and customer has opened chat in multiple tabs,  
-              all tabs should show post chat survey as per existing functionality. But when an agent end a conversation, Omnichannel SDK 
-              getPostChatSurveyContext returns as invalid conversation. To avoid that, caching the survey url is needed after chat starts and 
-              in this case loadSurvey is false 
-  */
+  } // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
 
-  if (loadSurvey) {
+  _omnichannelChatComponents.BroadcastService.getMessageByEventName("LoadPostChatSurvey").subscribe(msg => {
     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,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;
+      }
+    };
+  });
+}