@webex/calling 3.3.1 → 3.4.0-next.10

package/dist/module/CallHistory/callHistoryFixtures.js

@@ -259,6 +259,190 @@ export const mockCallHistoryBody = {
         ],
     },
 };
+export const MOCK_CALL_HISTORY_WITH_UCM_LINE_NUMBER = {
+    body: {
+        statusCode: 200,
+        userSessions: [
+            {
+                id: '123456',
+                durationSecs: 438,
+                self: {
+                    id: 'fd2e1234',
+                    name: 'Mark',
+                    cucmDN: '1001',
+                    ucmLineNumber: 1,
+                    incomingCallProtocols: [],
+                    callbackInfo: {
+                        callbackAddress: 'test@cisco.com',
+                        callbackType: 'EMAIL',
+                    },
+                    lookUpInfo: {
+                        lookupLink: 'https://conv-a.wbx2.com/conversation/api/v1/conversations/98765',
+                        type: 'CONVERSATION',
+                    },
+                },
+                url: 'https://janus-a.wbx2.com/janus/api/v1/history/userSessions/654321',
+                sessionId: '123456',
+                sessionType: 'SPARK',
+                startTime: '2022-08-22T10:45:21.565Z',
+                endTime: '2022-08-22T10:53:01.624Z',
+                direction: 'OUTGOING',
+                disposition: 'INITIATED',
+                other: {
+                    id: '100001',
+                    name: 'test',
+                    isPrivate: false,
+                    callbackAddress: '89998888',
+                },
+                durationSeconds: 438,
+                joinedDurationSeconds: 457,
+                participantCount: 2,
+                links: {
+                    locusUrl: 'https://locus-a.wbx2.com/locus/api/v1/loci/786765',
+                    conversationUrl: 'https://conv-a.wbx2.com/conversation/api/v1/conversations/55443322',
+                    callbackAddress: '01010101',
+                },
+                isDeleted: false,
+                isPMR: false,
+                correlationIds: ['008899'],
+            },
+            {
+                id: '20191817',
+                durationSecs: 438,
+                self: {
+                    id: '12131415',
+                    name: 'Mark',
+                    cucmDN: '1002',
+                    ucmLineNumber: 2,
+                    incomingCallProtocols: [],
+                    callbackInfo: {
+                        callbackAddress: 'test@cisco.com',
+                        callbackType: 'EMAIL',
+                    },
+                    lookUpInfo: {
+                        lookupLink: 'https://conv-a.wbx2.com/conversation/api/v1/conversations/21314151',
+                        type: 'CONVERSATION',
+                    },
+                },
+                url: 'https://janus-a.wbx2.com/janus/api/v1/history/userSessions/100101102',
+                sessionId: '20191817',
+                sessionType: 'SPARK',
+                startTime: '2022-08-30T10:45:21.565Z',
+                endTime: '2022-08-30T10:53:01.624Z',
+                direction: 'OUTGOING',
+                disposition: 'INITIATED',
+                other: {
+                    id: '301302303',
+                    name: 'test',
+                    isPrivate: false,
+                    callbackAddress: '401402403',
+                },
+                durationSeconds: 438,
+                joinedDurationSeconds: 457,
+                participantCount: 2,
+                links: {
+                    locusUrl: 'https://locus-a.wbx2.com/locus/api/v1/loci/501502503',
+                    conversationUrl: 'https://conv-a.wbx2.com/conversation/api/v1/conversations/601602603',
+                    callbackAddress: '801802803',
+                },
+                isDeleted: false,
+                isPMR: false,
+                correlationIds: ['901902903'],
+            },
+        ],
+    },
+};
+export const MOCK_CALL_HISTORY_WITHOUT_UCM_LINE_NUMBER = {
+    body: {
+        statusCode: 200,
+        userSessions: [
+            {
+                id: '123456',
+                durationSecs: 438,
+                self: {
+                    id: 'fd2e1234',
+                    name: 'Mark',
+                    cucmDN: '1001',
+                    incomingCallProtocols: [],
+                    callbackInfo: {
+                        callbackAddress: 'test@cisco.com',
+                        callbackType: 'EMAIL',
+                    },
+                    lookUpInfo: {
+                        lookupLink: 'https://conv-a.wbx2.com/conversation/api/v1/conversations/98765',
+                        type: 'CONVERSATION',
+                    },
+                },
+                url: 'https://janus-a.wbx2.com/janus/api/v1/history/userSessions/654321',
+                sessionId: '123456',
+                sessionType: 'SPARK',
+                startTime: '2022-08-22T10:45:21.565Z',
+                endTime: '2022-08-22T10:53:01.624Z',
+                direction: 'OUTGOING',
+                disposition: 'INITIATED',
+                other: {
+                    id: '100001',
+                    name: 'test',
+                    isPrivate: false,
+                    callbackAddress: '89998888',
+                },
+                durationSeconds: 438,
+                joinedDurationSeconds: 457,
+                participantCount: 2,
+                links: {
+                    locusUrl: 'https://locus-a.wbx2.com/locus/api/v1/loci/786765',
+                    conversationUrl: 'https://conv-a.wbx2.com/conversation/api/v1/conversations/55443322',
+                    callbackAddress: '01010101',
+                },
+                isDeleted: false,
+                isPMR: false,
+                correlationIds: ['008899'],
+            },
+            {
+                id: '20191817',
+                durationSecs: 438,
+                self: {
+                    id: '12131415',
+                    name: 'Mark',
+                    cucmDN: '1002',
+                    incomingCallProtocols: [],
+                    callbackInfo: {
+                        callbackAddress: 'test@cisco.com',
+                        callbackType: 'EMAIL',
+                    },
+                    lookUpInfo: {
+                        lookupLink: 'https://conv-a.wbx2.com/conversation/api/v1/conversations/21314151',
+                        type: 'CONVERSATION',
+                    },
+                },
+                url: 'https://janus-a.wbx2.com/janus/api/v1/history/userSessions/100101102',
+                sessionId: '20191817',
+                sessionType: 'SPARK',
+                startTime: '2022-08-30T10:45:21.565Z',
+                endTime: '2022-08-30T10:53:01.624Z',
+                direction: 'OUTGOING',
+                disposition: 'INITIATED',
+                other: {
+                    id: '301302303',
+                    name: 'test',
+                    isPrivate: false,
+                    callbackAddress: '401402403',
+                },
+                durationSeconds: 438,
+                joinedDurationSeconds: 457,
+                participantCount: 2,
+                links: {
+                    locusUrl: 'https://locus-a.wbx2.com/locus/api/v1/loci/501502503',
+                    conversationUrl: 'https://conv-a.wbx2.com/conversation/api/v1/conversations/601602603',
+                    callbackAddress: '801802803',
+                },
+                isDeleted: false,
+                isPMR: false,
+                correlationIds: ['901902903'],
+            },
+        ],
+    },
+};
 const WEBEX_CALL_SESSION = {
     id: 'd74d19cc-6aa7-f341-6012-aec433cc6f8d',
     durationSecs: 438,
@@ -401,3 +585,34 @@ export const ERROR_DETAILS_400 = {
     },
     message: 'FAILURE',
 };
+export const MOCK_LINES_API_CALL_RESPONSE = {
+    statusCode: 200,
+    data: {
+        lines: {
+            devices: [
+                {
+                    name: 'CSFheliosucm01',
+                    model: 503,
+                    lines: [
+                        {
+                            dnorpattern: '+14928000001',
+                            index: 1,
+                            label: '',
+                        },
+                        {
+                            dnorpattern: '+14928000003',
+                            index: 2,
+                            label: '',
+                        },
+                    ],
+                },
+            ],
+        },
+    },
+    message: 'SUCCESS',
+};
+export const MOCK_LINES_API_CALL_RESPONSE_WITH_NO_LINEDATA = {
+    statusCode: 200,
+    data: {},
+    message: 'SUCCESS',
+};

package/dist/module/CallHistory/constants.js

@@ -1,13 +1,19 @@
 export const APPLICATION_JSON = 'application/json';
 export const CALL_HISTORY_FILE = 'CallHistory';
 export const CONTENT_TYPE = 'Content-Type';
+export const CONFIG = 'config';
 export const FROM_DATE = '?from';
 export const HISTORY = 'history';
 export const LIMIT = 50;
+export const LINES = 'lines';
 export const NUMBER_OF_DAYS = 10;
+export const ORG_ID = 'orgId';
+export const PEOPLE = 'people';
 export const RESPONSE_MESSAGE = 'responseMessage';
-export const UPDATE_MISSED_CALLS_ENDPOINT = 'setReadState';
 export const SET_READ_STATE_SUCCESS_MESSAGE = 'Missed calls are read by the user.';
 export const SUCCESS_MESSAGE = 'SUCCESS';
 export const STATUS_CODE = 'statusCode';
 export const USER_SESSIONS = 'userSessions';
+export const UPDATE_MISSED_CALLS_ENDPOINT = 'setReadState';
+export const UNIFIED_COMMUNICATIONS = 'uc';
+export const VERSION_1 = 'v1';

package/dist/module/CallSettings/UcmBackendConnector.js

@@ -1,9 +1,9 @@
 import log from '../Logger';
 import SDKConnector from '../SDKConnector';
 import { serviceErrorCodeHandler } from '../common/Utils';
-import { FAILURE_MESSAGE, STATUS_CODE, SUCCESS_MESSAGE, UCM_CONNECTOR_FILE, VOICEMAIL, } from '../common/constants';
+import { FAILURE_MESSAGE, STATUS_CODE, SUCCESS_MESSAGE, UCM_CONNECTOR_FILE, VOICEMAIL, WEBEX_API_CONFIG_INT_URL, WEBEX_API_CONFIG_PROD_URL, } from '../common/constants';
 import { HTTP_METHODS } from '../common/types';
-import { CF_ENDPOINT, ORG_ENDPOINT, PEOPLE_ENDPOINT, WEBEX_APIS_INT_URL, WEBEX_APIS_PROD_URL, } from './constants';
+import { CF_ENDPOINT, ORG_ENDPOINT, PEOPLE_ENDPOINT } from './constants';
 export class UcmBackendConnector {
     sdkConnector;
     webex;
@@ -51,7 +51,9 @@ export class UcmBackendConnector {
             file: UCM_CONNECTOR_FILE,
             method: this.getCallForwardAlwaysSetting.name,
         };
-        const webexApisUrl = this.useProdWebexApis ? WEBEX_APIS_PROD_URL : WEBEX_APIS_INT_URL;
+        const webexApisUrl = this.useProdWebexApis
+            ? WEBEX_API_CONFIG_PROD_URL
+            : WEBEX_API_CONFIG_INT_URL;
         try {
             if (directoryNumber) {
                 const resp = await this.webex.request({

package/dist/module/CallSettings/constants.js

@@ -7,5 +7,3 @@ export const CF_ENDPOINT = 'features/callForwarding';
 export const VM_ENDPOINT = 'features/voicemail';
 export const CALL_WAITING_ENDPOINT = 'CallWaiting';
 export const XSI_VERSION = 'v2.0';
-export const WEBEX_APIS_INT_URL = 'https://integration.webexapis.com/v1/uc/config';
-export const WEBEX_APIS_PROD_URL = 'https://webexapis.com/v1/uc/config';

package/dist/module/CallingClient/calling/call.js

@@ -1,4 +1,4 @@
-import { Event, LocalStreamEventNames, RoapMediaConnection, } from '@webex/internal-media-core';
+import { MediaConnectionEventNames, LocalStreamEventNames, RoapMediaConnection, } from '@webex/internal-media-core';
 import { createMachine, interpret } from 'xstate';
 import { v4 as uuid } from 'uuid';
 import { EffectEvent } from '@webex/web-media-effects';
@@ -6,7 +6,7 @@ import { ERROR_LAYER, ERROR_TYPE } from '../../Errors/types';
 import { handleCallErrors, parseMediaQualityStatistics } from '../../common/Utils';
 import { ALLOWED_SERVICES, CallDirection, HTTP_METHODS, } from '../../common/types';
 import { createCallError } from '../../Errors/catalog/CallError';
-import { CALL_ENDPOINT_RESOURCE, CALL_FILE, CALL_HOLD_SERVICE, CALL_STATUS_RESOURCE, CALL_TRANSFER_SERVICE, CALLING_USER_AGENT, CALLS_ENDPOINT_RESOURCE, CISCO_DEVICE_URL, DEFAULT_LOCAL_CALL_ID, DEFAULT_SESSION_TIMER, DEVICES_ENDPOINT_RESOURCE, HOLD_ENDPOINT, INITIAL_SEQ_NUMBER, MEDIA_ENDPOINT_RESOURCE, NOISE_REDUCTION_EFFECT, RESUME_ENDPOINT, SPARK_USER_AGENT, SUPPLEMENTARY_SERVICES_TIMEOUT, TRANSFER_ENDPOINT, } from '../constants';
+import { CALL_ENDPOINT_RESOURCE, CALL_FILE, CALL_HOLD_SERVICE, CALL_STATUS_RESOURCE, CALL_TRANSFER_SERVICE, CALLING_USER_AGENT, CALLS_ENDPOINT_RESOURCE, CISCO_DEVICE_URL, DEFAULT_LOCAL_CALL_ID, DEFAULT_SESSION_TIMER, DEVICES_ENDPOINT_RESOURCE, HOLD_ENDPOINT, ICE_CANDIDATES_TIMEOUT, INITIAL_SEQ_NUMBER, MEDIA_ENDPOINT_RESOURCE, NOISE_REDUCTION_EFFECT, RESUME_ENDPOINT, SPARK_USER_AGENT, SUPPLEMENTARY_SERVICES_TIMEOUT, TRANSFER_ENDPOINT, } from '../constants';
 import SDKConnector from '../../SDKConnector';
 import { Eventing } from '../../Events/impl';
 import { CALL_EVENT_KEYS, MEDIA_CONNECTION_EVENT_KEYS, MOBIUS_MIDCALL_STATE, SUPPLEMENTARY_SERVICES, } from '../../Events/types';
@@ -1186,9 +1186,11 @@ export class Call extends Eventing {
         const mediaConnection = new RoapMediaConnection({
             skipInactiveTransceivers: true,
             iceServers: [],
+            iceCandidatesTimeout: ICE_CANDIDATES_TIMEOUT,
             sdpMunging: {
                 convertPort9to0: true,
                 addContentSlides: false,
+                copyClineToSessionLevel: true,
             },
         }, {
             localTracks: { audio: localAudioTrack },
@@ -1498,7 +1500,7 @@ export class Call extends Eventing {
         });
     }
     mediaRoapEventsListener() {
-        this.mediaConnection.on(Event.ROAP_MESSAGE_TO_SEND, async (event) => {
+        this.mediaConnection.on(MediaConnectionEventNames.ROAP_MESSAGE_TO_SEND, async (event) => {
             log.info(`ROAP message to send (rcv from MEDIA-SDK) :
           \n type:  ${event.roapMessage?.messageType}, seq: ${event.roapMessage.seq} , version: ${event.roapMessage.version}`, {});
             log.info(`SDP message to send : \n ${event.roapMessage?.sdp}`, {
@@ -1537,7 +1539,7 @@ export class Call extends Eventing {
         });
     }
     mediaTrackListener() {
-        this.mediaConnection.on(Event.REMOTE_TRACK_ADDED, (e) => {
+        this.mediaConnection.on(MediaConnectionEventNames.REMOTE_TRACK_ADDED, (e) => {
             if (e.type === MEDIA_CONNECTION_EVENT_KEYS.MEDIA_TYPE_AUDIO) {
                 this.emit(CALL_EVENT_KEYS.REMOTE_MEDIA, e.track);
             }

package/dist/module/CallingClient/constants.js

@@ -1,6 +1,7 @@
-export const VERSION = 'beta';
+export const VERSION = 'unknown';
+export const USER_AGENT_VERSION = 'beta';
 export const REPO_NAME = 'webex-calling';
-export const CALLING_USER_AGENT = `${REPO_NAME}/${VERSION}`;
+export const CALLING_USER_AGENT = `${REPO_NAME}/${USER_AGENT_VERSION}`;
 export const CALL_ENDPOINT_RESOURCE = 'call';
 export const CALL_STATUS_RESOURCE = 'status';
 export const CALLS_ENDPOINT_RESOURCE = 'calls';
@@ -42,9 +43,7 @@ export const DUMMY_METRICS = {
 };
 export const DUMMY_MOBIUS_URL = 'https://mobius.aintgen-a-1.int.infra.webex.com/api/v1';
 export const FETCH_NAME = /^[a-zA-Z ]+/;
-export const IDENTITY_BROKER = 'https://identitybts.webex.com/';
 export const IP_ENDPOINT = 'myip';
-export const IDENTITY_ENDPOINT_RESOURCE = 'identity';
 export const INITIAL_SEQ_NUMBER = 1;
 export const MEDIA_ENDPOINT_RESOURCE = 'media';
 export const NETWORK_FLAP_TIMEOUT = 2000;
@@ -53,8 +52,6 @@ export const CALL_TRANSFER_SERVICE = 'calltransfer';
 export const HOLD_ENDPOINT = 'hold';
 export const TRANSFER_ENDPOINT = 'commit';
 export const RESUME_ENDPOINT = 'resume';
-export const SCIM_ENDPOINT_RESOURCE = 'scim';
-export const SCIM_USER_FILTER = 'v1/Users?filter=';
 export const SPARK_USER_AGENT = 'spark-user-agent';
 export const REGISTER_RETRY_TIMEOUT = 10000;
 export const SUPPLEMENTARY_SERVICES_TIMEOUT = 10000;
@@ -110,6 +107,7 @@ export const SEC_TO_MSEC_MFACTOR = 1000;
 export const MINUTES_TO_SEC_MFACTOR = 60;
 export const REG_RANDOM_T_FACTOR_UPPER_LIMIT = 10000;
 export const REG_TRY_BACKUP_TIMER_VAL_IN_SEC = 1200;
+export const REG_TRY_BACKUP_TIMER_VAL_FOR_CC_IN_SEC = 114;
 export const REG_FAILBACK_429_MAX_RETRIES = 5;
 export const REGISTER_UTIL = 'registerDevice';
 export const GET_MOBIUS_SERVERS_UTIL = 'getMobiusServers';
@@ -125,3 +123,4 @@ export const MOBIUS_US_PROD = 'mobius-us-east-1.prod.infra.webex.com';
 export const MOBIUS_EU_PROD = 'mobius-eu-central-1.prod.infra.webex.com';
 export const MOBIUS_US_INT = 'mobius-us-east-1.int.infra.webex.com';
 export const MOBIUS_EU_INT = 'mobius-eu-central-1.int.infra.webex.com';
+export const ICE_CANDIDATES_TIMEOUT = 3000;

package/dist/module/CallingClient/registration/register.js

@@ -6,8 +6,8 @@ import { getMetricManager } from '../../Metrics';
 import { getCallManager } from '../calling';
 import log from '../../Logger';
 import SDKConnector from '../../SDKConnector';
-import { ALLOWED_SERVICES, HTTP_METHODS, RegistrationStatus, } from '../../common/types';
-import { CALLING_USER_AGENT, CISCO_DEVICE_URL, DEVICES_ENDPOINT_RESOURCE, SPARK_USER_AGENT, WEBEX_WEB_CLIENT, BASE_REG_RETRY_TIMER_VAL_IN_SEC, BASE_REG_TIMER_MFACTOR, SEC_TO_MSEC_MFACTOR, REG_RANDOM_T_FACTOR_UPPER_LIMIT, REG_TRY_BACKUP_TIMER_VAL_IN_SEC, MINUTES_TO_SEC_MFACTOR, FAILBACK_429_RETRY_UTIL, REG_FAILBACK_429_MAX_RETRIES, FAILBACK_UTIL, REGISTRATION_FILE, DEFAULT_REHOMING_INTERVAL_MIN, DEFAULT_REHOMING_INTERVAL_MAX, DEFAULT_KEEPALIVE_INTERVAL, } from '../constants';
+import { ALLOWED_SERVICES, HTTP_METHODS, RegistrationStatus, ServiceIndicator, } from '../../common/types';
+import { CALLING_USER_AGENT, CISCO_DEVICE_URL, DEVICES_ENDPOINT_RESOURCE, SPARK_USER_AGENT, WEBEX_WEB_CLIENT, BASE_REG_RETRY_TIMER_VAL_IN_SEC, BASE_REG_TIMER_MFACTOR, SEC_TO_MSEC_MFACTOR, REG_RANDOM_T_FACTOR_UPPER_LIMIT, REG_TRY_BACKUP_TIMER_VAL_IN_SEC, MINUTES_TO_SEC_MFACTOR, FAILBACK_429_RETRY_UTIL, REG_FAILBACK_429_MAX_RETRIES, FAILBACK_UTIL, REGISTRATION_FILE, DEFAULT_REHOMING_INTERVAL_MIN, DEFAULT_REHOMING_INTERVAL_MAX, DEFAULT_KEEPALIVE_INTERVAL, REG_TRY_BACKUP_TIMER_VAL_FOR_CC_IN_SEC, } from '../constants';
 import { LINE_EVENTS } from '../line/types';
 export class Registration {
     sdkConnector;
@@ -30,9 +30,11 @@ export class Registration {
     backupMobiusUris;
     registerRetry = false;
     reconnectPending = false;
+    isCCFlow = false;
     constructor(webex, serviceData, mutex, lineEmitter, logLevel) {
         this.sdkConnector = SDKConnector;
         this.serviceData = serviceData;
+        this.isCCFlow = serviceData.indicator === ServiceIndicator.CONTACT_CENTER;
         if (!this.sdkConnector.getWebex()) {
             SDKConnector.setWebex(webex);
         }
@@ -147,8 +149,11 @@ export class Registration {
             method: this.startFailoverTimer.name,
         };
         let interval = this.getRegRetryInterval(attempt);
-        if (timeElapsed + interval > REG_TRY_BACKUP_TIMER_VAL_IN_SEC) {
-            const excessVal = timeElapsed + interval - REG_TRY_BACKUP_TIMER_VAL_IN_SEC;
+        const TIMER_THRESHOLD = this.isCCFlow
+            ? REG_TRY_BACKUP_TIMER_VAL_FOR_CC_IN_SEC
+            : REG_TRY_BACKUP_TIMER_VAL_IN_SEC;
+        if (timeElapsed + interval > TIMER_THRESHOLD) {
+            const excessVal = timeElapsed + interval - TIMER_THRESHOLD;
             interval -= excessVal;
         }
         let abort;
@@ -409,13 +414,14 @@ export class Registration {
     startKeepaliveTimer(url, interval) {
         let keepAliveRetryCount = 0;
         this.clearKeepaliveTimer();
+        const RETRY_COUNT_THRESHOLD = this.isCCFlow ? 4 : 5;
         this.keepaliveTimer = setInterval(async () => {
             const logContext = {
                 file: REGISTRATION_FILE,
                 method: this.startKeepaliveTimer.name,
             };
             await this.mutex.runExclusive(async () => {
-                if (this.isDeviceRegistered() && keepAliveRetryCount < 5) {
+                if (this.isDeviceRegistered() && keepAliveRetryCount < RETRY_COUNT_THRESHOLD) {
                     try {
                         const res = await this.postKeepAlive(url);
                         log.info(`Sent Keepalive, status: ${res.statusCode}`, logContext);
@@ -434,7 +440,7 @@ export class Registration {
                             }
                             this.metricManager.submitRegistrationMetric(METRIC_EVENT.REGISTRATION, REG_ACTION.KEEPALIVE_FAILURE, METRIC_TYPE.BEHAVIORAL, clientError);
                         }, { method: this.startKeepaliveTimer.name, file: REGISTRATION_FILE });
-                        if (abort || keepAliveRetryCount >= 5) {
+                        if (abort || keepAliveRetryCount >= RETRY_COUNT_THRESHOLD) {
                             this.setStatus(RegistrationStatus.INACTIVE);
                             this.clearKeepaliveTimer();
                             this.clearFailbackTimer();

package/dist/module/Contacts/ContactsClient.js

@@ -1,10 +1,10 @@
-import { FAILURE_MESSAGE, STATUS_CODE, SUCCESS_MESSAGE } from '../common/constants';
+import { FAILURE_MESSAGE, SCIM_ENTERPRISE_USER, SCIM_WEBEXIDENTITY_USER, STATUS_CODE, SUCCESS_MESSAGE, } from '../common/constants';
 import { HTTP_METHODS } from '../common/types';
 import SDKConnector from '../SDKConnector';
 import log from '../Logger';
-import { CONTACTS_FILE, CONTACTS_SCHEMA, CONTACT_FILTER, DEFAULT_GROUP_NAME, ENCRYPT_FILTER, GROUP_FILTER, USERS, encryptedFields, } from './constants';
+import { CONTACTS_FILE, CONTACTS_SCHEMA, CONTACT_FILTER, DEFAULT_GROUP_NAME, ENCRYPT_FILTER, GROUP_FILTER, OR, SCIM_ID_FILTER, USERS, encryptedFields, } from './constants';
 import { ContactType, GroupType, } from './types';
-import { serviceErrorCodeHandler } from '../common/Utils';
+import { scimQuery, serviceErrorCodeHandler } from '../common/Utils';
 export class ContactsClient {
     sdkConnector;
     encryptionKeyUrl;
@@ -128,51 +128,62 @@ export class ContactsClient {
         });
         return decryptedContact;
     }
-    async fetchContactFromDSS(contactsDataMap) {
-        const contactList = [];
-        const dssResult = await this.webex.internal.dss.lookup({ ids: Object.keys(contactsDataMap) });
-        for (let i = 0; i < dssResult.length; i += 1) {
-            const contact = dssResult[i];
-            const contactId = contact.identity;
-            const { displayName, emails, phoneNumbers, sipAddresses, photos } = contact;
-            const { department, firstName, identityManager, jobTitle, lastName } = contact.additionalInfo;
-            const manager = identityManager && identityManager.displayName ? identityManager.displayName : undefined;
-            const { contactType, avatarUrlDomain, encryptionKeyUrl, ownerId, groups } = contactsDataMap[contactId];
-            let avatarURL = '';
-            if (photos.length) {
-                avatarURL = photos[0].value;
-            }
-            const addedPhoneNumbers = contactsDataMap[contactId].phoneNumbers;
-            if (addedPhoneNumbers) {
-                const decryptedPhoneNumbers = await this.decryptContactDetail(encryptionKeyUrl, addedPhoneNumbers);
-                decryptedPhoneNumbers.forEach((number) => phoneNumbers.push(number));
-            }
-            const addedSipAddresses = contactsDataMap[contactId].sipAddresses;
-            if (addedSipAddresses) {
-                const decryptedSipAddresses = await this.decryptContactDetail(encryptionKeyUrl, addedSipAddresses);
-                decryptedSipAddresses.forEach((address) => sipAddresses.push(address));
+    resolveCloudContacts(contactsDataMap, inputList) {
+        const loggerContext = {
+            file: CONTACTS_FILE,
+            method: 'resolveCloudContacts',
+        };
+        const finalContactList = [];
+        const resolvedList = [];
+        try {
+            inputList.Resources.forEach((item) => {
+                resolvedList.push(item.id);
+            });
+            Object.values(contactsDataMap).forEach((item) => {
+                const isResolved = resolvedList.some((listItem) => listItem === item.contactId);
+                if (!isResolved) {
+                    finalContactList.push({ ...item, resolved: false });
+                }
+            });
+            for (let n = 0; n < inputList.Resources.length; n += 1) {
+                const filteredContact = inputList.Resources[n];
+                const { displayName, emails, phoneNumbers, photos } = filteredContact;
+                let sipAddresses;
+                if (filteredContact[SCIM_WEBEXIDENTITY_USER]) {
+                    sipAddresses = filteredContact[SCIM_WEBEXIDENTITY_USER].sipAddresses;
+                }
+                const firstName = filteredContact.name?.givenName;
+                const lastName = filteredContact.name?.familyName;
+                const manager = filteredContact[SCIM_ENTERPRISE_USER]?.manager?.displayName;
+                const department = filteredContact[SCIM_ENTERPRISE_USER]?.department;
+                const avatarURL = photos?.length ? photos[0].value : '';
+                const { contactType, avatarUrlDomain, encryptionKeyUrl, ownerId, groups } = contactsDataMap[inputList.Resources[n].id];
+                const cloudContact = {
+                    avatarUrlDomain,
+                    avatarURL,
+                    contactId: inputList.Resources[n].id,
+                    contactType,
+                    department,
+                    displayName,
+                    emails,
+                    encryptionKeyUrl,
+                    firstName,
+                    groups,
+                    lastName,
+                    manager,
+                    ownerId,
+                    phoneNumbers,
+                    sipAddresses,
+                    resolved: true,
+                };
+                finalContactList.push(cloudContact);
             }
-            const cloudContact = {
-                avatarUrlDomain,
-                avatarURL,
-                contactId,
-                contactType,
-                department,
-                displayName,
-                emails,
-                encryptionKeyUrl,
-                firstName,
-                groups,
-                lastName,
-                manager,
-                ownerId,
-                phoneNumbers,
-                sipAddresses,
-                title: jobTitle,
-            };
-            contactList.push(cloudContact);
         }
-        return contactList;
+        catch (error) {
+            log.warn('Error occurred while parsing resolved contacts', loggerContext);
+            return null;
+        }
+        return finalContactList;
     }
     async getContacts() {
         const loggerContext = {
@@ -180,7 +191,7 @@ export class ContactsClient {
             method: 'getContacts',
         };
         const contactList = [];
-        const contactsDataMap = {};
+        const cloudContactsMap = {};
         try {
             const response = await this.webex.request({
                 uri: `${this.webex.internal.services._serviceUrls.contactsService}/${ENCRYPT_FILTER}/${USERS}/${CONTACT_FILTER}`,
@@ -191,19 +202,23 @@ export class ContactsClient {
                 throw new Error(`${response}`);
             }
             const { contacts, groups } = responseBody;
-            for (let i = 0; i < contacts.length; i += 1) {
-                const contact = contacts[i];
+            contacts.map(async (contact) => {
                 if (contact.contactType === ContactType.CUSTOM) {
                     const decryptedContact = await this.decryptContact(contact);
                     contactList.push(decryptedContact);
                 }
                 else if (contact.contactType === ContactType.CLOUD && contact.contactId) {
-                    contactsDataMap[contact.contactId] = contact;
+                    cloudContactsMap[contact.contactId] = contact;
+                }
+            });
+            if (Object.keys(cloudContactsMap).length) {
+                const contactIdList = Object.keys(cloudContactsMap);
+                const query = contactIdList.map((item) => `${SCIM_ID_FILTER} "${item}"`).join(OR);
+                const result = await scimQuery(query);
+                const resolvedContacts = this.resolveCloudContacts(cloudContactsMap, result.body);
+                if (resolvedContacts) {
+                    resolvedContacts.map((item) => contactList.push(item));
                 }
-            }
-            if (Object.keys(contactsDataMap).length) {
-                const cloudContacts = await this.fetchContactFromDSS(contactsDataMap);
-                contactList.push(...cloudContacts);
             }
             await Promise.all(groups.map(async (group, idx) => {
                 groups[idx].displayName = await this.webex.internal.encryption.decryptText(group.encryptionKeyUrl, group.displayName);
@@ -430,10 +445,12 @@ export class ContactsClient {
                 },
                 message: SUCCESS_MESSAGE,
             };
-            if (contact.contactType === ContactType.CLOUD) {
-                const decryptedContacts = await this.fetchContactFromDSS(Object.fromEntries([[newContact.contactId, newContact]]));
-                if (decryptedContacts.length && decryptedContacts[0]) {
-                    this.contacts?.push(decryptedContacts[0]);
+            if (contact.contactType === ContactType.CLOUD && newContact.contactId) {
+                const query = `${SCIM_ID_FILTER} "${newContact.contactId}"`;
+                const res = await scimQuery(query);
+                const resolvedContact = this.resolveCloudContacts(Object.fromEntries([[newContact.contactId, newContact]]), res.body);
+                if (resolvedContact) {
+                    this.contacts?.push(resolvedContact[0]);
                 }
             }
             else {

package/dist/module/Contacts/constants.js

@@ -5,6 +5,8 @@ export const ENCRYPT_FILTER = 'encrypt';
 export const USERS = 'Users';
 export const DEFAULT_GROUP_NAME = 'Other contacts';
 export const CONTACTS_SCHEMA = 'urn:cisco:codev:identity:contact:core:1.0';
+export const SCIM_ID_FILTER = 'id eq';
+export const OR = ' or ';
 export var encryptedFields;
 (function (encryptedFields) {
     encryptedFields["ADDRESS_INFO"] = "addressInfo";