@microsoft/omnichannel-chat-sdk 1.0.1-main.90a4f94 → 1.0.1-main.980a629

package/lib/OmnichannelChatSDK.js

@@ -65,6 +65,7 @@ var AMSFileManager_1 = require("./external/ACSAdapter/AMSFileManager");
 var CallingOptionsOptionSetNumber_1 = require("./core/CallingOptionsOptionSetNumber");
 var ChatAdapterProtocols_1 = require("./core/messaging/ChatAdapterProtocols");
 var ConversationMode_1 = require("./core/ConversationMode");
+var createChannelDataEgressMiddleware_1 = require("./external/ACSAdapter/createChannelDataEgressMiddleware");
 var createFormatEgressTagsMiddleware_1 = require("./external/ACSAdapter/createFormatEgressTagsMiddleware");
 var createFormatIngressTagsMiddleware_1 = require("./external/ACSAdapter/createFormatIngressTagsMiddleware");
 var DeliveryMode_1 = require("@microsoft/omnichannel-ic3core/lib/model/DeliveryMode");
@@ -75,6 +76,7 @@ var LiveChatVersion_1 = require("./core/LiveChatVersion");
 var LiveWorkItemState_1 = require("./core/LiveWorkItemState");
 var MessageContentType_1 = require("@microsoft/omnichannel-ic3core/lib/model/MessageContentType");
 var MessageType_1 = require("@microsoft/omnichannel-ic3core/lib/model/MessageType");
+var OmnichannelErrorCodes_1 = require("./core/OmnichannelErrorCodes");
 var PersonType_1 = require("@microsoft/omnichannel-ic3core/lib/model/PersonType");
 var ProtocoleType_1 = require("@microsoft/omnichannel-ic3core/lib/interfaces/ProtocoleType");
 var ScenarioMarker_1 = require("./telemetry/ScenarioMarker");
@@ -92,7 +94,7 @@ var OmnichannelConfigValidator_1 = require("./validators/OmnichannelConfigValida
 var OmnichannelChatSDK = /** @class */ (function () {
     function OmnichannelChatSDK(omnichannelConfig, chatSDKConfig) {
         if (chatSDKConfig === void 0) { chatSDKConfig = SDKConfigValidators_1.defaultChatSDKConfig; }
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         this.ACSClient = null;
         this.AMSClient = null;
         this.authSettings = null;
@@ -104,16 +106,19 @@ var OmnichannelChatSDK = /** @class */ (function () {
         this.ocSdkLogger = null;
         this.acsClientLogger = null;
         this.acsAdapterLogger = null;
+        this.callingSdkLogger = null;
         this.isPersistentChat = false;
         this.isChatReconnect = false;
         this.reconnectId = null;
         this.refreshTokenTimer = null;
         this.debug = false;
+        this.runtimeId = ocsdk_1.uuidv4();
         this.omnichannelConfig = omnichannelConfig;
         this.chatSDKConfig = __assign(__assign({}, SDKConfigValidators_1.defaultChatSDKConfig), chatSDKConfig // overrides
         );
         this.isInitialized = false;
         this.liveChatVersion = LiveChatVersion_1.default.V1;
+        this.localeId = locale_1.defaultLocaleId;
         this.requestId = ocsdk_1.uuidv4();
         this.chatToken = {};
         this.liveChatConfig = {};
@@ -126,11 +131,19 @@ var OmnichannelChatSDK = /** @class */ (function () {
         this.ocSdkLogger = loggers_1.createOCSDKLogger(this.omnichannelConfig);
         this.acsClientLogger = loggers_1.createACSClientLogger(this.omnichannelConfig);
         this.acsAdapterLogger = loggers_1.createACSAdapterLogger(this.omnichannelConfig);
+        this.callingSdkLogger = loggers_1.createCallingSDKLogger(this.omnichannelConfig);
         this.scenarioMarker.useTelemetry(this.telemetry);
         this.ic3ClientLogger.useTelemetry(this.telemetry);
         this.ocSdkLogger.useTelemetry(this.telemetry);
         this.acsClientLogger.useTelemetry(this.telemetry);
         this.acsAdapterLogger.useTelemetry(this.telemetry);
+        this.callingSdkLogger.useTelemetry(this.telemetry);
+        this.scenarioMarker.setRuntimeId(this.runtimeId);
+        this.ic3ClientLogger.setRuntimeId(this.runtimeId);
+        this.ocSdkLogger.setRuntimeId(this.runtimeId);
+        this.acsClientLogger.setRuntimeId(this.runtimeId);
+        this.acsAdapterLogger.setRuntimeId(this.runtimeId);
+        this.callingSdkLogger.setRuntimeId(this.runtimeId);
         OmnichannelConfigValidator_1.default(omnichannelConfig);
         SDKConfigValidators_1.default(chatSDKConfig);
         ((_a = this.chatSDKConfig.telemetry) === null || _a === void 0 ? void 0 : _a.disable) && ((_b = this.telemetry) === null || _b === void 0 ? void 0 : _b.disable());
@@ -141,10 +154,11 @@ var OmnichannelChatSDK = /** @class */ (function () {
         (_e = this.ocSdkLogger) === null || _e === void 0 ? void 0 : _e.setRequestId(this.requestId);
         (_f = this.acsClientLogger) === null || _f === void 0 ? void 0 : _f.setRequestId(this.requestId);
         (_g = this.acsAdapterLogger) === null || _g === void 0 ? void 0 : _g.setRequestId(this.requestId);
+        (_h = this.callingSdkLogger) === null || _h === void 0 ? void 0 : _h.setRequestId(this.requestId);
     }
     /* istanbul ignore next */
     OmnichannelChatSDK.prototype.setDebug = function (flag) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         this.debug = flag;
         (_a = this.AMSClient) === null || _a === void 0 ? void 0 : _a.setDebug(flag);
         (_b = this.telemetry) === null || _b === void 0 ? void 0 : _b.setDebug(flag);
@@ -153,6 +167,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
         (_d = this.ocSdkLogger) === null || _d === void 0 ? void 0 : _d.setDebug(flag);
         (_e = this.acsClientLogger) === null || _e === void 0 ? void 0 : _e.setDebug(flag);
         (_f = this.acsAdapterLogger) === null || _f === void 0 ? void 0 : _f.setDebug(flag);
+        (_g = this.callingSdkLogger) === null || _g === void 0 ? void 0 : _g.setDebug(flag);
     };
     OmnichannelChatSDK.prototype.initialize = function () {
         return __awaiter(this, void 0, void 0, function () {
@@ -291,47 +306,55 @@ var OmnichannelChatSDK = /** @class */ (function () {
         });
     };
     OmnichannelChatSDK.prototype.startChat = function (optionalParams) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         if (optionalParams === void 0) { optionalParams = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var reconnectableChatsParams, reconnectableChatsResponse, _p, exceptionDetails, conversationDetails, exceptionDetails, exceptionDetails, sessionInitOptionalParams, error_3, exceptionDetails, chatAdapterConfig, error_4, exceptionDetails, _q, error_5, exceptionDetails, error_6, exceptionDetails, error_7, exceptionDetails, _r, error_8, exceptionDetails;
+            var shouldReinitIC3Client, _t, reconnectableChatsParams, reconnectableChatsResponse, _u, exceptionDetails, conversationDetails, exceptionDetails, exceptionDetails, sessionInitOptionalParams, error_3, exceptionDetails, chatAdapterConfig, error_4, exceptionDetails, _v, error_5, exceptionDetails, error_6, exceptionDetails, error_7, exceptionDetails, _w, error_8, exceptionDetails;
             var _this = this;
-            return __generator(this, function (_s) {
-                switch (_s.label) {
+            return __generator(this, function (_x) {
+                switch (_x.label) {
                     case 0:
                         this.scenarioMarker.startScenario(TelemetryEvent_1.default.StartChat, {
                             RequestId: this.requestId
                         });
+                        shouldReinitIC3Client = !platform_1.default.isNode() && !platform_1.default.isReactNative() && !this.IC3Client && this.liveChatVersion === LiveChatVersion_1.default.V1;
+                        if (!shouldReinitIC3Client) return [3 /*break*/, 2];
+                        _t = this;
+                        return [4 /*yield*/, this.getIC3Client()];
+                    case 1:
+                        _t.IC3Client = _x.sent();
+                        _x.label = 2;
+                    case 2:
                         if (this.isChatReconnect && !((_a = this.chatSDKConfig.chatReconnect) === null || _a === void 0 ? void 0 : _a.disable) && !this.isPersistentChat && optionalParams.reconnectId) {
                             this.reconnectId = optionalParams.reconnectId;
                         }
-                        if (!(this.isPersistentChat && !((_b = this.chatSDKConfig.persistentChat) === null || _b === void 0 ? void 0 : _b.disable))) return [3 /*break*/, 4];
-                        _s.label = 1;
-                    case 1:
-                        _s.trys.push([1, 3, , 4]);
+                        if (!(this.isPersistentChat && !((_b = this.chatSDKConfig.persistentChat) === null || _b === void 0 ? void 0 : _b.disable))) return [3 /*break*/, 6];
+                        _x.label = 3;
+                    case 3:
+                        _x.trys.push([3, 5, , 6]);
                         reconnectableChatsParams = {
                             authenticatedUserToken: this.authenticatedUserToken
                         };
                         return [4 /*yield*/, this.OCClient.getReconnectableChats(reconnectableChatsParams)];
-                    case 2:
-                        reconnectableChatsResponse = _s.sent();
+                    case 4:
+                        reconnectableChatsResponse = _x.sent();
                         if (reconnectableChatsResponse && reconnectableChatsResponse.reconnectid) {
                             this.reconnectId = reconnectableChatsResponse.reconnectid;
                         }
-                        return [3 /*break*/, 4];
-                    case 3:
-                        _p = _s.sent();
+                        return [3 /*break*/, 6];
+                    case 5:
+                        _u = _x.sent();
                         exceptionDetails = {
                             response: "OCClientGetReconnectableChatsFailed"
                         };
                         throw Error(exceptionDetails.response);
-                    case 4:
-                        if (!(optionalParams.liveChatContext && !this.reconnectId)) return [3 /*break*/, 6];
+                    case 6:
+                        if (!(optionalParams.liveChatContext && !this.reconnectId)) return [3 /*break*/, 8];
                         this.chatToken = optionalParams.liveChatContext.chatToken || {};
                         this.requestId = optionalParams.liveChatContext.requestId || ocsdk_1.uuidv4();
                         return [4 /*yield*/, this.getConversationDetails()];
-                    case 5:
-                        conversationDetails = _s.sent();
+                    case 7:
+                        conversationDetails = _x.sent();
                         if (Object.keys(conversationDetails).length === 0) {
                             exceptionDetails = {
                                 response: "InvalidConversation"
@@ -356,25 +379,27 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             console.error("Unable to join conversation that's in '" + conversationDetails.state + "' state");
                             throw Error(exceptionDetails.response);
                         }
-                        _s.label = 6;
-                    case 6:
-                        if (!(this.chatToken && Object.keys(this.chatToken).length === 0)) return [3 /*break*/, 8];
-                        return [4 /*yield*/, this.getChatToken(false)];
-                    case 7:
-                        _s.sent();
-                        _s.label = 8;
+                        _x.label = 8;
                     case 8:
+                        if (!(this.chatToken && Object.keys(this.chatToken).length === 0)) return [3 /*break*/, 10];
+                        return [4 /*yield*/, this.getChatToken(false)];
+                    case 9:
+                        _x.sent();
+                        _x.label = 10;
+                    case 10:
                         (_c = this.ic3ClientLogger) === null || _c === void 0 ? void 0 : _c.setChatId(this.chatToken.chatId || '');
                         (_d = this.ocSdkLogger) === null || _d === void 0 ? void 0 : _d.setChatId(this.chatToken.chatId || '');
                         (_e = this.acsClientLogger) === null || _e === void 0 ? void 0 : _e.setChatId(this.chatToken.chatId || '');
                         (_f = this.acsAdapterLogger) === null || _f === void 0 ? void 0 : _f.setChatId(this.chatToken.chatId || '');
+                        (_g = this.callingSdkLogger) === null || _g === void 0 ? void 0 : _g.setChatId(this.chatToken.chatId || '');
                         sessionInitOptionalParams = {
                             initContext: {}
                         };
-                        if (this.isPersistentChat && !((_g = this.chatSDKConfig.persistentChat) === null || _g === void 0 ? void 0 : _g.disable)) {
+                        sessionInitOptionalParams.initContext.locale = locale_1.getLocaleStringFromId(this.localeId);
+                        if (this.isPersistentChat && !((_h = this.chatSDKConfig.persistentChat) === null || _h === void 0 ? void 0 : _h.disable)) {
                             sessionInitOptionalParams.reconnectId = this.reconnectId;
                         }
-                        if (this.isChatReconnect && !((_h = this.chatSDKConfig.chatReconnect) === null || _h === void 0 ? void 0 : _h.disable) && !this.isPersistentChat) {
+                        if (this.isChatReconnect && !((_j = this.chatSDKConfig.chatReconnect) === null || _j === void 0 ? void 0 : _j.disable) && !this.isPersistentChat) {
                             sessionInitOptionalParams.reconnectId = this.reconnectId;
                         }
                         if (optionalParams.customContext) {
@@ -402,28 +427,33 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         if (this.authenticatedUserToken) {
                             sessionInitOptionalParams.authenticatedUserToken = this.authenticatedUserToken;
                         }
-                        if (!!optionalParams.liveChatContext) return [3 /*break*/, 12];
-                        _s.label = 9;
-                    case 9:
-                        _s.trys.push([9, 11, , 12]);
-                        return [4 /*yield*/, this.OCClient.sessionInit(this.requestId, sessionInitOptionalParams)];
-                    case 10:
-                        _s.sent();
-                        return [3 /*break*/, 12];
+                        if (!!optionalParams.liveChatContext) return [3 /*break*/, 14];
+                        _x.label = 11;
                     case 11:
-                        error_3 = _s.sent();
+                        _x.trys.push([11, 13, , 14]);
+                        return [4 /*yield*/, this.OCClient.sessionInit(this.requestId, sessionInitOptionalParams)];
+                    case 12:
+                        _x.sent();
+                        return [3 /*break*/, 14];
+                    case 13:
+                        error_3 = _x.sent();
                         exceptionDetails = {
                             response: "OCClientSessionInitFailed"
                         };
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        if (((_k = error_3) === null || _k === void 0 ? void 0 : _k.isAxiosError) && ((_m = (_l = error_3.response) === null || _l === void 0 ? void 0 : _l.headers) === null || _m === void 0 ? void 0 : _m.errorcode.toString()) === OmnichannelErrorCodes_1.default.WidgetUseOutsideOperatingHour.toString()) {
+                            exceptionDetails.response = OmnichannelErrorCodes_1.default[OmnichannelErrorCodes_1.default.WidgetUseOutsideOperatingHour].toString();
+                            exceptionDetails.message = 'Widget used outside of operating hours';
+                            console.error(exceptionDetails.message);
+                        }
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.StartChat, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId,
                             ExceptionDetails: JSON.stringify(exceptionDetails)
                         });
-                        console.error("OmnichannelChatSDK/startChat/sessionInit/error " + error_3);
-                        return [2 /*return*/, error_3];
-                    case 12:
-                        if (!(this.liveChatVersion === LiveChatVersion_1.default.V2)) return [3 /*break*/, 23];
+                        throw new Error(exceptionDetails.response);
+                    case 14:
+                        if (!(this.liveChatVersion === LiveChatVersion_1.default.V2)) return [3 /*break*/, 25];
                         chatAdapterConfig = {
                             token: this.chatToken.token,
                             id: this.chatToken.visitorId || 'teamsvisitor',
@@ -431,18 +461,18 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             environmentUrl: this.chatToken.acsEndpoint,
                             pollingInterval: 1000
                         };
-                        _s.label = 13;
-                    case 13:
-                        _s.trys.push([13, 15, , 16]);
-                        return [4 /*yield*/, ((_j = this.ACSClient) === null || _j === void 0 ? void 0 : _j.initialize({
+                        _x.label = 15;
+                    case 15:
+                        _x.trys.push([15, 17, , 18]);
+                        return [4 /*yield*/, ((_o = this.ACSClient) === null || _o === void 0 ? void 0 : _o.initialize({
                                 token: chatAdapterConfig.token,
                                 environmentUrl: chatAdapterConfig.environmentUrl
                             }))];
-                    case 14:
-                        _s.sent();
-                        return [3 /*break*/, 16];
-                    case 15:
-                        error_4 = _s.sent();
+                    case 16:
+                        _x.sent();
+                        return [3 /*break*/, 18];
+                    case 17:
+                        error_4 = _x.sent();
                         exceptionDetails = {
                             response: "ACSClientInitializeFailed"
                         };
@@ -453,23 +483,23 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         console.error("OmnichannelChatSDK/startChat/initialize/error " + error_4);
                         return [2 /*return*/, error_4];
-                    case 16:
-                        _s.trys.push([16, 18, , 19]);
-                        _q = this;
-                        return [4 /*yield*/, ((_k = this.ACSClient) === null || _k === void 0 ? void 0 : _k.joinConversation({
+                    case 18:
+                        _x.trys.push([18, 20, , 21]);
+                        _v = this;
+                        return [4 /*yield*/, ((_p = this.ACSClient) === null || _p === void 0 ? void 0 : _p.joinConversation({
                                 id: chatAdapterConfig.id,
                                 threadId: chatAdapterConfig.threadId,
                                 pollingInterval: chatAdapterConfig.pollingInterval
                             }))];
-                    case 17:
-                        _q.conversation = (_s.sent());
+                    case 19:
+                        _v.conversation = (_x.sent());
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.StartChat, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
                         });
-                        return [3 /*break*/, 19];
-                    case 18:
-                        error_5 = _s.sent();
+                        return [3 /*break*/, 21];
+                    case 20:
+                        error_5 = _x.sent();
                         exceptionDetails = {
                             response: "ACSClientJoinConversationFailed"
                         };
@@ -480,16 +510,16 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         console.error("OmnichannelChatSDK/startChat/joinConversation/error " + error_5);
                         throw Error(exceptionDetails.response);
-                    case 19:
-                        _s.trys.push([19, 21, , 22]);
-                        return [4 /*yield*/, ((_l = this.AMSClient) === null || _l === void 0 ? void 0 : _l.initialize({
+                    case 21:
+                        _x.trys.push([21, 23, , 24]);
+                        return [4 /*yield*/, ((_q = this.AMSClient) === null || _q === void 0 ? void 0 : _q.initialize({
                                 chatToken: this.chatToken
                             }))];
-                    case 20:
-                        _s.sent();
-                        return [3 /*break*/, 22];
-                    case 21:
-                        error_6 = _s.sent();
+                    case 22:
+                        _x.sent();
+                        return [3 /*break*/, 24];
+                    case 23:
+                        error_6 = _x.sent();
                         exceptionDetails = {
                             response: "AMSClientInitializeFailed"
                         };
@@ -499,19 +529,19 @@ var OmnichannelChatSDK = /** @class */ (function () {
                             ExceptionDetails: JSON.stringify(exceptionDetails)
                         });
                         throw Error(exceptionDetails.response);
-                    case 22: return [3 /*break*/, 29];
-                    case 23:
-                        _s.trys.push([23, 25, , 26]);
+                    case 24: return [3 /*break*/, 31];
+                    case 25:
+                        _x.trys.push([25, 27, , 28]);
                         return [4 /*yield*/, this.IC3Client.initialize({
                                 token: this.chatToken.token,
                                 regionGtms: this.chatToken.regionGTMS,
                                 visitor: true
                             })];
-                    case 24:
-                        _s.sent();
-                        return [3 /*break*/, 26];
-                    case 25:
-                        error_7 = _s.sent();
+                    case 26:
+                        _x.sent();
+                        return [3 /*break*/, 28];
+                    case 27:
+                        error_7 = _x.sent();
                         exceptionDetails = {
                             response: "IC3ClientInitializeFailed"
                         };
@@ -522,19 +552,19 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         console.error("OmnichannelChatSDK/startChat/initialize/error " + error_7);
                         return [2 /*return*/, error_7];
-                    case 26:
-                        _s.trys.push([26, 28, , 29]);
-                        _r = this;
+                    case 28:
+                        _x.trys.push([28, 30, , 31]);
+                        _w = this;
                         return [4 /*yield*/, this.IC3Client.joinConversation(this.chatToken.chatId)];
-                    case 27:
-                        _r.conversation = _s.sent();
+                    case 29:
+                        _w.conversation = _x.sent();
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.StartChat, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
                         });
-                        return [3 /*break*/, 29];
-                    case 28:
-                        error_8 = _s.sent();
+                        return [3 /*break*/, 31];
+                    case 30:
+                        error_8 = _x.sent();
                         exceptionDetails = {
                             response: "IC3ClientJoinConversationFailed"
                         };
@@ -545,8 +575,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         });
                         console.error("OmnichannelChatSDK/startChat/joinConversation/error " + error_8);
                         return [2 /*return*/, error_8];
-                    case 29:
-                        if (this.isPersistentChat && !((_m = this.chatSDKConfig.persistentChat) === null || _m === void 0 ? void 0 : _m.disable)) {
+                    case 31:
+                        if (this.isPersistentChat && !((_r = this.chatSDKConfig.persistentChat) === null || _r === void 0 ? void 0 : _r.disable)) {
                             this.refreshTokenTimer = setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
@@ -557,7 +587,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                             return [2 /*return*/];
                                     }
                                 });
-                            }); }, (_o = this.chatSDKConfig.persistentChat) === null || _o === void 0 ? void 0 : _o.tokenUpdateTime);
+                            }); }, (_s = this.chatSDKConfig.persistentChat) === null || _s === void 0 ? void 0 : _s.tokenUpdateTime);
                         }
                         return [2 /*return*/];
                 }
@@ -565,11 +595,11 @@ var OmnichannelChatSDK = /** @class */ (function () {
         });
     };
     OmnichannelChatSDK.prototype.endChat = function () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         return __awaiter(this, void 0, void 0, function () {
             var sessionCloseOptionalParams, isReconnectChat, isChatReconnect, error_9, exceptionDetails;
-            return __generator(this, function (_m) {
-                switch (_m.label) {
+            return __generator(this, function (_p) {
+                switch (_p.label) {
                     case 0:
                         this.scenarioMarker.startScenario(TelemetryEvent_1.default.EndChat, {
                             RequestId: this.requestId,
@@ -583,17 +613,18 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         }
                         if (this.isChatReconnect && !((_b = this.chatSDKConfig.chatReconnect) === null || _b === void 0 ? void 0 : _b.disable) && !this.isPersistentChat) {
                             isChatReconnect = this.reconnectId !== null ? true : false;
+                            this.requestId = isChatReconnect ? this.reconnectId : this.requestId; // Chat Reconnect session to close
                             sessionCloseOptionalParams.isReconnectChat = isChatReconnect;
                         }
                         if (this.authenticatedUserToken) {
                             sessionCloseOptionalParams.authenticatedUserToken = this.authenticatedUserToken;
                         }
-                        _m.label = 1;
+                        _p.label = 1;
                     case 1:
-                        _m.trys.push([1, 3, , 4]);
+                        _p.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, this.OCClient.sessionClose(this.requestId, sessionCloseOptionalParams)];
                     case 2:
-                        _m.sent();
+                        _p.sent();
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.EndChat, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId
@@ -603,6 +634,11 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         this.requestId = ocsdk_1.uuidv4();
                         this.chatToken = {};
                         this.reconnectId = null;
+                        if (this.IC3Client) {
+                            this.IC3Client.dispose();
+                            !platform_1.default.isNode() && !platform_1.default.isReactNative() && WebUtils_1.removeElementById(this.IC3Client.id);
+                            this.IC3Client = null;
+                        }
                         (_d = this.ic3ClientLogger) === null || _d === void 0 ? void 0 : _d.setRequestId(this.requestId);
                         (_e = this.ic3ClientLogger) === null || _e === void 0 ? void 0 : _e.setChatId('');
                         (_f = this.ocSdkLogger) === null || _f === void 0 ? void 0 : _f.setRequestId(this.requestId);
@@ -611,9 +647,11 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         (_j = this.acsClientLogger) === null || _j === void 0 ? void 0 : _j.setChatId('');
                         (_k = this.acsAdapterLogger) === null || _k === void 0 ? void 0 : _k.setRequestId(this.requestId);
                         (_l = this.acsAdapterLogger) === null || _l === void 0 ? void 0 : _l.setChatId('');
+                        (_m = this.callingSdkLogger) === null || _m === void 0 ? void 0 : _m.setRequestId(this.requestId);
+                        (_o = this.callingSdkLogger) === null || _o === void 0 ? void 0 : _o.setChatId('');
                         return [3 /*break*/, 4];
                     case 3:
-                        error_9 = _m.sent();
+                        error_9 = _p.sent();
                         exceptionDetails = {
                             response: "OCClientSessionCloseFailed"
                         };
@@ -664,22 +702,32 @@ var OmnichannelChatSDK = /** @class */ (function () {
         });
     };
     OmnichannelChatSDK.prototype.getConversationDetails = function () {
-        var _a, _b;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
-            var lwiDetails, state, conversationId, agentAcceptedOn, liveWorkItemDetails, error_10;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var getLWIDetailsOptionalParams, lwiDetails, state, conversationId, agentAcceptedOn, liveWorkItemDetails, error_10;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         this.scenarioMarker.startScenario(TelemetryEvent_1.default.GetConversationDetails, {
                             RequestId: this.requestId,
                             ChatId: ((_a = this.chatToken) === null || _a === void 0 ? void 0 : _a.chatId) || '',
                         });
-                        _c.label = 1;
+                        getLWIDetailsOptionalParams = {};
+                        if (this.isPersistentChat && !((_b = this.chatSDKConfig.persistentChat) === null || _b === void 0 ? void 0 : _b.disable) && this.reconnectId) {
+                            getLWIDetailsOptionalParams.reconnectId = this.reconnectId;
+                        }
+                        if (this.isChatReconnect && !((_c = this.chatSDKConfig.chatReconnect) === null || _c === void 0 ? void 0 : _c.disable) && !this.isPersistentChat && this.reconnectId) {
+                            getLWIDetailsOptionalParams.reconnectId = this.reconnectId;
+                        }
+                        if (this.authenticatedUserToken) {
+                            getLWIDetailsOptionalParams.authenticatedUserToken = this.authenticatedUserToken;
+                        }
+                        _e.label = 1;
                     case 1:
-                        _c.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.OCClient.getLWIDetails(this.requestId)];
+                        _e.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.OCClient.getLWIDetails(this.requestId, getLWIDetailsOptionalParams)];
                     case 2:
-                        lwiDetails = _c.sent();
+                        lwiDetails = _e.sent();
                         state = lwiDetails.State, conversationId = lwiDetails.ConversationId, agentAcceptedOn = lwiDetails.AgentAcceptedOn;
                         liveWorkItemDetails = {
                             state: state,
@@ -690,11 +738,11 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         }
                         this.scenarioMarker.completeScenario(TelemetryEvent_1.default.GetConversationDetails, {
                             RequestId: this.requestId,
-                            ChatId: ((_b = this.chatToken) === null || _b === void 0 ? void 0 : _b.chatId) || '',
+                            ChatId: ((_d = this.chatToken) === null || _d === void 0 ? void 0 : _d.chatId) || '',
                         });
                         return [2 /*return*/, liveWorkItemDetails];
                     case 3:
-                        error_10 = _c.sent();
+                        error_10 = _e.sent();
                         this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetConversationDetails, {
                             RequestId: this.requestId,
                             ChatId: this.chatToken.chatId || '',
@@ -1450,7 +1498,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         ChatId: this.chatToken.chatId,
                         EmailAddress: body.emailAddress,
                         DefaultAttachmentMessage: body.attachmentMessage,
-                        CustomerLocale: body.locale
+                        CustomerLocale: body.locale || locale_1.getLocaleStringFromId(this.localeId)
                     };
                     emailResponse = this.OCClient.emailTranscript(this.requestId, this.chatToken.token, emailRequestBody, emailTranscriptOptionalParams);
                     this.scenarioMarker.completeScenario(TelemetryEvent_1.default.EmailLiveChatTranscript, {
@@ -1500,36 +1548,36 @@ var OmnichannelChatSDK = /** @class */ (function () {
             });
         });
     };
-    OmnichannelChatSDK.prototype.createChatAdapter = function (protocol) {
-        if (protocol === void 0) { protocol = null; }
+    OmnichannelChatSDK.prototype.createChatAdapter = function (optionalParams) {
+        if (optionalParams === void 0) { optionalParams = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var supportedChatAdapterProtocols;
+            var protocol, supportedChatAdapterProtocols;
             var _this = this;
             return __generator(this, function (_a) {
                 if (platform_1.default.isNode() || platform_1.default.isReactNative()) {
                     return [2 /*return*/, Promise.reject('ChatAdapter is only supported on browser')];
                 }
+                protocol = optionalParams.protocol;
                 supportedChatAdapterProtocols = [ChatAdapterProtocols_1.default.ACS, ChatAdapterProtocols_1.default.IC3];
                 if (protocol && !supportedChatAdapterProtocols.includes(protocol)) {
                     return [2 /*return*/, Promise.reject("ChatAdapter for protocol " + protocol + " currently not supported")];
                 }
                 if (protocol === ChatAdapterProtocols_1.default.ACS || this.liveChatVersion === LiveChatVersion_1.default.V2) {
                     return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                            var egressMiddlewares, ingressMiddlewares, featuresOption, acsAdapterCDNUrl;
+                            var options, defaultEgressMiddlewares, defaultIngressMiddlewares, egressMiddleware, ingressMiddleware, featuresOption, acsAdapterCDNUrl;
                             var _this = this;
                             var _a;
                             return __generator(this, function (_b) {
                                 switch (_b.label) {
                                     case 0:
-                                        egressMiddlewares = [createFormatEgressTagsMiddleware_1.default()];
-                                        ingressMiddlewares = [createFormatIngressTagsMiddleware_1.default()];
-                                        featuresOption = {
-                                            enableAdaptiveCards: true,
-                                            enableThreadMemberUpdateNotification: true,
-                                            enableLeaveThreadOnWindowClosed: false,
-                                            egressMiddleware: egressMiddlewares,
-                                            ingressMiddleware: ingressMiddlewares
-                                        };
+                                        options = optionalParams.ACSAdapter ? optionalParams.ACSAdapter.options : {};
+                                        defaultEgressMiddlewares = [createChannelDataEgressMiddleware_1.default({ widgetId: this.omnichannelConfig.widgetId }), createFormatEgressTagsMiddleware_1.default()];
+                                        defaultIngressMiddlewares = [createFormatIngressTagsMiddleware_1.default()];
+                                        egressMiddleware = (options === null || options === void 0 ? void 0 : options.egressMiddleware) ? __spreadArrays(options.egressMiddleware, defaultEgressMiddlewares) : __spreadArrays(defaultEgressMiddlewares);
+                                        ingressMiddleware = (options === null || options === void 0 ? void 0 : options.ingressMiddleware) ? __spreadArrays(options.egressMiddleware, defaultIngressMiddlewares) : __spreadArrays(defaultIngressMiddlewares);
+                                        featuresOption = __assign(__assign({ enableAdaptiveCards: true, enableThreadMemberUpdateNotification: true, enableLeaveThreadOnWindowClosed: false }, options), { // overrides
+                                            ingressMiddleware: ingressMiddleware,
+                                            egressMiddleware: egressMiddleware });
                                         acsAdapterCDNUrl = this.resolveChatAdapterUrl(protocol || ChatAdapterProtocols_1.default.ACS);
                                         (_a = this.telemetry) === null || _a === void 0 ? void 0 : _a.setCDNPackages({
                                             ACSAdapter: acsAdapterCDNUrl
@@ -1540,7 +1588,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                                 try {
                                                     var ChatAdapter = window.ChatAdapter; // eslint-disable-line @typescript-eslint/no-explicit-any
                                                     var fileManager = new AMSFileManager_1.default(_this.AMSClient, _this.acsAdapterLogger);
-                                                    var adapter = ChatAdapter.createACSAdapter(_this.chatToken.token, _this.chatToken.visitorId || 'teamsvisitor', _this.chatToken.chatId, _this.chatToken.acsEndpoint, fileManager, 1000, ACSParticipantDisplayName_1.default.Customer, undefined, undefined, // logger
+                                                    var adapter = ChatAdapter.createACSAdapter(_this.chatToken.token, _this.chatToken.visitorId || 'teamsvisitor', _this.chatToken.chatId, _this.chatToken.acsEndpoint, fileManager, 1000, ACSParticipantDisplayName_1.default.Customer, undefined, // chatClient
+                                                    undefined, // logger
                                                     featuresOption);
                                                     resolve(adapter);
                                                 }
@@ -1559,12 +1608,13 @@ var OmnichannelChatSDK = /** @class */ (function () {
                 }
                 else if (protocol === ChatAdapterProtocols_1.default.IC3 || this.liveChatVersion === LiveChatVersion_1.default.V1) {
                     return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                            var ic3AdapterCDNUrl;
+                            var options, ic3AdapterCDNUrl;
                             var _this = this;
                             var _a;
                             return __generator(this, function (_b) {
                                 switch (_b.label) {
                                     case 0:
+                                        options = optionalParams.IC3Adapter ? optionalParams.IC3Adapter.options : {};
                                         ic3AdapterCDNUrl = this.resolveChatAdapterUrl(protocol || ChatAdapterProtocols_1.default.IC3);
                                         (_a = this.telemetry) === null || _a === void 0 ? void 0 : _a.setCDNPackages({
                                             IC3Adapter: ic3AdapterCDNUrl
@@ -1573,17 +1623,10 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                         return [4 /*yield*/, WebUtils_1.loadScript(ic3AdapterCDNUrl, function () {
                                                 /* istanbul ignore next */
                                                 _this.debug && console.debug('IC3Adapter loaded!');
-                                                var adapterConfig = {
-                                                    chatToken: _this.chatToken,
-                                                    userDisplayName: 'Customer',
-                                                    userId: 'teamsvisitor',
-                                                    sdkURL: _this.resolveIC3ClientUrl(),
-                                                    sdk: _this.IC3Client
-                                                };
+                                                var adapterConfig = __assign({ chatToken: _this.chatToken, userDisplayName: 'Customer', userId: _this.chatToken.visitorId || 'teamsvisitor', sdkURL: _this.resolveIC3ClientUrl(), sdk: _this.IC3Client }, options // overrides
+                                                );
                                                 var adapter = new window.Microsoft.BotFramework.WebChat.IC3Adapter(adapterConfig);
                                                 adapter.logger = _this.ic3ClientLogger;
-                                                // Keep iframe communication alive to reuse the same IC3Client instance
-                                                window.Microsoft.BotFramework.WebChat.IC3SDKProvider.disposeSdk = function () { }; // eslint-disable-line @typescript-eslint/no-empty-function
                                                 _this.scenarioMarker.completeScenario(TelemetryEvent_1.default.CreateIC3Adapter);
                                                 resolve(adapter);
                                             }, function () {
@@ -1604,16 +1647,31 @@ var OmnichannelChatSDK = /** @class */ (function () {
     OmnichannelChatSDK.prototype.getVoiceVideoCalling = function (params) {
         if (params === void 0) { params = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var chatConfig, liveWSAndLiveChatEngJoin, msdyn_widgetsnippet, widgetSnippetSourceRegex, result;
+            var exceptionDetails, exceptionDetails, chatConfig, liveWSAndLiveChatEngJoin, msdyn_widgetsnippet, widgetSnippetSourceRegex, result;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        this.scenarioMarker.startScenario(TelemetryEvent_1.default.GetVoiceVideoCalling);
                         if (platform_1.default.isNode() || platform_1.default.isReactNative()) {
-                            return [2 /*return*/, Promise.reject('VoiceVideoCalling is only supported on browser')];
+                            exceptionDetails = {
+                                response: "UnsupportedPlatform",
+                                message: "VoiceVideoCalling is only supported on browser"
+                            };
+                            this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetVoiceVideoCalling, {
+                                ExceptionDetails: JSON.stringify(exceptionDetails)
+                            });
+                            throw new Error(exceptionDetails.response);
                         }
                         if (this.callingOption.toString() === CallingOptionsOptionSetNumber_1.default.NoCalling.toString()) {
-                            return [2 /*return*/, Promise.reject('Voice and video call is not enabled')];
+                            exceptionDetails = {
+                                response: "FeatureDisabled",
+                                message: "Voice and video call is not enabled"
+                            };
+                            this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetVoiceVideoCalling, {
+                                ExceptionDetails: JSON.stringify(exceptionDetails)
+                            });
+                            throw new Error(exceptionDetails.response);
                         }
                         return [4 /*yield*/, this.getChatConfig()];
                     case 1:
@@ -1623,25 +1681,27 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         widgetSnippetSourceRegex = new RegExp("src=\"(https:\\/\\/[\\w-.]+)[\\w-.\\/]+\"");
                         result = msdyn_widgetsnippet.match(widgetSnippetSourceRegex);
                         if (result && result.length) {
-                            return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                                    var LiveChatWidgetLibCDNUrl;
+                            return [2 /*return*/, new Promise(function (resolve) { return __awaiter(_this, void 0, void 0, function () {
+                                    var LiveChatWidgetLibCDNUrl, defaultParams;
                                     var _this = this;
                                     var _a;
                                     return __generator(this, function (_b) {
                                         switch (_b.label) {
                                             case 0:
-                                                this.scenarioMarker.startScenario(TelemetryEvent_1.default.GetVoiceVideoCalling);
                                                 LiveChatWidgetLibCDNUrl = result[1] + "/livechatwidget/WebChatControl/lib/CallingBundle.js";
                                                 (_a = this.telemetry) === null || _a === void 0 ? void 0 : _a.setCDNPackages({
                                                     VoiceVideoCalling: LiveChatWidgetLibCDNUrl
                                                 });
+                                                defaultParams = {
+                                                    logger: this.callingSdkLogger
+                                                };
                                                 return [4 /*yield*/, WebUtils_1.loadScript(LiveChatWidgetLibCDNUrl, function () { return __awaiter(_this, void 0, void 0, function () {
                                                         var VoiceVideoCalling;
                                                         return __generator(this, function (_a) {
                                                             switch (_a.label) {
                                                                 case 0:
                                                                     this.debug && console.debug(LiveChatWidgetLibCDNUrl + " loaded!");
-                                                                    return [4 /*yield*/, createVoiceVideoCalling_1.default(params)];
+                                                                    return [4 /*yield*/, createVoiceVideoCalling_1.default(__assign(__assign({}, params), defaultParams))];
                                                                 case 1:
                                                                     VoiceVideoCalling = _a.sent();
                                                                     this.scenarioMarker.completeScenario(TelemetryEvent_1.default.GetVoiceVideoCalling);
@@ -1654,13 +1714,13 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                                         var exceptionDetails;
                                                         return __generator(this, function (_a) {
                                                             exceptionDetails = {
-                                                                response: "VoiceVideoCallingLoadFailed"
+                                                                response: "VoiceVideoCallingLoadFailed",
+                                                                message: "Failed to load VoiceVideoCalling"
                                                             };
                                                             this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetVoiceVideoCalling, {
                                                                 ExceptionDetails: JSON.stringify(exceptionDetails)
                                                             });
-                                                            reject('Failed to load VoiceVideoCalling');
-                                                            return [2 /*return*/];
+                                                            throw new Error(exceptionDetails.response);
                                                         });
                                                     }); })];
                                             case 1:
@@ -1677,7 +1737,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.getPostChatSurveyContext = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var conversationId, chatConfig, liveWSAndLiveChatEngJoin, chatWidgetLanguage, msdyn_postconversationsurveyenable, msfp_sourcesurveyidentifier, postConversationSurveyOwnerId, msdyn_localeid, localeId, liveWorkItemDetails, participantJoined, surveyInviteLinkRequest, optionalParams, surveyInviteLinkResponse, surveyInviteLink, formsProLocale, postChatContext, ex_1;
+            var conversationId, liveWSAndLiveChatEngJoin, msdyn_postconversationsurveyenable, msfp_sourcesurveyidentifier, postConversationSurveyOwnerId, liveWorkItemDetails, participantJoined, surveyInviteLinkRequest, optionalParams, surveyInviteLinkResponse, surveyInviteLink, formsProLocale, postChatContext, ex_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1687,11 +1747,8 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 6, , 7]);
-                        chatConfig = this.liveChatConfig;
-                        liveWSAndLiveChatEngJoin = chatConfig.LiveWSAndLiveChatEngJoin, chatWidgetLanguage = chatConfig.ChatWidgetLanguage;
+                        liveWSAndLiveChatEngJoin = this.liveChatConfig.LiveWSAndLiveChatEngJoin;
                         msdyn_postconversationsurveyenable = liveWSAndLiveChatEngJoin.msdyn_postconversationsurveyenable, msfp_sourcesurveyidentifier = liveWSAndLiveChatEngJoin.msfp_sourcesurveyidentifier, postConversationSurveyOwnerId = liveWSAndLiveChatEngJoin.postConversationSurveyOwnerId;
-                        msdyn_localeid = chatWidgetLanguage.msdyn_localeid;
-                        localeId = msdyn_localeid !== null && msdyn_localeid !== void 0 ? msdyn_localeid : "1033";
                         if (!msdyn_postconversationsurveyenable) return [3 /*break*/, 4];
                         return [4 /*yield*/, this.OCClient.getLWIDetails(this.requestId)];
                     case 2:
@@ -1701,7 +1758,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         surveyInviteLinkRequest = {
                             "FormId": msfp_sourcesurveyidentifier,
                             "ConversationId": conversationId,
-                            "OCLocaleCode": locale_1.getLocaleStringFromId(localeId)
+                            "OCLocaleCode": locale_1.getLocaleStringFromId(this.localeId) || locale_1.getLocaleStringFromId(locale_1.defaultLocaleId)
                         };
                         optionalParams = {
                             "requestId": this.requestId
@@ -1790,7 +1847,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         this.debug && console.debug('IC3Client');
                         // Use IC3Client if browser is detected
                         return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                                var ic3ClientCDNUrl;
+                                var ic3ClientCDNUrl, IC3Client;
                                 var _this = this;
                                 var _a;
                                 return __generator(this, function (_b) {
@@ -1801,6 +1858,16 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                                 IC3Client: ic3ClientCDNUrl
                                             });
                                             this.scenarioMarker.startScenario(TelemetryEvent_1.default.GetIC3Client);
+                                            if (!this.IC3SDKProvider) return [3 /*break*/, 2];
+                                            return [4 /*yield*/, this.IC3SDKProvider.getSDK({
+                                                    hostType: HostType_1.default.IFrame,
+                                                    protocolType: ProtocoleType_1.default.IC3V1SDK,
+                                                    logger: this.ic3ClientLogger // eslint-disable-line @typescript-eslint/no-explicit-any
+                                                })];
+                                        case 1:
+                                            IC3Client = _b.sent();
+                                            return [2 /*return*/, resolve(IC3Client)];
+                                        case 2:
                                             window.addEventListener("ic3:sdk:load", function () { return __awaiter(_this, void 0, void 0, function () {
                                                 var ic3sdk, IC3SDKProvider, IC3Client;
                                                 return __generator(this, function (_a) {
@@ -1837,7 +1904,7 @@ var OmnichannelChatSDK = /** @class */ (function () {
                                                     });
                                                     reject('Failed to load IC3Client');
                                                 })];
-                                        case 1:
+                                        case 3:
                                             _b.sent();
                                             return [2 /*return*/];
                                     }
@@ -1849,15 +1916,17 @@ var OmnichannelChatSDK = /** @class */ (function () {
     };
     OmnichannelChatSDK.prototype.getChatConfig = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var liveChatConfig, dataMaskingConfig, authSettings, liveWSAndLiveChatEngJoin, liveChatVersion, setting, preChatSurvey, msdyn_prechatenabled, msdyn_callingoptions, msdyn_conversationmode, msdyn_enablechatreconnect, isPreChatEnabled, isChatReconnectEnabled, token, exceptionDetails, _a, exceptionDetails, exceptionDetails, error_18;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var liveChatConfig, dataMaskingConfig, authSettings, liveWSAndLiveChatEngJoin, liveChatVersion, chatWidgetLanguage, msdyn_localeid, setting, preChatSurvey, msdyn_prechatenabled, msdyn_callingoptions, msdyn_conversationmode, msdyn_enablechatreconnect, isPreChatEnabled, isChatReconnectEnabled, error_18;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        _b.trys.push([0, 8, , 9]);
+                        _a.trys.push([0, 4, , 5]);
                         return [4 /*yield*/, this.OCClient.getChatConfig()];
                     case 1:
-                        liveChatConfig = _b.sent();
-                        dataMaskingConfig = liveChatConfig.DataMaskingInfo, authSettings = liveChatConfig.LiveChatConfigAuthSettings, liveWSAndLiveChatEngJoin = liveChatConfig.LiveWSAndLiveChatEngJoin, liveChatVersion = liveChatConfig.LiveChatVersion;
+                        liveChatConfig = _a.sent();
+                        dataMaskingConfig = liveChatConfig.DataMaskingInfo, authSettings = liveChatConfig.LiveChatConfigAuthSettings, liveWSAndLiveChatEngJoin = liveChatConfig.LiveWSAndLiveChatEngJoin, liveChatVersion = liveChatConfig.LiveChatVersion, chatWidgetLanguage = liveChatConfig.ChatWidgetLanguage;
+                        msdyn_localeid = chatWidgetLanguage.msdyn_localeid;
+                        this.localeId = msdyn_localeid || locale_1.defaultLocaleId;
                         this.liveChatVersion = liveChatVersion || LiveChatVersion_1.default.V1;
                         /* istanbul ignore next */
                         this.debug && console.log("[OmnichannelChatSDK][getChatConfig][liveChatVersion] " + this.liveChatVersion);
@@ -1880,47 +1949,12 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         if (isPreChatEnabled && preChatSurvey && preChatSurvey.trim().length > 0) {
                             this.preChatSurvey = preChatSurvey;
                         }
-                        if (!this.authSettings) return [3 /*break*/, 7];
-                        this.scenarioMarker.startScenario(TelemetryEvent_1.default.GetAuthToken);
-                        if (!this.chatSDKConfig.getAuthToken) return [3 /*break*/, 6];
-                        _b.label = 2;
+                        if (!this.authSettings) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.setAuthTokenProvider(this.chatSDKConfig.getAuthToken)];
                     case 2:
-                        _b.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, this.chatSDKConfig.getAuthToken()];
+                        _a.sent();
+                        _a.label = 3;
                     case 3:
-                        token = _b.sent();
-                        if (token) {
-                            this.authenticatedUserToken = token;
-                            this.scenarioMarker.completeScenario(TelemetryEvent_1.default.GetAuthToken);
-                        }
-                        else {
-                            exceptionDetails = {
-                                response: "UndefinedAuthToken"
-                            };
-                            this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetAuthToken, {
-                                ExceptionDetails: JSON.stringify(exceptionDetails)
-                            });
-                        }
-                        return [3 /*break*/, 5];
-                    case 4:
-                        _a = _b.sent();
-                        exceptionDetails = {
-                            response: "GetAuthTokenFailed"
-                        };
-                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetAuthToken, {
-                            ExceptionDetails: JSON.stringify(exceptionDetails)
-                        });
-                        return [3 /*break*/, 5];
-                    case 5: return [3 /*break*/, 7];
-                    case 6:
-                        exceptionDetails = {
-                            response: "GetAuthTokenNotFound"
-                        };
-                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetAuthToken, {
-                            ExceptionDetails: JSON.stringify(exceptionDetails)
-                        });
-                        _b.label = 7;
-                    case 7:
                         if (this.preChatSurvey) {
                             /* istanbul ignore next */
                             this.debug && console.log('Prechat Survey!');
@@ -1928,11 +1962,11 @@ var OmnichannelChatSDK = /** @class */ (function () {
                         this.callingOption = msdyn_callingoptions;
                         this.liveChatConfig = liveChatConfig;
                         return [2 /*return*/, this.liveChatConfig];
-                    case 8:
-                        error_18 = _b.sent();
+                    case 4:
+                        error_18 = _a.sent();
                         console.error("OmnichannelChatSDK/getChatConfig/error " + error_18);
                         return [2 /*return*/, error_18];
-                    case 9: return [2 /*return*/];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -2014,6 +2048,57 @@ var OmnichannelChatSDK = /** @class */ (function () {
             });
         });
     };
+    OmnichannelChatSDK.prototype.setAuthTokenProvider = function (provider) {
+        return __awaiter(this, void 0, void 0, function () {
+            var token, exceptionDetails, _a, exceptionDetails, exceptionDetails;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        this.scenarioMarker.startScenario(TelemetryEvent_1.default.GetAuthToken);
+                        this.chatSDKConfig.getAuthToken = provider;
+                        if (!this.chatSDKConfig.getAuthToken) return [3 /*break*/, 5];
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.chatSDKConfig.getAuthToken()];
+                    case 2:
+                        token = _b.sent();
+                        if (token) {
+                            this.authenticatedUserToken = token;
+                            this.scenarioMarker.completeScenario(TelemetryEvent_1.default.GetAuthToken);
+                        }
+                        else {
+                            exceptionDetails = {
+                                response: "UndefinedAuthToken"
+                            };
+                            this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetAuthToken, {
+                                ExceptionDetails: JSON.stringify(exceptionDetails)
+                            });
+                        }
+                        return [3 /*break*/, 4];
+                    case 3:
+                        _a = _b.sent();
+                        exceptionDetails = {
+                            response: "GetAuthTokenFailed"
+                        };
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetAuthToken, {
+                            ExceptionDetails: JSON.stringify(exceptionDetails)
+                        });
+                        return [3 /*break*/, 4];
+                    case 4: return [3 /*break*/, 6];
+                    case 5:
+                        exceptionDetails = {
+                            response: "GetAuthTokenNotFound"
+                        };
+                        this.scenarioMarker.failScenario(TelemetryEvent_1.default.GetAuthToken, {
+                            ExceptionDetails: JSON.stringify(exceptionDetails)
+                        });
+                        _b.label = 6;
+                    case 6: return [2 /*return*/];
+                }
+            });
+        });
+    };
     return OmnichannelChatSDK;
 }());
 exports.default = OmnichannelChatSDK;