@microsoft/omnichannel-chat-widget 0.1.0-main.7a3ed6a → 0.1.0-main.834a4cd

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

@@ -1,78 +1,120 @@
 import "regenerator-runtime/runtime";
-import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
-import { Constants } from "../../../common/Constants";
+import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
+import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
-import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
+import { handleAuthentication, removeAuthTokenProvider } from "./authHelper";
+import { isNullOrEmptyString, isNullOrUndefined } from "../../../common/utils";
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const handleChatReconnect = async (chatSDK, props, dispatch, setAdapter, initStartChat, state) => {
+  var _props$chatConfig, _props$chatConfig$Liv;
+  if (!isReconnectEnabled(props.chatConfig)) return;
 
-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.logSDKEvent(LogLevel.ERROR, {
-      Event: 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;
+  // 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;
 
-  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;
+  // 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 && !isNullOrEmptyString(reconnectChatContext.redirectURL)) {
+      var _props$reconnectChatP;
+      redirectPage(reconnectChatContext.redirectURL, (_props$reconnectChatP = props.reconnectChatPaneProps) === null || _props$reconnectChatP === void 0 ? void 0 : _props$reconnectChatP.redirectInSameWindow);
+      return;
     }
-  }
-
-  return undefined;
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
 
-const handleUnauthenticatedReconnectChat = async (dispatch, reconnectId, initStartChat) => {
-  const reconnectAvailabilityResponse = await getChatReconnectContext(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 && !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;
+    }
 
-  if (reconnectAvailabilityResponse && reconnectAvailabilityResponse.redirectURL) {
-    redirectPage(reconnectAvailabilityResponse.redirectURL);
-  } else {
-    const optionalParams = {
-      reconnectId: reconnectId
-    };
+    //show reconnect pane
+    state.appStates.conversationState = ConversationState.ReconnectChat;
     dispatch({
       type: LiveChatWidgetActionType.SET_RECONNECT_ID,
-      payload: reconnectId
+      payload: reconnectChatContext.reconnectId ?? ""
     });
     dispatch({
       type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: ConversationState.Loading
+      payload: ConversationState.ReconnectChat
     });
-    await initStartChat(optionalParams);
+    return;
   }
 };
 
-const redirectPage = newUrl => {
-  const data = {
-    messageName: Constants.redirectPageRequest,
-    newUrl: newUrl
-  };
-  window.parent.postMessage(data, "*");
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+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 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
+      removeAuthTokenProvider(chatSDK);
+    }
+    return reconnectChatContext;
+  } catch (error) {
+    TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
+      Event: TelemetryEvent.GetChatReconnectContextSDKCallFailed,
+      ExceptionDetails: {
+        exception: error
+      }
+    });
+  }
 };
 
-export { getReconnectIdForAuthenticatedChat, handleUnauthenticatedReconnectChat };
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const setReconnectIdAndStartChat = async (isAuthenticatedChat, chatSDK, props, dispatch, setAdapter, reconnectId, initStartChat) => {
+  if (isAuthenticatedChat) {
+    // Get auth token for for getting chat reconnect context
+    await handleAuthentication(chatSDK, props.chatConfig, props.getAuthToken);
+  } else {
+    const startUnauthenticatedReconnectChat = {
+      eventName: BroadcastEvent.StartUnauthenticatedReconnectChat
+    };
+    BroadcastService.postMessage(startUnauthenticatedReconnectChat);
+  }
+  const optionalParams = {
+    reconnectId: reconnectId
+  };
+  dispatch({
+    type: LiveChatWidgetActionType.SET_RECONNECT_ID,
+    payload: reconnectId
+  });
+  dispatch({
+    type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+    payload: ConversationState.Loading
+  });
+  await initStartChat(chatSDK, props.chatConfig, props.getAuthToken, dispatch, setAdapter, optionalParams);
+};
+const redirectPage = (redirectURL, redirectInSameWindow) => {
+  const redirectPageRequest = {
+    eventName: BroadcastEvent.RedirectPageRequest,
+    payload: {
+      redirectURL: redirectURL
+    }
+  };
+  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);
+};
+const hasReconnectId = reconnectAvailabilityResponse => {
+  return reconnectAvailabilityResponse && !isNullOrUndefined(reconnectAvailabilityResponse.reconnectId);
+};
+export { handleChatReconnect, isReconnectEnabled, getChatReconnectContext };

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

@@ -1,38 +1,40 @@
-import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { RegisterLoggers, TelemetryManager } from "../../../common/telemetry/TelemetryManager";
+import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { defaultAriaConfig } from "../../../common/telemetry/defaultConfigs/defaultAriaConfig";
 import { defaultInternalTelemetryData } from "../../../common/telemetry/defaultConfigs/defaultTelemetryInternalData";
 import { defaultTelemetryConfiguration } from "../../../common/telemetry/defaultConfigs/defaultTelemetryConfiguration";
-import packageInfo from "@microsoft/omnichannel-chat-sdk/package.json";
 export const registerTelemetryLoggers = (props, dispatch) => {
   var _props$liveChatContex, _props$liveChatContex2;
-
-  const telemetryConfig = { ...defaultTelemetryConfiguration,
+  const telemetryConfig = {
+    ...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.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 {
-    let telemetryData = { ...defaultInternalTelemetryData,
+    var _props$chatSDK, _props$chatSDK$omnich, _props$chatSDK2, _props$chatSDK2$omnic, _props$chatSDK3, _props$chatSDK3$omnic;
+    let telemetryData = {
+      ...defaultInternalTelemetryData,
       telemetryConfig: Object.assign({}, defaultTelemetryConfiguration, telemetryConfig),
       ariaConfig: Object.assign({}, defaultAriaConfig, telemetryConfig === null || telemetryConfig === void 0 ? void 0 : telemetryConfig.ariaConfigurations)
     };
-
     if (props.chatConfig) {
       telemetryData = TelemetryHelper.addChatConfigDataToTelemetry(props === null || props === void 0 ? void 0 : props.chatConfig, telemetryData);
     }
-
     telemetryData = TelemetryHelper.addWidgetDataToTelemetry(telemetryConfig, telemetryData);
-    telemetryData.OCChatSDKVersion = packageInfo.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.InternalTelemetryData = telemetryData;
     dispatch({
       type: LiveChatWidgetActionType.SET_TELEMETRY_DATA,
       payload: telemetryData
     });
   }
-
   RegisterLoggers();
 };

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

@@ -1,20 +1,24 @@
 import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
+import { BroadcastService } from "@microsoft/omnichannel-chat-components";
+import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
-import { ConversationState } from "../../../contexts/common/ConversationState"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-export const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, loadSurvey) => {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat) => {
   try {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const context = await chatSDK.getPostChatSurveyContext();
-    TelemetryHelper.logSDKEvent(LogLevel.INFO, {
-      Event: TelemetryEvent.PostChatContextCallSucceed,
-      Description: "Postchat context call succeed."
-    });
-    dispatch({
-      type: LiveChatWidgetActionType.SET_POST_CHAT_CONTEXT,
-      payload: context
-    });
+    if (!persistedChat) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const context = await chatSDK.getPostChatSurveyContext();
+      TelemetryHelper.logSDKEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.PostChatContextCallSucceed,
+        Description: "Postchat context call succeed."
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_POST_CHAT_CONTEXT,
+        payload: context
+      });
+    }
   } catch (ex) {
     TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
       Event: TelemetryEvent.PostChatContextCallFailed,
@@ -23,18 +27,12 @@ export const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, loadSur
       }
     });
   }
-  /* -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 
-  */
 
-
-  if (loadSurvey) {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  BroadcastService.getMessageByEventName("LoadPostChatSurvey").subscribe(msg => {
     dispatch({
       type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: ConversationState.Postchat
     });
-  }
+  });
 };

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

@@ -0,0 +1,35 @@
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export 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;
+      }
+    };
+  });
+}