Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(contacts): fix loop and use only resolved contacts from scim #3829

Merged
merged 5 commits into from
Sep 13, 2024
Merged

fix(contacts): fix loop and use only resolved contacts from scim #3829

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0da594c
fix(contacts): handle optional scim fields
sreenara Sep 13, 2024
09a0131
Merge branch 'next' into handle-scim-response
sreenara Sep 13, 2024
9a6ce09
fix(utils): fix optional fields in utils and added ut
sreenara Sep 13, 2024
fa2edfc
fix(contacts): fix the loop and use only resolved contacts from scim
sreenara Sep 13, 2024
caab159
Merge branch 'next' into handle-scim-response
sreenara Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions packages/calling/src/Contacts/ContactsClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,8 @@ export class ContactsClient implements IContacts {
const finalContactList: Contact[] = [];

try {
const contactList = Object.keys(contactsDataMap);
for (let n = 0; n < contactList.length; n += 1) {
const filteredContact = inputList.Resources.filter((item) => item.id === contactList[n])[0];

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]) {
Expand All @@ -284,12 +282,12 @@ export class ContactsClient implements IContacts {
const avatarURL = photos?.length ? photos[0].value : '';

const {contactType, avatarUrlDomain, encryptionKeyUrl, ownerId, groups} =
contactsDataMap[contactList[n]];
contactsDataMap[inputList.Resources[n].id];

const cloudContact = {
avatarUrlDomain,
avatarURL,
contactId: contactList[n],
contactId: inputList.Resources[n].id,
contactType,
department,
displayName,
Expand Down
Loading