@webex/calling 3.3.1 → 3.4.0-next.10

package/dist/Contacts/ContactsClient.js

@@ -370,211 +370,187 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
         return _decryptContact.apply(this, arguments);
       }
       return decryptContact;
-    }()
-    /**
-     * Fetches contacts from DSS.
-     */
-    )
+    }())
   }, {
-    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) {
-            case 0:
-              contactList = [];
-              _context10.next = 3;
-              return this.webex.internal.dss.lookup({
-                ids: (0, _keys.default)(contactsDataMap)
-              });
-            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);
-              });
-              i = 0;
-            case 6:
-              if (!(i < dssResult.length)) {
-                _context10.next = 11;
-                break;
-              }
-              return _context10.delegateYield(_loop(), "t0", 8);
-            case 8:
-              i += 1;
-              _context10.next = 6;
-              break;
-            case 11:
-              return _context10.abrupt("return", contactList);
-            case 12:
-            case "end":
-              return _context10.stop();
+    key: "resolveCloudContacts",
+    value: function resolveCloudContacts(contactsDataMap, inputList) {
+      var loggerContext = {
+        file: _constants2.CONTACTS_FILE,
+        method: 'resolveCloudContacts'
+      };
+      var finalContactList = [];
+      var resolvedList = [];
+      try {
+        inputList.Resources.forEach(function (item) {
+          resolvedList.push(item.id);
+        });
+        (0, _values.default)(contactsDataMap).forEach(function (item) {
+          var isResolved = resolvedList.some(function (listItem) {
+            return listItem === item.contactId;
+          });
+          if (!isResolved) {
+            finalContactList.push(_objectSpread(_objectSpread({}, item), {}, {
+              resolved: false
+            }));
           }
-        }, _callee9, this);
-      }));
-      function fetchContactFromDSS(_x11) {
-        return _fetchContactFromDSS.apply(this, arguments);
+        });
+        for (var n = 0; n < inputList.Resources.length; n += 1) {
+          var _filteredContact$name, _filteredContact$name2, _filteredContact$SCIM, _filteredContact$SCIM2, _filteredContact$SCIM3;
+          var filteredContact = inputList.Resources[n];
+          var displayName = filteredContact.displayName,
+            emails = filteredContact.emails,
+            phoneNumbers = filteredContact.phoneNumbers,
+            photos = filteredContact.photos;
+          var sipAddresses = void 0;
+          if (filteredContact[_constants.SCIM_WEBEXIDENTITY_USER]) {
+            sipAddresses = filteredContact[_constants.SCIM_WEBEXIDENTITY_USER].sipAddresses;
+          }
+          var firstName = (_filteredContact$name = filteredContact.name) === null || _filteredContact$name === void 0 ? void 0 : _filteredContact$name.givenName;
+          var lastName = (_filteredContact$name2 = filteredContact.name) === null || _filteredContact$name2 === void 0 ? void 0 : _filteredContact$name2.familyName;
+          var manager = (_filteredContact$SCIM = filteredContact[_constants.SCIM_ENTERPRISE_USER]) === null || _filteredContact$SCIM === void 0 ? void 0 : (_filteredContact$SCIM2 = _filteredContact$SCIM.manager) === null || _filteredContact$SCIM2 === void 0 ? void 0 : _filteredContact$SCIM2.displayName;
+          var department = (_filteredContact$SCIM3 = filteredContact[_constants.SCIM_ENTERPRISE_USER]) === null || _filteredContact$SCIM3 === void 0 ? void 0 : _filteredContact$SCIM3.department;
+          var avatarURL = photos !== null && photos !== void 0 && photos.length ? photos[0].value : '';
+          var _contactsDataMap$inpu = contactsDataMap[inputList.Resources[n].id],
+            contactType = _contactsDataMap$inpu.contactType,
+            avatarUrlDomain = _contactsDataMap$inpu.avatarUrlDomain,
+            encryptionKeyUrl = _contactsDataMap$inpu.encryptionKeyUrl,
+            ownerId = _contactsDataMap$inpu.ownerId,
+            groups = _contactsDataMap$inpu.groups;
+          var cloudContact = {
+            avatarUrlDomain: avatarUrlDomain,
+            avatarURL: avatarURL,
+            contactId: inputList.Resources[n].id,
+            contactType: contactType,
+            department: department,
+            displayName: displayName,
+            emails: emails,
+            encryptionKeyUrl: encryptionKeyUrl,
+            firstName: firstName,
+            groups: groups,
+            lastName: lastName,
+            manager: manager,
+            ownerId: ownerId,
+            phoneNumbers: phoneNumbers,
+            sipAddresses: sipAddresses,
+            resolved: true
+          };
+          finalContactList.push(cloudContact);
+        }
+      } catch (error) {
+        _Logger.default.warn('Error occurred while parsing resolved contacts', loggerContext);
+        return null;
       }
-      return fetchContactFromDSS;
-    }()
+      return finalContactList;
+    }
+
     /**
      * Returns list of contacts.
      */
-    )
   }, {
     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, cloudContactsMap, response, responseBody, contacts, groups, contactIdList, query, result, resolvedContacts, contactResponse, errorInfo, errorStatus;
+        return _regenerator.default.wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               loggerContext = {
                 file: _constants2.CONTACTS_FILE,
                 method: 'getContacts'
               };
               contactList = [];
-              contactsDataMap = {};
-              _context12.prev = 3;
-              _context12.next = 6;
+              cloudContactsMap = {};
+              _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));
             case 10:
               contacts = responseBody.contacts, groups = responseBody.groups;
-              i = 0;
-            case 12:
-              if (!(i < contacts.length)) {
-                _context12.next = 25;
-                break;
-              }
-              contact = contacts[i];
-              if (!(contact.contactType === _types2.ContactType.CUSTOM)) {
-                _context12.next = 21;
+              contacts.map( /*#__PURE__*/function () {
+                var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(contact) {
+                  var decryptedContact;
+                  return _regenerator.default.wrap(function _callee9$(_context9) {
+                    while (1) switch (_context9.prev = _context9.next) {
+                      case 0:
+                        if (!(contact.contactType === _types2.ContactType.CUSTOM)) {
+                          _context9.next = 7;
+                          break;
+                        }
+                        _context9.next = 3;
+                        return _this5.decryptContact(contact);
+                      case 3:
+                        decryptedContact = _context9.sent;
+                        contactList.push(decryptedContact);
+                        _context9.next = 8;
+                        break;
+                      case 7:
+                        if (contact.contactType === _types2.ContactType.CLOUD && contact.contactId) {
+                          cloudContactsMap[contact.contactId] = contact;
+                        }
+                      case 8:
+                      case "end":
+                        return _context9.stop();
+                    }
+                  }, _callee9);
+                }));
+                return function (_x11) {
+                  return _ref13.apply(this, arguments);
+                };
+              }());
+
+              // Resolve cloud contacts
+              if (!(0, _keys.default)(cloudContactsMap).length) {
+                _context11.next = 20;
                 break;
               }
-              _context12.next = 17;
-              return this.decryptContact(contact);
+              contactIdList = (0, _keys.default)(cloudContactsMap);
+              query = contactIdList.map(function (item) {
+                return "".concat(_constants2.SCIM_ID_FILTER, " \"").concat(item, "\"");
+              }).join(_constants2.OR);
+              _context11.next = 17;
+              return (0, _Utils.scimQuery)(query);
             case 17:
-              decryptedContact = _context12.sent;
-              contactList.push(decryptedContact);
-              _context12.next = 22;
-              break;
-            case 21:
-              if (contact.contactType === _types2.ContactType.CLOUD && contact.contactId) {
-                contactsDataMap[contact.contactId] = contact;
-              }
-            case 22:
-              i += 1;
-              _context12.next = 12;
-              break;
-            case 25:
-              if (!(0, _keys.default)(contactsDataMap).length) {
-                _context12.next = 30;
-                break;
+              result = _context11.sent;
+              resolvedContacts = this.resolveCloudContacts(cloudContactsMap, result.body);
+              if (resolvedContacts) {
+                resolvedContacts.map(function (item) {
+                  return contactList.push(item);
+                });
               }
-              _context12.next = 28;
-              return this.fetchContactFromDSS(contactsDataMap);
-            case 28:
-              cloudContacts = _context12.sent;
-              contactList.push.apply(contactList, (0, _toConsumableArray2.default)(cloudContacts));
-            case 30:
-              _context12.next = 32;
+            case 20:
+              _context11.next = 22;
               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) {
+                var _ref14 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10(group, idx) {
+                  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 _ref13.apply(this, arguments);
+                  return _ref14.apply(this, arguments);
                 };
               }()));
-            case 32:
+            case 22:
               this.groups = groups;
               this.contacts = contactList;
               contactResponse = {
@@ -585,18 +561,18 @@ var ContactsClient = exports.ContactsClient = /*#__PURE__*/function () {
                 },
                 message: _constants.SUCCESS_MESSAGE
               };
-              return _context12.abrupt("return", contactResponse);
-            case 38:
-              _context12.prev = 38;
-              _context12.t0 = _context12["catch"](3);
-              errorInfo = _context12.t0;
+              return _context11.abrupt("return", contactResponse);
+            case 28:
+              _context11.prev = 28;
+              _context11.t0 = _context11["catch"](3);
+              errorInfo = _context11.t0;
               errorStatus = (0, _Utils.serviceErrorCodeHandler)(errorInfo, loggerContext);
-              return _context12.abrupt("return", errorStatus);
-            case 43:
+              return _context11.abrupt("return", errorStatus);
+            case 33:
             case "end":
-              return _context12.stop();
+              return _context11.stop();
           }
-        }, _callee11, this, [[3, 38]]);
+        }, _callee11, this, [[3, 28]]);
       }));
       function getContacts() {
         return _getContacts.apply(this, arguments);
@@ -614,8 +590,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 +599,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 +633,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 +648,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 +691,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 +761,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 +807,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 +826,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,17 +837,17 @@ 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]]);
       }));
@@ -890,23 +866,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,17 +897,17 @@ 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]]);
       }));
@@ -949,54 +925,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, query, res, resolvedContact, _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 +980,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 +995,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 +1003,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,38 +1013,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 = 46;
                 break;
               }
-              _context18.next = 40;
-              return this.fetchContactFromDSS(Object.fromEntries([[newContact.contactId, newContact]]));
-            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]);
+              query = "".concat(_constants2.SCIM_ID_FILTER, " \"").concat(newContact.contactId, "\"");
+              _context17.next = 41;
+              return (0, _Utils.scimQuery)(query);
+            case 41:
+              res = _context17.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]);
               }
-              _context18.next = 45;
+              _context17.next = 47;
               break;
-            case 44:
+            case 46:
               (_this$contacts2 = this.contacts) === null || _this$contacts2 === void 0 ? void 0 : _this$contacts2.push(contact);
-            case 45:
-              return _context18.abrupt("return", contactResponse);
-            case 48:
-              _context18.prev = 48;
-              _context18.t1 = _context18["catch"](2);
+            case 47:
+              return _context17.abrupt("return", contactResponse);
+            case 50:
+              _context17.prev = 50;
+              _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);
-            case 54:
+              return _context17.abrupt("return", errorStatus);
+            case 56:
             case "end":
-              return _context18.stop();
+              return _context17.stop();
           }
-        }, _callee17, this, [[2, 48]]);
+        }, _callee17, this, [[2, 50]]);
       }));
       function createContact(_x18) {
         return _createContact.apply(this, arguments);
@@ -1085,23 +1063,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,17 +1091,17 @@ 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]]);
       }));