@webex/calling 3.3.1-next.13 → 3.3.1-next.15

package/dist/Contacts/ContactsClient.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var _Object$keys2 = require("@babel/runtime-corejs2/core-js/object/keys");
+var _Object$keys = require("@babel/runtime-corejs2/core-js/object/keys");
 var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs2/core-js/object/get-own-property-symbols");
 var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs2/core-js/object/get-own-property-descriptor");
 var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs2/core-js/object/get-own-property-descriptors");
@@ -15,7 +15,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs2/regene
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
 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 _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"));
@@ -29,7 +28,9 @@ var _Logger = _interopRequireDefault(require("../Logger"));
 var _constants2 = require("./constants");
 var _types2 = require("./types");
 var _Utils = require("../common/Utils");
-function ownKeys(e, r) { var t = _Object$keys2(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+var _ExtendedError = _interopRequireDefault(require("../Errors/catalog/ExtendedError"));
+var _types3 = require("../Errors/types");
+function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; } /* eslint-disable no-await-in-loop */
 /**
  * `ContactsClient` module is designed to offer a set of APIs for retrieving and updating contacts and groups from the contacts-service.
@@ -58,6 +59,7 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
       _SDKConnector.default.setWebex(webex);
     }
     this.webex = this.sdkConnector.getWebex();
+    this.webex.internal.dss.register();
     this.encryptionKeyUrl = '';
     this.groups = undefined;
     this.contacts = undefined;
@@ -378,105 +380,85 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
   }, {
     key: "fetchContactFromDSS",
     value: (function () {
-      var _fetchContactFromDSS = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(contactsDataMap) {
-        var _this5 = this;
-        var contactList, dssResult, _loop, i;
-        return _regenerator.default.wrap(function _callee9$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _fetchContactFromDSS = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(contactsDataMap, id) {
+        var contact, contactId, displayName, emails, phoneNumbers, sipAddresses, photos, _contact$additionalIn, department, firstName, identityManager, jobTitle, lastName, manager, _contactsDataMap$cont, contactType, avatarUrlDomain, encryptionKeyUrl, ownerId, groups, avatarURL, addedPhoneNumbers, decryptedPhoneNumbers, addedSipAddresses, decryptedSipAddresses, cloudContact;
+        return _regenerator.default.wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              contactList = [];
-              _context10.next = 3;
+              _context9.prev = 0;
+              _context9.next = 3;
               return this.webex.internal.dss.lookup({
-                ids: (0, _keys.default)(contactsDataMap)
+                id: id,
+                shouldBatch: true
               });
             case 3:
-              dssResult = _context10.sent;
-              _loop = /*#__PURE__*/_regenerator.default.mark(function _loop() {
-                var contact, contactId, displayName, emails, phoneNumbers, sipAddresses, photos, _contact$additionalIn, department, firstName, identityManager, jobTitle, lastName, manager, _contactsDataMap$cont, contactType, avatarUrlDomain, encryptionKeyUrl, ownerId, groups, avatarURL, addedPhoneNumbers, decryptedPhoneNumbers, addedSipAddresses, decryptedSipAddresses, cloudContact;
-                return _regenerator.default.wrap(function _loop$(_context9) {
-                  while (1) switch (_context9.prev = _context9.next) {
-                    case 0:
-                      contact = dssResult[i];
-                      contactId = contact.identity;
-                      displayName = contact.displayName, emails = contact.emails, phoneNumbers = contact.phoneNumbers, sipAddresses = contact.sipAddresses, photos = contact.photos;
-                      _contact$additionalIn = contact.additionalInfo, department = _contact$additionalIn.department, firstName = _contact$additionalIn.firstName, identityManager = _contact$additionalIn.identityManager, jobTitle = _contact$additionalIn.jobTitle, lastName = _contact$additionalIn.lastName;
-                      manager = identityManager && identityManager.displayName ? identityManager.displayName : undefined;
-                      _contactsDataMap$cont = contactsDataMap[contactId], contactType = _contactsDataMap$cont.contactType, avatarUrlDomain = _contactsDataMap$cont.avatarUrlDomain, encryptionKeyUrl = _contactsDataMap$cont.encryptionKeyUrl, ownerId = _contactsDataMap$cont.ownerId, groups = _contactsDataMap$cont.groups;
-                      avatarURL = '';
-                      if (photos.length) {
-                        avatarURL = photos[0].value;
-                      }
-                      addedPhoneNumbers = contactsDataMap[contactId].phoneNumbers;
-                      if (!addedPhoneNumbers) {
-                        _context9.next = 14;
-                        break;
-                      }
-                      _context9.next = 12;
-                      return _this5.decryptContactDetail(encryptionKeyUrl, addedPhoneNumbers);
-                    case 12:
-                      decryptedPhoneNumbers = _context9.sent;
-                      decryptedPhoneNumbers.forEach(function (number) {
-                        return phoneNumbers.push(number);
-                      });
-                    case 14:
-                      addedSipAddresses = contactsDataMap[contactId].sipAddresses;
-                      if (!addedSipAddresses) {
-                        _context9.next = 20;
-                        break;
-                      }
-                      _context9.next = 18;
-                      return _this5.decryptContactDetail(encryptionKeyUrl, addedSipAddresses);
-                    case 18:
-                      decryptedSipAddresses = _context9.sent;
-                      decryptedSipAddresses.forEach(function (address) {
-                        return sipAddresses.push(address);
-                      });
-                    case 20:
-                      cloudContact = {
-                        avatarUrlDomain: avatarUrlDomain,
-                        avatarURL: avatarURL,
-                        contactId: contactId,
-                        contactType: contactType,
-                        department: department,
-                        displayName: displayName,
-                        emails: emails,
-                        encryptionKeyUrl: encryptionKeyUrl,
-                        firstName: firstName,
-                        groups: groups,
-                        lastName: lastName,
-                        manager: manager,
-                        ownerId: ownerId,
-                        phoneNumbers: phoneNumbers,
-                        sipAddresses: sipAddresses,
-                        title: jobTitle
-                      };
-                      contactList.push(cloudContact);
-                    case 22:
-                    case "end":
-                      return _context9.stop();
-                  }
-                }, _loop);
+              contact = _context9.sent;
+              contactId = contact.identity;
+              displayName = contact.displayName, emails = contact.emails, phoneNumbers = contact.phoneNumbers, sipAddresses = contact.sipAddresses, photos = contact.photos;
+              _contact$additionalIn = contact.additionalInfo, department = _contact$additionalIn.department, firstName = _contact$additionalIn.firstName, identityManager = _contact$additionalIn.identityManager, jobTitle = _contact$additionalIn.jobTitle, lastName = _contact$additionalIn.lastName;
+              manager = identityManager && identityManager.displayName ? identityManager.displayName : undefined;
+              _contactsDataMap$cont = contactsDataMap[contactId], contactType = _contactsDataMap$cont.contactType, avatarUrlDomain = _contactsDataMap$cont.avatarUrlDomain, encryptionKeyUrl = _contactsDataMap$cont.encryptionKeyUrl, ownerId = _contactsDataMap$cont.ownerId, groups = _contactsDataMap$cont.groups;
+              avatarURL = '';
+              if (photos.length) {
+                avatarURL = photos[0].value;
+              }
+              addedPhoneNumbers = contactsDataMap[contactId].phoneNumbers;
+              if (!addedPhoneNumbers) {
+                _context9.next = 17;
+                break;
+              }
+              _context9.next = 15;
+              return this.decryptContactDetail(encryptionKeyUrl, addedPhoneNumbers);
+            case 15:
+              decryptedPhoneNumbers = _context9.sent;
+              decryptedPhoneNumbers.forEach(function (number) {
+                return phoneNumbers.push(number);
               });
-              i = 0;
-            case 6:
-              if (!(i < dssResult.length)) {
-                _context10.next = 11;
+            case 17:
+              addedSipAddresses = contactsDataMap[contactId].sipAddresses;
+              if (!addedSipAddresses) {
+                _context9.next = 23;
                 break;
               }
-              return _context10.delegateYield(_loop(), "t0", 8);
-            case 8:
-              i += 1;
-              _context10.next = 6;
-              break;
-            case 11:
-              return _context10.abrupt("return", contactList);
-            case 12:
+              _context9.next = 21;
+              return this.decryptContactDetail(encryptionKeyUrl, addedSipAddresses);
+            case 21:
+              decryptedSipAddresses = _context9.sent;
+              decryptedSipAddresses.forEach(function (address) {
+                return sipAddresses.push(address);
+              });
+            case 23:
+              cloudContact = {
+                avatarUrlDomain: avatarUrlDomain,
+                avatarURL: avatarURL,
+                contactId: contactId,
+                contactType: contactType,
+                department: department,
+                displayName: displayName,
+                emails: emails,
+                encryptionKeyUrl: encryptionKeyUrl,
+                firstName: firstName,
+                groups: groups,
+                lastName: lastName,
+                manager: manager,
+                ownerId: ownerId,
+                phoneNumbers: phoneNumbers,
+                sipAddresses: sipAddresses,
+                title: jobTitle
+              };
+              return _context9.abrupt("return", cloudContact);
+            case 27:
+              _context9.prev = 27;
+              _context9.t0 = _context9["catch"](0);
+              _Logger.default.error(new _ExtendedError.default(_context9.t0.message, {}, _types3.ERROR_TYPE.DEFAULT), {});
+              return _context9.abrupt("return", null);
+            case 31:
             case "end":
-              return _context10.stop();
+              return _context9.stop();
           }
-        }, _callee9, this);
+        }, _callee9, this, [[0, 27]]);
       }));
-      function fetchContactFromDSS(_x11) {
+      function fetchContactFromDSS(_x11, _x12) {
         return _fetchContactFromDSS.apply(this, arguments);
       }
       return fetchContactFromDSS;
@@ -489,10 +471,10 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     key: "getContacts",
     value: (function () {
       var _getContacts = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
-        var _this6 = this;
-        var loggerContext, contactList, contactsDataMap, response, responseBody, contacts, groups, i, contact, decryptedContact, cloudContacts, contactResponse, errorInfo, errorStatus;
-        return _regenerator.default.wrap(function _callee11$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        var _this5 = this;
+        var loggerContext, contactList, contactsDataMap, response, responseBody, contacts, groups, i, contact, decryptedContact, contactDetails, contactResponse, errorInfo, errorStatus;
+        return _regenerator.default.wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               loggerContext = {
                 file: _constants2.CONTACTS_FILE,
@@ -500,18 +482,18 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
               };
               contactList = [];
               contactsDataMap = {};
-              _context12.prev = 3;
-              _context12.next = 6;
+              _context11.prev = 3;
+              _context11.next = 6;
               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),
                 method: _types.HTTP_METHODS.GET
               });
             case 6:
-              response = _context12.sent;
+              response = _context11.sent;
               responseBody = response.body;
               if (responseBody) {
-                _context12.next = 10;
+                _context11.next = 10;
                 break;
               }
               throw new Error("".concat(response));
@@ -520,57 +502,56 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
               i = 0;
             case 12:
               if (!(i < contacts.length)) {
-                _context12.next = 25;
+                _context11.next = 30;
                 break;
               }
               contact = contacts[i];
               if (!(contact.contactType === _types2.ContactType.CUSTOM)) {
-                _context12.next = 21;
+                _context11.next = 21;
                 break;
               }
-              _context12.next = 17;
+              _context11.next = 17;
               return this.decryptContact(contact);
             case 17:
-              decryptedContact = _context12.sent;
+              decryptedContact = _context11.sent;
               contactList.push(decryptedContact);
-              _context12.next = 22;
+              _context11.next = 27;
               break;
             case 21:
-              if (contact.contactType === _types2.ContactType.CLOUD && contact.contactId) {
-                contactsDataMap[contact.contactId] = contact;
+              if (!(contact.contactType === _types2.ContactType.CLOUD && contact.contactId)) {
+                _context11.next = 27;
+                break;
               }
-            case 22:
-              i += 1;
-              _context12.next = 12;
-              break;
+              contactsDataMap[contact.contactId] = contact;
+              _context11.next = 25;
+              return this.fetchContactFromDSS(contactsDataMap, contact.contactId);
             case 25:
-              if (!(0, _keys.default)(contactsDataMap).length) {
-                _context12.next = 30;
-                break;
+              contactDetails = _context11.sent;
+              if (contactDetails) {
+                contactList.push(contactDetails);
               }
-              _context12.next = 28;
-              return this.fetchContactFromDSS(contactsDataMap);
-            case 28:
-              cloudContacts = _context12.sent;
-              contactList.push.apply(contactList, (0, _toConsumableArray2.default)(cloudContacts));
+            case 27:
+              i += 1;
+              _context11.next = 12;
+              break;
             case 30:
-              _context12.next = 32;
+              _context11.next = 32;
               return _promise.default.all(groups.map( /*#__PURE__*/function () {
                 var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10(group, idx) {
-                  return _regenerator.default.wrap(function _callee10$(_context11) {
-                    while (1) switch (_context11.prev = _context11.next) {
+                  return _regenerator.default.wrap(function _callee10$(_context10) {
+                    while (1) switch (_context10.prev = _context10.next) {
                       case 0:
-                        _context11.next = 2;
-                        return _this6.webex.internal.encryption.decryptText(group.encryptionKeyUrl, group.displayName);
+                        _context10.next = 2;
+                        return _this5.webex.internal.encryption.decryptText(group.encryptionKeyUrl, group.displayName);
                       case 2:
-                        groups[idx].displayName = _context11.sent;
+                        groups[idx].displayName = _context10.sent;
                       case 3:
                       case "end":
-                        return _context11.stop();
+                        return _context10.stop();
                     }
                   }, _callee10);
                 }));
-                return function (_x12, _x13) {
+                return function (_x13, _x14) {
                   return _ref13.apply(this, arguments);
                 };
               }()));
@@ -585,16 +566,16 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 },
                 message: _constants.SUCCESS_MESSAGE
               };
-              return _context12.abrupt("return", contactResponse);
+              return _context11.abrupt("return", contactResponse);
             case 38:
-              _context12.prev = 38;
-              _context12.t0 = _context12["catch"](3);
-              errorInfo = _context12.t0;
+              _context11.prev = 38;
+              _context11.t0 = _context11["catch"](3);
+              errorInfo = _context11.t0;
               errorStatus = (0, _Utils.serviceErrorCodeHandler)(errorInfo, loggerContext);
-              return _context12.abrupt("return", errorStatus);
+              return _context11.abrupt("return", errorStatus);
             case 43:
             case "end":
-              return _context12.stop();
+              return _context11.stop();
           }
         }, _callee11, this, [[3, 38]]);
       }));
@@ -614,8 +595,8 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     value: (function () {
       var _createNewEncryptionKeyUrl = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12() {
         var loggerContext, unboundedKeyUri, unboundedKeys;
-        return _regenerator.default.wrap(function _callee12$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regenerator.default.wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               loggerContext = {
                 file: _constants2.CONTACTS_FILE,
@@ -623,20 +604,20 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
               };
               unboundedKeyUri = '';
               _Logger.default.info('Requesting kms for a new KRO and key', loggerContext);
-              _context13.next = 5;
+              _context12.next = 5;
               return this.webex.internal.encryption.kms.createUnboundKeys({
                 count: 1
               });
             case 5:
-              unboundedKeys = _context13.sent;
+              unboundedKeys = _context12.sent;
               unboundedKeyUri = unboundedKeys[0].uri;
               this.webex.internal.encryption.kms.createResource({
                 keyUris: [unboundedKeyUri]
               });
-              return _context13.abrupt("return", unboundedKeyUri);
+              return _context12.abrupt("return", unboundedKeyUri);
             case 9:
             case "end":
-              return _context13.stop();
+              return _context12.stop();
           }
         }, _callee12, this);
       }));
@@ -657,14 +638,14 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
       var _fetchEncryptionKeyUrl = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13() {
         var _response$data$group;
         var response, _response$data$group2;
-        return _regenerator.default.wrap(function _callee13$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regenerator.default.wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               if (!this.encryptionKeyUrl) {
-                _context14.next = 2;
+                _context13.next = 2;
                 break;
               }
-              return _context14.abrupt("return", this.encryptionKeyUrl);
+              return _context13.abrupt("return", this.encryptionKeyUrl);
             case 2:
               // istanbul ignore else
               if (this.groups === undefined) {
@@ -672,30 +653,30 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
               }
               // istanbul ignore else
               if (!(this.groups && this.groups.length)) {
-                _context14.next = 5;
+                _context13.next = 5;
                 break;
               }
-              return _context14.abrupt("return", this.groups[0].encryptionKeyUrl);
+              return _context13.abrupt("return", this.groups[0].encryptionKeyUrl);
             case 5:
-              _context14.next = 7;
+              _context13.next = 7;
               return this.createNewEncryptionKeyUrl();
             case 7:
-              this.encryptionKeyUrl = _context14.sent;
+              this.encryptionKeyUrl = _context13.sent;
               _Logger.default.info("Creating a default group: ".concat(_constants2.DEFAULT_GROUP_NAME), {
                 file: _constants2.CONTACTS_FILE,
                 method: this.fetchEncryptionKeyUrl.name
               });
-              _context14.next = 11;
+              _context13.next = 11;
               return this.createContactGroup(_constants2.DEFAULT_GROUP_NAME, this.encryptionKeyUrl);
             case 11:
-              response = _context14.sent;
+              response = _context13.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;
               }
-              return _context14.abrupt("return", this.encryptionKeyUrl);
+              return _context13.abrupt("return", this.encryptionKeyUrl);
             case 14:
             case "end":
-              return _context14.stop();
+              return _context13.stop();
           }
         }, _callee13, this);
       }));
@@ -715,55 +696,55 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     value: (function () {
       var _fetchDefaultGroup = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee14() {
         var i, response, group;
-        return _regenerator.default.wrap(function _callee14$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regenerator.default.wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               if (!this.defaultGroupId) {
-                _context15.next = 2;
+                _context14.next = 2;
                 break;
               }
-              return _context15.abrupt("return", this.defaultGroupId);
+              return _context14.abrupt("return", this.defaultGroupId);
             case 2:
               if (!(this.groups && this.groups.length)) {
-                _context15.next = 11;
+                _context14.next = 11;
                 break;
               }
               i = 0;
             case 4:
               if (!(i < this.groups.length)) {
-                _context15.next = 11;
+                _context14.next = 11;
                 break;
               }
               if (!(this.groups[i].displayName === _constants2.DEFAULT_GROUP_NAME)) {
-                _context15.next = 8;
+                _context14.next = 8;
                 break;
               }
               this.defaultGroupId = this.groups[i].groupId;
-              return _context15.abrupt("return", this.defaultGroupId);
+              return _context14.abrupt("return", this.defaultGroupId);
             case 8:
               i += 1;
-              _context15.next = 4;
+              _context14.next = 4;
               break;
             case 11:
               _Logger.default.info('No default group found.', {
                 file: _constants2.CONTACTS_FILE,
                 method: this.fetchDefaultGroup.name
               });
-              _context15.next = 14;
+              _context14.next = 14;
               return this.createContactGroup(_constants2.DEFAULT_GROUP_NAME);
             case 14:
-              response = _context15.sent;
+              response = _context14.sent;
               group = response.data.group;
               if (!group) {
-                _context15.next = 18;
+                _context14.next = 18;
                 break;
               }
-              return _context15.abrupt("return", group.groupId);
+              return _context14.abrupt("return", group.groupId);
             case 18:
-              return _context15.abrupt("return", '');
+              return _context14.abrupt("return", '');
             case 19:
             case "end":
-              return _context15.stop();
+              return _context14.stop();
           }
         }, _callee14, this);
       }));
@@ -785,45 +766,45 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     value: (function () {
       var _createContactGroup = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee15(displayName, encryptionKeyUrl, groupType) {
         var loggerContext, encryptionKeyUrlFinal, isExistingGroup, encryptedDisplayName, groupInfo, _this$groups, response, group, contactResponse, errorInfo, errorStatus;
-        return _regenerator.default.wrap(function _callee15$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regenerator.default.wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               loggerContext = {
                 file: _constants2.CONTACTS_FILE,
                 method: this.createContactGroup.name
               };
               _Logger.default.info("Creating contact group ".concat(displayName), loggerContext);
-              _context16.t0 = encryptionKeyUrl;
-              if (_context16.t0) {
-                _context16.next = 7;
+              _context15.t0 = encryptionKeyUrl;
+              if (_context15.t0) {
+                _context15.next = 7;
                 break;
               }
-              _context16.next = 6;
+              _context15.next = 6;
               return this.fetchEncryptionKeyUrl();
             case 6:
-              _context16.t0 = _context16.sent;
+              _context15.t0 = _context15.sent;
             case 7:
-              encryptionKeyUrlFinal = _context16.t0;
+              encryptionKeyUrlFinal = _context15.t0;
               if (!(this.groups === undefined)) {
-                _context16.next = 11;
+                _context15.next = 11;
                 break;
               }
-              _context16.next = 11;
+              _context15.next = 11;
               return this.getContacts();
             case 11:
               if (!(this.groups && this.groups.length)) {
-                _context16.next = 16;
+                _context15.next = 16;
                 break;
               }
               isExistingGroup = this.groups.find(function (group) {
                 return group.displayName === displayName;
               });
               if (!isExistingGroup) {
-                _context16.next = 16;
+                _context15.next = 16;
                 break;
               }
               _Logger.default.warn("Group name ".concat(displayName, " already exists."), loggerContext);
-              return _context16.abrupt("return", {
+              return _context15.abrupt("return", {
                 statusCode: 400,
                 data: {
                   error: 'Group displayName already exists'
@@ -831,18 +812,18 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 message: _constants.FAILURE_MESSAGE
               });
             case 16:
-              _context16.next = 18;
+              _context15.next = 18;
               return this.webex.internal.encryption.encryptText(encryptionKeyUrlFinal, displayName);
             case 18:
-              encryptedDisplayName = _context16.sent;
+              encryptedDisplayName = _context15.sent;
               groupInfo = {
                 schemas: _constants2.CONTACTS_SCHEMA,
                 displayName: encryptedDisplayName,
                 groupType: groupType || _types2.GroupType.NORMAL,
                 encryptionKeyUrl: encryptionKeyUrlFinal
               };
-              _context16.prev = 20;
-              _context16.next = 23;
+              _context15.prev = 20;
+              _context15.next = 23;
               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),
@@ -850,7 +831,7 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 body: groupInfo
               });
             case 23:
-              response = _context16.sent;
+              response = _context15.sent;
               group = response.body;
               group.displayName = displayName;
               contactResponse = {
@@ -861,21 +842,21 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 message: _constants.SUCCESS_MESSAGE
               };
               (_this$groups = this.groups) === null || _this$groups === void 0 ? void 0 : _this$groups.push(group);
-              return _context16.abrupt("return", contactResponse);
+              return _context15.abrupt("return", contactResponse);
             case 31:
-              _context16.prev = 31;
-              _context16.t1 = _context16["catch"](20);
+              _context15.prev = 31;
+              _context15.t1 = _context15["catch"](20);
               _Logger.default.warn('Unable to create contact group.', loggerContext);
-              errorInfo = _context16.t1;
+              errorInfo = _context15.t1;
               errorStatus = (0, _Utils.serviceErrorCodeHandler)(errorInfo, loggerContext);
-              return _context16.abrupt("return", errorStatus);
+              return _context15.abrupt("return", errorStatus);
             case 37:
             case "end":
-              return _context16.stop();
+              return _context15.stop();
           }
         }, _callee15, this, [[20, 31]]);
       }));
-      function createContactGroup(_x14, _x15, _x16) {
+      function createContactGroup(_x15, _x16, _x17) {
         return _createContactGroup.apply(this, arguments);
       }
       return createContactGroup;
@@ -890,23 +871,23 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     value: (function () {
       var _deleteContactGroup = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee16(groupId) {
         var loggerContext, _this$groups2, _this$groups4, response, contactResponse, groupToDelete, _this$groups3, errorInfo, errorStatus;
-        return _regenerator.default.wrap(function _callee16$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regenerator.default.wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               loggerContext = {
                 file: _constants2.CONTACTS_FILE,
                 method: this.deleteContactGroup.name
               };
-              _context17.prev = 1;
+              _context16.prev = 1;
               _Logger.default.info("Deleting contact group: ".concat(groupId), loggerContext);
-              _context17.next = 5;
+              _context16.next = 5;
               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),
                 method: _types.HTTP_METHODS.DELETE
               });
             case 5:
-              response = _context17.sent;
+              response = _context16.sent;
               contactResponse = {
                 statusCode: Number(response[_constants.STATUS_CODE]),
                 data: {},
@@ -921,21 +902,21 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
               if (!((_this$groups4 = this.groups) !== null && _this$groups4 !== void 0 && _this$groups4.length)) {
                 this.defaultGroupId = '';
               }
-              return _context17.abrupt("return", contactResponse);
+              return _context16.abrupt("return", contactResponse);
             case 13:
-              _context17.prev = 13;
-              _context17.t0 = _context17["catch"](1);
+              _context16.prev = 13;
+              _context16.t0 = _context16["catch"](1);
               _Logger.default.warn("Unable to delete contact group ".concat(groupId), loggerContext);
-              errorInfo = _context17.t0;
+              errorInfo = _context16.t0;
               errorStatus = (0, _Utils.serviceErrorCodeHandler)(errorInfo, loggerContext);
-              return _context17.abrupt("return", errorStatus);
+              return _context16.abrupt("return", errorStatus);
             case 19:
             case "end":
-              return _context17.stop();
+              return _context16.stop();
           }
         }, _callee16, this, [[1, 13]]);
       }));
-      function deleteContactGroup(_x17) {
+      function deleteContactGroup(_x18) {
         return _deleteContactGroup.apply(this, arguments);
       }
       return deleteContactGroup;
@@ -949,54 +930,54 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     key: "createContact",
     value: (function () {
       var _createContact = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17(contactInfo) {
-        var loggerContext, contact, defaultGroupId, requestBody, encryptedContact, _encryptedContact, response, newContact, contactResponse, decryptedContacts, _this$contacts, _this$contacts2, errorInfo, errorStatus;
-        return _regenerator.default.wrap(function _callee17$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        var loggerContext, contact, defaultGroupId, requestBody, encryptedContact, _encryptedContact, response, newContact, contactResponse, decryptedContact, _this$contacts, _this$contacts2, errorInfo, errorStatus;
+        return _regenerator.default.wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               loggerContext = {
                 file: _constants2.CONTACTS_FILE,
                 method: this.createContact.name
               };
               _Logger.default.info("Request to create contact: contactType: ".concat(contactInfo.contactType), loggerContext);
-              _context18.prev = 2;
+              _context17.prev = 2;
               contact = _objectSpread({}, contactInfo);
               if (contact.encryptionKeyUrl) {
-                _context18.next = 8;
+                _context17.next = 8;
                 break;
               }
-              _context18.next = 7;
+              _context17.next = 7;
               return this.fetchEncryptionKeyUrl();
             case 7:
-              contact.encryptionKeyUrl = _context18.sent;
+              contact.encryptionKeyUrl = _context17.sent;
             case 8:
               if (!(!contact.groups || contact.groups.length === 0)) {
-                _context18.next = 13;
+                _context17.next = 13;
                 break;
               }
-              _context18.next = 11;
+              _context17.next = 11;
               return this.fetchDefaultGroup();
             case 11:
-              defaultGroupId = _context18.sent;
+              defaultGroupId = _context17.sent;
               contact.groups = [defaultGroupId];
             case 13:
               contact.schemas = _constants2.CONTACTS_SCHEMA;
               requestBody = {};
-              _context18.t0 = contact.contactType;
-              _context18.next = _context18.t0 === _types2.ContactType.CUSTOM ? 18 : _context18.t0 === _types2.ContactType.CLOUD ? 23 : 30;
+              _context17.t0 = contact.contactType;
+              _context17.next = _context17.t0 === _types2.ContactType.CUSTOM ? 18 : _context17.t0 === _types2.ContactType.CLOUD ? 23 : 30;
               break;
             case 18:
-              _context18.next = 20;
+              _context17.next = 20;
               return this.encryptContact(contact);
             case 20:
-              encryptedContact = _context18.sent;
+              encryptedContact = _context17.sent;
               requestBody = encryptedContact;
-              return _context18.abrupt("break", 31);
+              return _context17.abrupt("break", 31);
             case 23:
               if (contact.contactId) {
-                _context18.next = 25;
+                _context17.next = 25;
                 break;
               }
-              return _context18.abrupt("return", {
+              return _context17.abrupt("return", {
                 statusCode: 400,
                 data: {
                   error: 'contactId is required for contactType:CLOUD.'
@@ -1004,14 +985,14 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 message: _constants.FAILURE_MESSAGE
               });
             case 25:
-              _context18.next = 27;
+              _context17.next = 27;
               return this.encryptContact(contact);
             case 27:
-              _encryptedContact = _context18.sent;
+              _encryptedContact = _context17.sent;
               requestBody = _encryptedContact;
-              return _context18.abrupt("break", 31);
+              return _context17.abrupt("break", 31);
             case 30:
-              return _context18.abrupt("return", {
+              return _context17.abrupt("return", {
                 statusCode: 400,
                 data: {
                   error: 'Unknown contactType received.'
@@ -1019,7 +1000,7 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 message: _constants.FAILURE_MESSAGE
               });
             case 31:
-              _context18.next = 33;
+              _context17.next = 33;
               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),
@@ -1027,7 +1008,7 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 body: requestBody
               });
             case 33:
-              response = _context18.sent;
+              response = _context17.sent;
               newContact = response.body;
               contact.contactId = newContact.contactId;
               contactResponse = {
@@ -1037,40 +1018,40 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 },
                 message: _constants.SUCCESS_MESSAGE
               };
-              if (!(contact.contactType === _types2.ContactType.CLOUD)) {
-                _context18.next = 44;
+              if (!(contact.contactType === _types2.ContactType.CLOUD && newContact.contactId)) {
+                _context17.next = 44;
                 break;
               }
-              _context18.next = 40;
-              return this.fetchContactFromDSS(Object.fromEntries([[newContact.contactId, newContact]]));
+              _context17.next = 40;
+              return this.fetchContactFromDSS(Object.fromEntries([[newContact.contactId, newContact]]), newContact.contactId);
             case 40:
-              decryptedContacts = _context18.sent;
-              if (decryptedContacts.length && decryptedContacts[0]) {
-                (_this$contacts = this.contacts) === null || _this$contacts === void 0 ? void 0 : _this$contacts.push(decryptedContacts[0]);
+              decryptedContact = _context17.sent;
+              if (decryptedContact) {
+                (_this$contacts = this.contacts) === null || _this$contacts === void 0 ? void 0 : _this$contacts.push(decryptedContact);
               }
-              _context18.next = 45;
+              _context17.next = 45;
               break;
             case 44:
               (_this$contacts2 = this.contacts) === null || _this$contacts2 === void 0 ? void 0 : _this$contacts2.push(contact);
             case 45:
-              return _context18.abrupt("return", contactResponse);
+              return _context17.abrupt("return", contactResponse);
             case 48:
-              _context18.prev = 48;
-              _context18.t1 = _context18["catch"](2);
+              _context17.prev = 48;
+              _context17.t1 = _context17["catch"](2);
               _Logger.default.warn('Failed to create contact.', {
                 file: _constants2.CONTACTS_FILE,
                 method: this.createContact.name
               });
-              errorInfo = _context18.t1;
+              errorInfo = _context17.t1;
               errorStatus = (0, _Utils.serviceErrorCodeHandler)(errorInfo, loggerContext);
-              return _context18.abrupt("return", errorStatus);
+              return _context17.abrupt("return", errorStatus);
             case 54:
             case "end":
-              return _context18.stop();
+              return _context17.stop();
           }
         }, _callee17, this, [[2, 48]]);
       }));
-      function createContact(_x18) {
+      function createContact(_x19) {
         return _createContact.apply(this, arguments);
       }
       return createContact;
@@ -1085,23 +1066,23 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
     value: (function () {
       var _deleteContact = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee18(contactId) {
         var loggerContext, _this$contacts3, response, contactResponse, contactToDelete, _this$contacts4, errorInfo, errorStatus;
-        return _regenerator.default.wrap(function _callee18$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regenerator.default.wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               loggerContext = {
                 file: _constants2.CONTACTS_FILE,
                 method: this.deleteContact.name
               };
-              _context19.prev = 1;
+              _context18.prev = 1;
               _Logger.default.info("Deleting contact : ".concat(contactId), loggerContext);
-              _context19.next = 5;
+              _context18.next = 5;
               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),
                 method: _types.HTTP_METHODS.DELETE
               });
             case 5:
-              response = _context19.sent;
+              response = _context18.sent;
               contactResponse = {
                 statusCode: Number(response[_constants.STATUS_CODE]),
                 data: {},
@@ -1113,21 +1094,21 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
               if (contactToDelete !== undefined && contactToDelete !== -1) {
                 (_this$contacts4 = this.contacts) === null || _this$contacts4 === void 0 ? void 0 : _this$contacts4.splice(contactToDelete, 1);
               }
-              return _context19.abrupt("return", contactResponse);
+              return _context18.abrupt("return", contactResponse);
             case 12:
-              _context19.prev = 12;
-              _context19.t0 = _context19["catch"](1);
+              _context18.prev = 12;
+              _context18.t0 = _context18["catch"](1);
               _Logger.default.warn("Unable to delete contact ".concat(contactId), loggerContext);
-              errorInfo = _context19.t0;
+              errorInfo = _context18.t0;
               errorStatus = (0, _Utils.serviceErrorCodeHandler)(errorInfo, loggerContext);
-              return _context19.abrupt("return", errorStatus);
+              return _context18.abrupt("return", errorStatus);
             case 18:
             case "end":
-              return _context19.stop();
+              return _context18.stop();
           }
         }, _callee18, this, [[1, 12]]);
       }));
-      function deleteContact(_x19) {
+      function deleteContact(_x20) {
         return _deleteContact.apply(this, arguments);
       }
       return deleteContact;