@webex/calling 3.10.0 → 3.11.0-webex-services-ready.1

package/dist/Contacts/ContactsClient.js

@@ -16,6 +16,7 @@ var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/pr
 var _values = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/values"));
 var _entries = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/entries"));
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/keys"));
+var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/slicedToArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/asyncToGenerator"));
@@ -46,6 +47,7 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
    * @ignore
    */
   function ContactsClient(webex, logger) {
+    var _this$webex$internal$;
     (0, _classCallCheck2.default)(this, ContactsClient);
     (0, _defineProperty2.default)(this, "sdkConnector", void 0);
     (0, _defineProperty2.default)(this, "encryptionKeyUrl", void 0);
@@ -53,6 +55,7 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "groups", void 0);
     (0, _defineProperty2.default)(this, "contacts", void 0);
     (0, _defineProperty2.default)(this, "defaultGroupId", void 0);
+    (0, _defineProperty2.default)(this, "contactsServiceUrl", void 0);
     this.sdkConnector = _SDKConnector.default;
     if (!this.sdkConnector.getWebex()) {
       _SDKConnector.default.setWebex(webex);
@@ -62,33 +65,34 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     this.groups = undefined;
     this.contacts = undefined;
     this.defaultGroupId = '';
+    this.contactsServiceUrl = ((_this$webex$internal$ = this.webex.internal.services._serviceUrls) === null || _this$webex$internal$ === void 0 ? void 0 : _this$webex$internal$.contactsService) || this.webex.internal.services.get(this.webex.internal.services._activeServices.contactsService);
     _Logger.default.setLogger(logger.level, _constants2.CONTACTS_CLIENT);
   }
 
   /**
    * Decrypt emails, phoneNumbers, sipAddresses.
    */
-  (0, _createClass2.default)(ContactsClient, [{
+  return (0, _createClass2.default)(ContactsClient, [{
     key: "decryptContactDetail",
     value: (function () {
       var _decryptContactDetail = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(encryptionKeyUrl, contactDetails) {
         var _this = this;
         var decryptedContactDetail, decryptedValues;
-        return _regenerator.default.wrap(function _callee$(_context) {
+        return _regenerator.default.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               decryptedContactDetail = (0, _toConsumableArray2.default)(contactDetails);
-              _context.next = 3;
+              _context.next = 1;
               return _promise.default.all(decryptedContactDetail.map(function (detail) {
                 return _this.webex.internal.encryption.decryptText(encryptionKeyUrl, detail.value);
               }));
-            case 3:
+            case 1:
               decryptedValues = _context.sent;
               decryptedValues.forEach(function (decryptedValue, index) {
                 decryptedContactDetail[index].value = decryptedValue;
               });
               return _context.abrupt("return", decryptedContactDetail);
-            case 6:
+            case 2:
             case "end":
               return _context.stop();
           }
@@ -110,21 +114,21 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
       var _encryptContactDetail = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(encryptionKeyUrl, contactDetails) {
         var _this2 = this;
         var encryptedContactDetail, encryptedValues;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
+        return _regenerator.default.wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               encryptedContactDetail = (0, _toConsumableArray2.default)(contactDetails);
-              _context2.next = 3;
+              _context2.next = 1;
               return _promise.default.all(encryptedContactDetail.map(function (detail) {
                 return _this2.webex.internal.encryption.encryptText(encryptionKeyUrl, detail.value);
               }));
-            case 3:
+            case 1:
               encryptedValues = _context2.sent;
               encryptedValues.forEach(function (encryptedValue, index) {
                 encryptedContactDetail[index].value = encryptedValue;
               });
               return _context2.abrupt("return", encryptedContactDetail);
-            case 6:
+            case 2:
             case "end":
               return _context2.stop();
           }
@@ -145,40 +149,40 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
       var _encryptContact = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5(contact) {
         var _this3 = this;
         var encryptionKeyUrl, encryptedContact, encryptionPromises, encryptedFieldsList;
-        return _regenerator.default.wrap(function _callee5$(_context5) {
+        return _regenerator.default.wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               encryptionKeyUrl = contact.encryptionKeyUrl;
               encryptedContact = _objectSpread({}, contact);
               encryptionPromises = (0, _values.default)(_constants2.encryptedFields).map(/*#__PURE__*/function () {
                 var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4(field) {
-                  var plaintextAddressInfo, encryptedAddressInfo, encryptedAddressInfoPromises, plainTextDetails, encryptedDetails, encryptedValue;
-                  return _regenerator.default.wrap(function _callee4$(_context4) {
+                  var plaintextAddressInfo, encryptedAddressInfo, encryptedAddressInfoPromises, plainTextDetails, encryptedDetails, encryptedValue, _t3, _t4;
+                  return _regenerator.default.wrap(function (_context4) {
                     while (1) switch (_context4.prev = _context4.next) {
                       case 0:
-                        _context4.t0 = field;
-                        _context4.next = _context4.t0 === _constants2.encryptedFields.ADDRESS_INFO ? 3 : _context4.t0 === _constants2.encryptedFields.EMAILS ? 12 : _context4.t0 === _constants2.encryptedFields.PHONE_NUMBERS ? 12 : _context4.t0 === _constants2.encryptedFields.SIP_ADDRESSES ? 12 : 18;
+                        _t3 = field;
+                        _context4.next = _t3 === _constants2.encryptedFields.ADDRESS_INFO ? 1 : _t3 === _constants2.encryptedFields.EMAILS ? 4 : _t3 === _constants2.encryptedFields.PHONE_NUMBERS ? 4 : _t3 === _constants2.encryptedFields.SIP_ADDRESSES ? 4 : 7;
                         break;
-                      case 3:
+                      case 1:
                         plaintextAddressInfo = encryptedContact.addressInfo;
                         if (!plaintextAddressInfo) {
-                          _context4.next = 11;
+                          _context4.next = 3;
                           break;
                         }
                         encryptedAddressInfoPromises = (0, _entries.default)(plaintextAddressInfo).map(/*#__PURE__*/function () {
                           var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(_ref2) {
-                            var _ref4, key, value;
-                            return _regenerator.default.wrap(function _callee3$(_context3) {
+                            var _ref4, key, value, _t, _t2;
+                            return _regenerator.default.wrap(function (_context3) {
                               while (1) switch (_context3.prev = _context3.next) {
                                 case 0:
                                   _ref4 = (0, _slicedToArray2.default)(_ref2, 2), key = _ref4[0], value = _ref4[1];
-                                  _context3.t0 = key;
-                                  _context3.next = 4;
+                                  _t = key;
+                                  _context3.next = 1;
                                   return _this3.webex.internal.encryption.encryptText(encryptionKeyUrl, value);
-                                case 4:
-                                  _context3.t1 = _context3.sent;
-                                  return _context3.abrupt("return", [_context3.t0, _context3.t1]);
-                                case 6:
+                                case 1:
+                                  _t2 = _context3.sent;
+                                  return _context3.abrupt("return", [_t, _t2]);
+                                case 2:
                                 case "end":
                                   return _context3.stop();
                               }
@@ -188,38 +192,37 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                             return _ref3.apply(this, arguments);
                           };
                         }());
-                        _context4.t1 = Object;
-                        _context4.next = 9;
+                        _t4 = Object;
+                        _context4.next = 2;
                         return _promise.default.all(encryptedAddressInfoPromises);
-                      case 9:
-                        _context4.t2 = _context4.sent;
-                        encryptedAddressInfo = _context4.t1.fromEntries.call(_context4.t1, _context4.t2);
-                      case 11:
+                      case 2:
+                        encryptedAddressInfo = _t4.fromEntries.call(_t4, _context4.sent);
+                      case 3:
                         return _context4.abrupt("return", [field, encryptedAddressInfo]);
-                      case 12:
+                      case 4:
                         plainTextDetails = encryptedContact[field];
                         if (!plainTextDetails) {
-                          _context4.next = 17;
+                          _context4.next = 6;
                           break;
                         }
-                        _context4.next = 16;
+                        _context4.next = 5;
                         return _this3.encryptContactDetail(encryptionKeyUrl, plainTextDetails);
-                      case 16:
+                      case 5:
                         encryptedDetails = _context4.sent;
-                      case 17:
+                      case 6:
                         return _context4.abrupt("return", [field, encryptedDetails]);
-                      case 18:
+                      case 7:
                         if (!((0, _values.default)(_constants2.encryptedFields).includes(field) && encryptedContact[field])) {
-                          _context4.next = 22;
+                          _context4.next = 9;
                           break;
                         }
-                        _context4.next = 21;
+                        _context4.next = 8;
                         return _this3.webex.internal.encryption.encryptText(encryptionKeyUrl, encryptedContact[field]);
-                      case 21:
+                      case 8:
                         encryptedValue = _context4.sent;
-                      case 22:
+                      case 9:
                         return _context4.abrupt("return", [field, encryptedValue]);
-                      case 23:
+                      case 10:
                       case "end":
                         return _context4.stop();
                     }
@@ -229,9 +232,9 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                   return _ref.apply(this, arguments);
                 };
               }());
-              _context5.next = 5;
+              _context5.next = 1;
               return _promise.default.all(encryptionPromises);
-            case 5:
+            case 1:
               encryptedFieldsList = _context5.sent;
               encryptedFieldsList.forEach(function (_ref5) {
                 var _ref6 = (0, _slicedToArray2.default)(_ref5, 2),
@@ -242,7 +245,7 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 }
               });
               return _context5.abrupt("return", encryptedContact);
-            case 8:
+            case 2:
             case "end":
               return _context5.stop();
           }
@@ -263,40 +266,40 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
       var _decryptContact = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee8(contact) {
         var _this4 = this;
         var encryptionKeyUrl, decryptedContact, decryptionPromises, decryptedFieldsList;
-        return _regenerator.default.wrap(function _callee8$(_context8) {
+        return _regenerator.default.wrap(function (_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               encryptionKeyUrl = contact.encryptionKeyUrl;
               decryptedContact = _objectSpread({}, contact);
               decryptionPromises = (0, _values.default)(_constants2.encryptedFields).map(/*#__PURE__*/function () {
                 var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7(field) {
-                  var plaintextAddressInfo, decryptedAddressInfo, decryptedAddressInfoPromises, plainTextDetails, decryptedDetails, decryptedValue;
-                  return _regenerator.default.wrap(function _callee7$(_context7) {
+                  var plaintextAddressInfo, decryptedAddressInfo, decryptedAddressInfoPromises, plainTextDetails, decryptedDetails, decryptedValue, _t7, _t8;
+                  return _regenerator.default.wrap(function (_context7) {
                     while (1) switch (_context7.prev = _context7.next) {
                       case 0:
-                        _context7.t0 = field;
-                        _context7.next = _context7.t0 === _constants2.encryptedFields.ADDRESS_INFO ? 3 : _context7.t0 === _constants2.encryptedFields.EMAILS ? 12 : _context7.t0 === _constants2.encryptedFields.PHONE_NUMBERS ? 12 : _context7.t0 === _constants2.encryptedFields.SIP_ADDRESSES ? 12 : 18;
+                        _t7 = field;
+                        _context7.next = _t7 === _constants2.encryptedFields.ADDRESS_INFO ? 1 : _t7 === _constants2.encryptedFields.EMAILS ? 4 : _t7 === _constants2.encryptedFields.PHONE_NUMBERS ? 4 : _t7 === _constants2.encryptedFields.SIP_ADDRESSES ? 4 : 7;
                         break;
-                      case 3:
+                      case 1:
                         plaintextAddressInfo = decryptedContact.addressInfo;
                         if (!plaintextAddressInfo) {
-                          _context7.next = 11;
+                          _context7.next = 3;
                           break;
                         }
                         decryptedAddressInfoPromises = (0, _entries.default)(plaintextAddressInfo).map(/*#__PURE__*/function () {
                           var _ref9 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6(_ref8) {
-                            var _ref0, key, value;
-                            return _regenerator.default.wrap(function _callee6$(_context6) {
+                            var _ref0, key, value, _t5, _t6;
+                            return _regenerator.default.wrap(function (_context6) {
                               while (1) switch (_context6.prev = _context6.next) {
                                 case 0:
                                   _ref0 = (0, _slicedToArray2.default)(_ref8, 2), key = _ref0[0], value = _ref0[1];
-                                  _context6.t0 = key;
-                                  _context6.next = 4;
+                                  _t5 = key;
+                                  _context6.next = 1;
                                   return _this4.webex.internal.encryption.decryptText(encryptionKeyUrl, value);
-                                case 4:
-                                  _context6.t1 = _context6.sent;
-                                  return _context6.abrupt("return", [_context6.t0, _context6.t1]);
-                                case 6:
+                                case 1:
+                                  _t6 = _context6.sent;
+                                  return _context6.abrupt("return", [_t5, _t6]);
+                                case 2:
                                 case "end":
                                   return _context6.stop();
                               }
@@ -306,38 +309,37 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                             return _ref9.apply(this, arguments);
                           };
                         }());
-                        _context7.t1 = Object;
-                        _context7.next = 9;
+                        _t8 = Object;
+                        _context7.next = 2;
                         return _promise.default.all(decryptedAddressInfoPromises);
-                      case 9:
-                        _context7.t2 = _context7.sent;
-                        decryptedAddressInfo = _context7.t1.fromEntries.call(_context7.t1, _context7.t2);
-                      case 11:
+                      case 2:
+                        decryptedAddressInfo = _t8.fromEntries.call(_t8, _context7.sent);
+                      case 3:
                         return _context7.abrupt("return", [field, decryptedAddressInfo]);
-                      case 12:
+                      case 4:
                         plainTextDetails = decryptedContact[field];
                         if (!plainTextDetails) {
-                          _context7.next = 17;
+                          _context7.next = 6;
                           break;
                         }
-                        _context7.next = 16;
+                        _context7.next = 5;
                         return _this4.decryptContactDetail(encryptionKeyUrl, plainTextDetails);
-                      case 16:
+                      case 5:
                         decryptedDetails = _context7.sent;
-                      case 17:
+                      case 6:
                         return _context7.abrupt("return", [field, decryptedDetails]);
-                      case 18:
+                      case 7:
                         if (!((0, _values.default)(_constants2.encryptedFields).includes(field) && decryptedContact[field])) {
-                          _context7.next = 22;
+                          _context7.next = 9;
                           break;
                         }
-                        _context7.next = 21;
+                        _context7.next = 8;
                         return _this4.webex.internal.encryption.decryptText(encryptionKeyUrl, decryptedContact[field]);
-                      case 21:
+                      case 8:
                         decryptedValue = _context7.sent;
-                      case 22:
+                      case 9:
                         return _context7.abrupt("return", [field, decryptedValue]);
-                      case 23:
+                      case 10:
                       case "end":
                         return _context7.stop();
                     }
@@ -347,9 +349,9 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                   return _ref7.apply(this, arguments);
                 };
               }());
-              _context8.next = 5;
+              _context8.next = 1;
               return _promise.default.all(decryptionPromises);
-            case 5:
+            case 1:
               decryptedFieldsList = _context8.sent;
               decryptedFieldsList.forEach(function (_ref1) {
                 var _ref10 = (0, _slicedToArray2.default)(_ref1, 2),
@@ -360,7 +362,7 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 }
               });
               return _context8.abrupt("return", decryptedContact);
-            case 8:
+            case 2:
             case "end":
               return _context8.stop();
           }
@@ -451,8 +453,8 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     value: (function () {
       var _getContacts = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee1() {
         var _this5 = this;
-        var loggerContext, contactList, cloudContactsMap, _response$headers, response, responseBody, contacts, groups, contactIdList, totalContacts, MAX_CONTACTS_PER_QUERY, i, contactIdListChunk, query, result, slicedCloudContactsMap, resolvedContacts, contactResponse, errorInfo, extendedError, errorStatus;
-        return _regenerator.default.wrap(function _callee1$(_context1) {
+        var loggerContext, contactList, cloudContactsMap, _response$headers, response, responseBody, contacts, groups, contactIdList, totalContacts, MAX_CONTACTS_PER_QUERY, i, contactIdListChunk, query, result, slicedCloudContactsMap, resolvedContacts, contactResponse, errorStatus, _t9, _t0;
+        return _regenerator.default.wrap(function (_context1) {
           while (1) switch (_context1.prev = _context1.next) {
             case 0:
               loggerContext = {
@@ -462,47 +464,47 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
               _Logger.default.info(_constants.METHOD_START_MESSAGE, loggerContext);
               contactList = [];
               cloudContactsMap = {};
-              _context1.prev = 4;
-              _context1.next = 7;
+              _context1.prev = 1;
+              _context1.next = 2;
               return this.webex.request({
                 // eslint-disable-next-line no-underscore-dangle
-                uri: "".concat(this.webex.internal.services._serviceUrls.contactsService, "/").concat(_constants2.ENCRYPT_FILTER, "/").concat(_constants2.USERS, "/").concat(_constants2.CONTACT_FILTER),
+                uri: "".concat(this.contactsServiceUrl, "/").concat(_constants2.ENCRYPT_FILTER, "/").concat(_constants2.USERS, "/").concat(_constants2.CONTACT_FILTER),
                 method: _types.HTTP_METHODS.GET
               });
-            case 7:
+            case 2:
               response = _context1.sent;
               _Logger.default.log("Response code: ".concat(response.statusCode, " and Response trackingId: ").concat(response === null || response === void 0 ? void 0 : (_response$headers = response.headers) === null || _response$headers === void 0 ? void 0 : _response$headers.trackingid), loggerContext);
               responseBody = response.body;
               if (responseBody) {
-                _context1.next = 12;
+                _context1.next = 3;
                 break;
               }
               throw new Error("".concat(response));
-            case 12:
+            case 3:
               contacts = responseBody.contacts, groups = responseBody.groups;
-              _context1.next = 15;
+              _context1.next = 4;
               return _promise.default.all(contacts.map(/*#__PURE__*/function () {
                 var _ref11 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee9(contact) {
                   var decryptedContact;
-                  return _regenerator.default.wrap(function _callee9$(_context9) {
+                  return _regenerator.default.wrap(function (_context9) {
                     while (1) switch (_context9.prev = _context9.next) {
                       case 0:
                         if (!(contact.contactType === _types2.ContactType.CUSTOM)) {
-                          _context9.next = 7;
+                          _context9.next = 2;
                           break;
                         }
-                        _context9.next = 3;
+                        _context9.next = 1;
                         return _this5.decryptContact(contact);
-                      case 3:
+                      case 1:
                         decryptedContact = _context9.sent;
                         contactList.push(decryptedContact);
-                        _context9.next = 8;
+                        _context9.next = 3;
                         break;
-                      case 7:
+                      case 2:
                         if (contact.contactType === _types2.ContactType.CLOUD && contact.contactId) {
                           cloudContactsMap[contact.contactId] = contact;
                         }
-                      case 8:
+                      case 3:
                       case "end":
                         return _context9.stop();
                     }
@@ -512,28 +514,28 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                   return _ref11.apply(this, arguments);
                 };
               }()));
-            case 15:
+            case 4:
               if (!(0, _keys.default)(cloudContactsMap).length) {
-                _context1.next = 38;
+                _context1.next = 10;
                 break;
               }
               contactIdList = (0, _keys.default)(cloudContactsMap);
               totalContacts = contactIdList.length;
               MAX_CONTACTS_PER_QUERY = 50;
               i = 0;
-            case 20:
+            case 5:
               if (!(i < totalContacts)) {
-                _context1.next = 38;
+                _context1.next = 10;
                 break;
               }
-              _context1.prev = 21;
+              _context1.prev = 6;
               contactIdListChunk = contactIdList.slice(i, i + MAX_CONTACTS_PER_QUERY);
               query = contactIdListChunk.map(function (item) {
                 return "".concat(_constants2.SCIM_ID_FILTER, " \"").concat(item, "\"");
               }).join(_constants2.OR);
-              _context1.next = 26;
+              _context1.next = 7;
               return (0, _Utils.scimQuery)(query);
-            case 26:
+            case 7:
               result = _context1.sent;
               slicedCloudContactsMap = Object.fromEntries((0, _entries.default)(cloudContactsMap).slice(i, i + MAX_CONTACTS_PER_QUERY));
               resolvedContacts = this.resolveCloudContacts(slicedCloudContactsMap, result.body);
@@ -542,28 +544,28 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                   return contactList.push(item);
                 });
               }
-              _context1.next = 35;
+              _context1.next = 9;
               break;
-            case 32:
-              _context1.prev = 32;
-              _context1.t0 = _context1["catch"](21);
+            case 8:
+              _context1.prev = 8;
+              _t9 = _context1["catch"](6);
               _Logger.default.warn("Error processing contact chunk ".concat(i, "-").concat(i + MAX_CONTACTS_PER_QUERY), loggerContext);
-            case 35:
+            case 9:
               i += MAX_CONTACTS_PER_QUERY;
-              _context1.next = 20;
+              _context1.next = 5;
               break;
-            case 38:
-              _context1.next = 40;
+            case 10:
+              _context1.next = 11;
               return _promise.default.all(groups.map(/*#__PURE__*/function () {
                 var _ref12 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee0(group, idx) {
-                  return _regenerator.default.wrap(function _callee0$(_context0) {
+                  return _regenerator.default.wrap(function (_context0) {
                     while (1) switch (_context0.prev = _context0.next) {
                       case 0:
-                        _context0.next = 2;
+                        _context0.next = 1;
                         return _this5.webex.internal.encryption.decryptText(group.encryptionKeyUrl, group.displayName);
-                      case 2:
+                      case 1:
                         groups[idx].displayName = _context0.sent;
-                      case 3:
+                      case 2:
                       case "end":
                         return _context0.stop();
                     }
@@ -573,7 +575,7 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                   return _ref12.apply(this, arguments);
                 };
               }()));
-            case 40:
+            case 11:
               this.groups = groups;
               this.contacts = contactList;
               contactResponse = {
@@ -586,22 +588,20 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
               };
               _Logger.default.log('Successfully fetched contacts and groups', loggerContext);
               return _context1.abrupt("return", contactResponse);
-            case 47:
-              _context1.prev = 47;
-              _context1.t1 = _context1["catch"](4);
-              errorInfo = _context1.t1;
-              extendedError = new Error("Error fetching contacts: ".concat(_context1.t1));
-              _Logger.default.error(extendedError, loggerContext);
-              errorStatus = (0, _Utils.serviceErrorCodeHandler)(errorInfo, loggerContext);
-              _context1.next = 55;
+            case 12:
+              _context1.prev = 12;
+              _t0 = _context1["catch"](1);
+              _Logger.default.error("Error fetching contacts: ".concat((0, _stringify.default)(_t0)), loggerContext);
+              errorStatus = (0, _Utils.serviceErrorCodeHandler)(_t0, loggerContext);
+              _context1.next = 13;
               return (0, _Utils.uploadLogs)();
-            case 55:
+            case 13:
               return _context1.abrupt("return", errorStatus);
-            case 56:
+            case 14:
             case "end":
               return _context1.stop();
           }
-        }, _callee1, this, [[4, 47], [21, 32]]);
+        }, _callee1, this, [[1, 12], [6, 8]]);
       }));
       function getContacts() {
         return _getContacts.apply(this, arguments);
@@ -619,7 +619,7 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     value: (function () {
       var _createNewEncryptionKeyUrl = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10() {
         var loggerContext, unboundedKeyUri, unboundedKeys;
-        return _regenerator.default.wrap(function _callee10$(_context10) {
+        return _regenerator.default.wrap(function (_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
               loggerContext = {
@@ -629,18 +629,18 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
               _Logger.default.info(_constants.METHOD_START_MESSAGE, loggerContext);
               unboundedKeyUri = '';
               _Logger.default.info('Requesting kms for a new KRO and key', loggerContext);
-              _context10.next = 6;
+              _context10.next = 1;
               return this.webex.internal.encryption.kms.createUnboundKeys({
                 count: 1
               });
-            case 6:
+            case 1:
               unboundedKeys = _context10.sent;
               unboundedKeyUri = unboundedKeys[0].uri;
               this.webex.internal.encryption.kms.createResource({
                 keyUris: [unboundedKeyUri]
               });
               return _context10.abrupt("return", unboundedKeyUri);
-            case 10:
+            case 2:
             case "end":
               return _context10.stop();
           }
@@ -663,7 +663,7 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
       var _fetchEncryptionKeyUrl = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee11() {
         var _response$data$group;
         var loggerContext, response, _response$data$group2;
-        return _regenerator.default.wrap(function _callee11$(_context11) {
+        return _regenerator.default.wrap(function (_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
               loggerContext = {
@@ -672,33 +672,33 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
               };
               _Logger.default.info(_constants.METHOD_START_MESSAGE, loggerContext);
               if (!this.encryptionKeyUrl) {
-                _context11.next = 4;
+                _context11.next = 1;
                 break;
               }
               return _context11.abrupt("return", this.encryptionKeyUrl);
-            case 4:
+            case 1:
               // istanbul ignore else
               if (this.groups === undefined) {
                 this.getContacts();
               }
               // istanbul ignore else
               if (!(this.groups && this.groups.length)) {
-                _context11.next = 7;
+                _context11.next = 2;
                 break;
               }
               return _context11.abrupt("return", this.groups[0].encryptionKeyUrl);
-            case 7:
-              _context11.next = 9;
+            case 2:
+              _context11.next = 3;
               return this.createNewEncryptionKeyUrl();
-            case 9:
+            case 3:
               this.encryptionKeyUrl = _context11.sent;
               _Logger.default.log("Creating a default group: ".concat(_constants2.DEFAULT_GROUP_NAME), {
                 file: _constants2.CONTACTS_CLIENT,
                 method: this.fetchEncryptionKeyUrl.name
               });
-              _context11.next = 13;
+              _context11.next = 4;
               return this.createContactGroup(_constants2.DEFAULT_GROUP_NAME, this.encryptionKeyUrl);
-            case 13:
+            case 4:
               response = _context11.sent;
               if ((_response$data$group = response.data.group) !== null && _response$data$group !== void 0 && _response$data$group.groupId) {
                 this.defaultGroupId = (_response$data$group2 = response.data.group) === null || _response$data$group2 === void 0 ? void 0 : _response$data$group2.groupId;
@@ -708,7 +708,7 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 });
               }
               return _context11.abrupt("return", this.encryptionKeyUrl);
-            case 16:
+            case 5:
             case "end":
               return _context11.stop();
           }
@@ -730,7 +730,7 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     value: (function () {
       var _fetchDefaultGroup = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee12() {
         var loggerContext, i, response, group, groupId;
-        return _regenerator.default.wrap(function _callee12$(_context12) {
+        return _regenerator.default.wrap(function (_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
               loggerContext = {
@@ -739,7 +739,7 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
               };
               _Logger.default.info(_constants.METHOD_START_MESSAGE, loggerContext);
               if (!this.defaultGroupId) {
-                _context12.next = 5;
+                _context12.next = 1;
                 break;
               }
               _Logger.default.log("Using existing default group with ID: ".concat(this.defaultGroupId), {
@@ -747,19 +747,19 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 method: this.fetchDefaultGroup.name
               });
               return _context12.abrupt("return", this.defaultGroupId);
-            case 5:
+            case 1:
               if (!(this.groups && this.groups.length)) {
-                _context12.next = 15;
+                _context12.next = 4;
                 break;
               }
               i = 0;
-            case 7:
+            case 2:
               if (!(i < this.groups.length)) {
-                _context12.next = 15;
+                _context12.next = 4;
                 break;
               }
               if (!(this.groups[i].displayName === _constants2.DEFAULT_GROUP_NAME)) {
-                _context12.next = 12;
+                _context12.next = 3;
                 break;
               }
               this.defaultGroupId = this.groups[i].groupId;
@@ -768,22 +768,22 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 method: this.fetchDefaultGroup.name
               });
               return _context12.abrupt("return", this.defaultGroupId);
-            case 12:
+            case 3:
               i += 1;
-              _context12.next = 7;
+              _context12.next = 2;
               break;
-            case 15:
+            case 4:
               _Logger.default.log('No default group found.', {
                 file: _constants2.CONTACTS_CLIENT,
                 method: this.fetchDefaultGroup.name
               });
-              _context12.next = 18;
+              _context12.next = 5;
               return this.createContactGroup(_constants2.DEFAULT_GROUP_NAME);
-            case 18:
+            case 5:
               response = _context12.sent;
               group = response.data.group;
               if (!group) {
-                _context12.next = 24;
+                _context12.next = 6;
                 break;
               }
               groupId = group.groupId;
@@ -792,9 +792,9 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 method: this.fetchDefaultGroup.name
               });
               return _context12.abrupt("return", groupId);
-            case 24:
+            case 6:
               return _context12.abrupt("return", '');
-            case 25:
+            case 7:
             case "end":
               return _context12.stop();
           }
@@ -817,8 +817,8 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     key: "createContactGroup",
     value: (function () {
       var _createContactGroup = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee13(displayName, encryptionKeyUrl, groupType) {
-        var loggerContext, encryptionKeyUrlFinal, isExistingGroup, encryptedDisplayName, groupInfo, _response$headers2, _this$groups, response, group, contactResponse, errorInfo, extendedError, errorStatus;
-        return _regenerator.default.wrap(function _callee13$(_context13) {
+        var loggerContext, encryptionKeyUrlFinal, isExistingGroup, encryptedDisplayName, groupInfo, _response$headers2, _this$groups, response, group, contactResponse, errorStatus, _t1, _t10;
+        return _regenerator.default.wrap(function (_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
               loggerContext = {
@@ -826,33 +826,33 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 method: _constants2.METHODS.CREATE_CONTACT_GROUP
               };
               _Logger.default.info("".concat(_constants.METHOD_START_MESSAGE, " with displayName: ").concat(displayName), loggerContext);
-              _context13.t0 = encryptionKeyUrl;
-              if (_context13.t0) {
-                _context13.next = 7;
+              _t1 = encryptionKeyUrl;
+              if (_t1) {
+                _context13.next = 2;
                 break;
               }
-              _context13.next = 6;
+              _context13.next = 1;
               return this.fetchEncryptionKeyUrl();
-            case 6:
-              _context13.t0 = _context13.sent;
-            case 7:
-              encryptionKeyUrlFinal = _context13.t0;
+            case 1:
+              _t1 = _context13.sent;
+            case 2:
+              encryptionKeyUrlFinal = _t1;
               if (!(this.groups === undefined)) {
-                _context13.next = 11;
+                _context13.next = 3;
                 break;
               }
-              _context13.next = 11;
+              _context13.next = 3;
               return this.getContacts();
-            case 11:
+            case 3:
               if (!(this.groups && this.groups.length)) {
-                _context13.next = 16;
+                _context13.next = 4;
                 break;
               }
               isExistingGroup = this.groups.find(function (group) {
                 return group.displayName === displayName;
               });
               if (!isExistingGroup) {
-                _context13.next = 16;
+                _context13.next = 4;
                 break;
               }
               _Logger.default.warn("Group name ".concat(displayName, " already exists."), loggerContext);
@@ -863,10 +863,10 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 },
                 message: _constants.FAILURE_MESSAGE
               });
-            case 16:
-              _context13.next = 18;
+            case 4:
+              _context13.next = 5;
               return this.webex.internal.encryption.encryptText(encryptionKeyUrlFinal, displayName);
-            case 18:
+            case 5:
               encryptedDisplayName = _context13.sent;
               groupInfo = {
                 schemas: _constants2.CONTACTS_SCHEMA,
@@ -874,15 +874,15 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 groupType: groupType || _types2.GroupType.NORMAL,
                 encryptionKeyUrl: encryptionKeyUrlFinal
               };
-              _context13.prev = 20;
-              _context13.next = 23;
+              _context13.prev = 6;
+              _context13.next = 7;
               return this.webex.request({
                 // eslint-disable-next-line no-underscore-dangle
-                uri: "".concat(this.webex.internal.services._serviceUrls.contactsService, "/").concat(_constants2.ENCRYPT_FILTER, "/").concat(_constants2.USERS, "/").concat(_constants2.GROUP_FILTER),
+                uri: "".concat(this.contactsServiceUrl, "/").concat(_constants2.ENCRYPT_FILTER, "/").concat(_constants2.USERS, "/").concat(_constants2.GROUP_FILTER),
                 method: _types.HTTP_METHODS.POST,
                 body: groupInfo
               });
-            case 23:
+            case 7:
               response = _context13.sent;
               _Logger.default.log("Response code: ".concat(response.statusCode), loggerContext);
               _Logger.default.log("Response trackingId: ".concat(response === null || response === void 0 ? void 0 : (_response$headers2 = response.headers) === null || _response$headers2 === void 0 ? void 0 : _response$headers2.trackingid), loggerContext);
@@ -898,22 +898,20 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
               (_this$groups = this.groups) === null || _this$groups === void 0 ? void 0 : _this$groups.push(group);
               _Logger.default.log("Contact group ".concat(displayName, " successfully created"), loggerContext);
               return _context13.abrupt("return", contactResponse);
-            case 34:
-              _context13.prev = 34;
-              _context13.t1 = _context13["catch"](20);
-              errorInfo = _context13.t1;
-              extendedError = new Error("Unable to create contact group: ".concat(_context13.t1));
-              _Logger.default.error(extendedError, loggerContext);
-              errorStatus = (0, _Utils.serviceErrorCodeHandler)(errorInfo, loggerContext);
-              _context13.next = 42;
+            case 8:
+              _context13.prev = 8;
+              _t10 = _context13["catch"](6);
+              _Logger.default.error("Unable to create contact group: ".concat((0, _stringify.default)(_t10)), loggerContext);
+              errorStatus = (0, _Utils.serviceErrorCodeHandler)(_t10, loggerContext);
+              _context13.next = 9;
               return (0, _Utils.uploadLogs)();
-            case 42:
+            case 9:
               return _context13.abrupt("return", errorStatus);
-            case 43:
+            case 10:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[20, 34]]);
+        }, _callee13, this, [[6, 8]]);
       }));
       function createContactGroup(_x12, _x13, _x14) {
         return _createContactGroup.apply(this, arguments);
@@ -929,8 +927,8 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     key: "deleteContactGroup",
     value: (function () {
       var _deleteContactGroup = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee14(groupId) {
-        var loggerContext, _response$headers3, _this$groups2, _this$groups4, response, contactResponse, groupToDelete, _this$groups3, errorInfo, extendedError, errorStatus;
-        return _regenerator.default.wrap(function _callee14$(_context14) {
+        var loggerContext, _response$headers3, _this$groups2, _this$groups4, response, contactResponse, groupToDelete, _this$groups3, errorStatus, _t11;
+        return _regenerator.default.wrap(function (_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
               loggerContext = {
@@ -938,15 +936,15 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 method: _constants2.METHODS.DELETE_CONTACT_GROUP
               };
               _Logger.default.info("".concat(_constants.METHOD_START_MESSAGE, " with groupId: ").concat(groupId), loggerContext);
-              _context14.prev = 2;
+              _context14.prev = 1;
               _Logger.default.info("Deleting contact group: ".concat(groupId), loggerContext);
-              _context14.next = 6;
+              _context14.next = 2;
               return this.webex.request({
                 // eslint-disable-next-line no-underscore-dangle
-                uri: "".concat(this.webex.internal.services._serviceUrls.contactsService, "/").concat(_constants2.ENCRYPT_FILTER, "/").concat(_constants2.USERS, "/").concat(_constants2.GROUP_FILTER, "/").concat(groupId),
+                uri: "".concat(this.contactsServiceUrl, "/").concat(_constants2.ENCRYPT_FILTER, "/").concat(_constants2.USERS, "/").concat(_constants2.GROUP_FILTER, "/").concat(groupId),
                 method: _types.HTTP_METHODS.DELETE
               });
-            case 6:
+            case 2:
               response = _context14.sent;
               _Logger.default.log("Response trackingId: ".concat(response === null || response === void 0 ? void 0 : (_response$headers3 = response.headers) === null || _response$headers3 === void 0 ? void 0 : _response$headers3.trackingid), loggerContext);
               contactResponse = {
@@ -965,22 +963,20 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
               }
               _Logger.default.log("Contact group ".concat(groupId, " successfully deleted"), loggerContext);
               return _context14.abrupt("return", contactResponse);
-            case 16:
-              _context14.prev = 16;
-              _context14.t0 = _context14["catch"](2);
-              errorInfo = _context14.t0;
-              extendedError = new Error("Unable to delete contact group ".concat(groupId, ": ").concat(_context14.t0));
-              _Logger.default.error(extendedError, loggerContext);
-              errorStatus = (0, _Utils.serviceErrorCodeHandler)(errorInfo, loggerContext);
-              _context14.next = 24;
+            case 3:
+              _context14.prev = 3;
+              _t11 = _context14["catch"](1);
+              _Logger.default.error("Unable to delete contact group ".concat(groupId, ": ").concat((0, _stringify.default)(_t11)), loggerContext);
+              errorStatus = (0, _Utils.serviceErrorCodeHandler)(_t11, loggerContext);
+              _context14.next = 4;
               return (0, _Utils.uploadLogs)();
-            case 24:
+            case 4:
               return _context14.abrupt("return", errorStatus);
-            case 25:
+            case 5:
             case "end":
               return _context14.stop();
           }
-        }, _callee14, this, [[2, 16]]);
+        }, _callee14, this, [[1, 3]]);
       }));
       function deleteContactGroup(_x15) {
         return _deleteContactGroup.apply(this, arguments);
@@ -996,8 +992,8 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     key: "createContact",
     value: (function () {
       var _createContact = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee15(contactInfo) {
-        var loggerContext, _response$headers4, contact, defaultGroupId, requestBody, encryptedContact, _encryptedContact, response, newContact, contactResponse, query, res, resolvedContact, _this$contacts, _this$contacts2, errorInfo, extendedError, errorStatus;
-        return _regenerator.default.wrap(function _callee15$(_context15) {
+        var loggerContext, _response$headers4, contact, defaultGroupId, requestBody, encryptedContact, _encryptedContact, response, newContact, contactResponse, query, res, resolvedContact, _this$contacts, _this$contacts2, errorStatus, _t12, _t13;
+        return _regenerator.default.wrap(function (_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
               loggerContext = {
@@ -1005,42 +1001,42 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 method: _constants2.METHODS.CREATE_CONTACT
               };
               _Logger.default.info("".concat(_constants.METHOD_START_MESSAGE, " with contactType: ").concat(contactInfo.contactType), loggerContext);
-              _context15.prev = 2;
+              _context15.prev = 1;
               contact = _objectSpread({}, contactInfo);
               if (contact.encryptionKeyUrl) {
-                _context15.next = 8;
+                _context15.next = 3;
                 break;
               }
-              _context15.next = 7;
+              _context15.next = 2;
               return this.fetchEncryptionKeyUrl();
-            case 7:
+            case 2:
               contact.encryptionKeyUrl = _context15.sent;
-            case 8:
+            case 3:
               if (!(!contact.groups || contact.groups.length === 0)) {
-                _context15.next = 13;
+                _context15.next = 5;
                 break;
               }
-              _context15.next = 11;
+              _context15.next = 4;
               return this.fetchDefaultGroup();
-            case 11:
+            case 4:
               defaultGroupId = _context15.sent;
               contact.groups = [defaultGroupId];
-            case 13:
+            case 5:
               contact.schemas = _constants2.CONTACTS_SCHEMA;
               requestBody = {};
-              _context15.t0 = contact.contactType;
-              _context15.next = _context15.t0 === _types2.ContactType.CUSTOM ? 18 : _context15.t0 === _types2.ContactType.CLOUD ? 23 : 30;
+              _t12 = contact.contactType;
+              _context15.next = _t12 === _types2.ContactType.CUSTOM ? 6 : _t12 === _types2.ContactType.CLOUD ? 8 : 11;
               break;
-            case 18:
-              _context15.next = 20;
+            case 6:
+              _context15.next = 7;
               return this.encryptContact(contact);
-            case 20:
+            case 7:
               encryptedContact = _context15.sent;
               requestBody = encryptedContact;
-              return _context15.abrupt("break", 31);
-            case 23:
+              return _context15.abrupt("continue", 12);
+            case 8:
               if (contact.contactId) {
-                _context15.next = 25;
+                _context15.next = 9;
                 break;
               }
               return _context15.abrupt("return", {
@@ -1050,14 +1046,14 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 },
                 message: _constants.FAILURE_MESSAGE
               });
-            case 25:
-              _context15.next = 27;
+            case 9:
+              _context15.next = 10;
               return this.encryptContact(contact);
-            case 27:
+            case 10:
               _encryptedContact = _context15.sent;
               requestBody = _encryptedContact;
-              return _context15.abrupt("break", 31);
-            case 30:
+              return _context15.abrupt("continue", 12);
+            case 11:
               return _context15.abrupt("return", {
                 statusCode: 400,
                 data: {
@@ -1065,15 +1061,15 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 },
                 message: _constants.FAILURE_MESSAGE
               });
-            case 31:
-              _context15.next = 33;
+            case 12:
+              _context15.next = 13;
               return this.webex.request({
                 // eslint-disable-next-line no-underscore-dangle
-                uri: "".concat(this.webex.internal.services._serviceUrls.contactsService, "/").concat(_constants2.ENCRYPT_FILTER, "/").concat(_constants2.USERS, "/").concat(_constants2.CONTACT_FILTER),
+                uri: "".concat(this.contactsServiceUrl, "/").concat(_constants2.ENCRYPT_FILTER, "/").concat(_constants2.USERS, "/").concat(_constants2.CONTACT_FILTER),
                 method: _types.HTTP_METHODS.POST,
                 body: requestBody
               });
-            case 33:
+            case 13:
               response = _context15.sent;
               _Logger.default.log("Response code: ".concat(response.statusCode), loggerContext);
               _Logger.default.log("Response trackingId: ".concat(response === null || response === void 0 ? void 0 : (_response$headers4 = response.headers) === null || _response$headers4 === void 0 ? void 0 : _response$headers4.trackingid), loggerContext);
@@ -1087,41 +1083,39 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 message: _constants.SUCCESS_MESSAGE
               };
               if (!(contact.contactType === _types2.ContactType.CLOUD && newContact.contactId)) {
-                _context15.next = 48;
+                _context15.next = 15;
                 break;
               }
               query = "".concat(_constants2.SCIM_ID_FILTER, " \"").concat(newContact.contactId, "\"");
-              _context15.next = 43;
+              _context15.next = 14;
               return (0, _Utils.scimQuery)(query);
-            case 43:
+            case 14:
               res = _context15.sent;
               resolvedContact = this.resolveCloudContacts(Object.fromEntries([[newContact.contactId, newContact]]), res.body);
               if (resolvedContact) {
                 (_this$contacts = this.contacts) === null || _this$contacts === void 0 ? void 0 : _this$contacts.push(resolvedContact[0]);
               }
-              _context15.next = 49;
+              _context15.next = 16;
               break;
-            case 48:
+            case 15:
               (_this$contacts2 = this.contacts) === null || _this$contacts2 === void 0 ? void 0 : _this$contacts2.push(contact);
-            case 49:
+            case 16:
               _Logger.default.log("Contact successfully created", loggerContext);
               return _context15.abrupt("return", contactResponse);
-            case 53:
-              _context15.prev = 53;
-              _context15.t1 = _context15["catch"](2);
-              errorInfo = _context15.t1;
-              extendedError = new Error("Failed to create contact: ".concat(_context15.t1));
-              _Logger.default.error(extendedError, loggerContext);
-              errorStatus = (0, _Utils.serviceErrorCodeHandler)(errorInfo, loggerContext);
-              _context15.next = 61;
+            case 17:
+              _context15.prev = 17;
+              _t13 = _context15["catch"](1);
+              _Logger.default.error("Failed to create contact: ".concat((0, _stringify.default)(_t13)), loggerContext);
+              errorStatus = (0, _Utils.serviceErrorCodeHandler)(_t13, loggerContext);
+              _context15.next = 18;
               return (0, _Utils.uploadLogs)();
-            case 61:
+            case 18:
               return _context15.abrupt("return", errorStatus);
-            case 62:
+            case 19:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[2, 53]]);
+        }, _callee15, this, [[1, 17]]);
       }));
       function createContact(_x16) {
         return _createContact.apply(this, arguments);
@@ -1137,8 +1131,8 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     key: "deleteContact",
     value: (function () {
       var _deleteContact = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee16(contactId) {
-        var loggerContext, _this$contacts3, response, contactResponse, contactToDelete, _this$contacts4, errorInfo, extendedError, errorStatus;
-        return _regenerator.default.wrap(function _callee16$(_context16) {
+        var loggerContext, _this$contacts3, response, contactResponse, contactToDelete, _this$contacts4, errorStatus, _t14;
+        return _regenerator.default.wrap(function (_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
               loggerContext = {
@@ -1146,15 +1140,15 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 method: _constants2.METHODS.DELETE_CONTACT
               };
               _Logger.default.info("".concat(_constants.METHOD_START_MESSAGE, " with contactId: ").concat(contactId), loggerContext);
-              _context16.prev = 2;
+              _context16.prev = 1;
               _Logger.default.info("Deleting contact : ".concat(contactId), loggerContext);
-              _context16.next = 6;
+              _context16.next = 2;
               return this.webex.request({
                 // eslint-disable-next-line no-underscore-dangle
-                uri: "".concat(this.webex.internal.services._serviceUrls.contactsService, "/").concat(_constants2.ENCRYPT_FILTER, "/").concat(_constants2.USERS, "/").concat(_constants2.CONTACT_FILTER, "/").concat(contactId),
+                uri: "".concat(this.contactsServiceUrl, "/").concat(_constants2.ENCRYPT_FILTER, "/").concat(_constants2.USERS, "/").concat(_constants2.CONTACT_FILTER, "/").concat(contactId),
                 method: _types.HTTP_METHODS.DELETE
               });
-            case 6:
+            case 2:
               response = _context16.sent;
               contactResponse = {
                 statusCode: Number(response[_constants.STATUS_CODE]),
@@ -1169,22 +1163,20 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
               }
               _Logger.default.log("Contact ".concat(contactId, " successfully deleted"), loggerContext);
               return _context16.abrupt("return", contactResponse);
-            case 14:
-              _context16.prev = 14;
-              _context16.t0 = _context16["catch"](2);
-              errorInfo = _context16.t0;
-              extendedError = new Error("Unable to delete contact ".concat(contactId, ": ").concat(_context16.t0));
-              _Logger.default.error(extendedError, loggerContext);
-              errorStatus = (0, _Utils.serviceErrorCodeHandler)(errorInfo, loggerContext);
-              _context16.next = 22;
+            case 3:
+              _context16.prev = 3;
+              _t14 = _context16["catch"](1);
+              _Logger.default.error("Unable to delete contact ".concat(contactId, ": ").concat((0, _stringify.default)(_t14)), loggerContext);
+              errorStatus = (0, _Utils.serviceErrorCodeHandler)(_t14, loggerContext);
+              _context16.next = 4;
               return (0, _Utils.uploadLogs)();
-            case 22:
+            case 4:
               return _context16.abrupt("return", errorStatus);
-            case 23:
+            case 5:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, this, [[2, 14]]);
+        }, _callee16, this, [[1, 3]]);
       }));
       function deleteContact(_x17) {
         return _deleteContact.apply(this, arguments);
@@ -1201,7 +1193,6 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
       return this.sdkConnector;
     }
   }]);
-  return ContactsClient;
 }();
 /**
  * Creates a ContactsClient instance