bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-22 11:13:30 +00:00
Code Issues Releases Wiki Activity

Don't flag deleted users as duplicates (#181)

Browse Source 
* Don't flag deleted users as duplicates

* Fix nearby linting error

* Apply user filter to deleted users as well

* Revert "Apply user filter to deleted users as well"

This reverts commit 1633ee265f.

* Only throw error if any duplicates are not deleted

* Rename processedUsers to processedActiveUsers

* Update src/services/sync.service.ts

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>

* Update src/services/sync.service.ts

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>

* Update src/services/sync.service.ts

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
This commit is contained in:
Robyn MacCallum
2021-11-30 22:58:40 -05:00
committed by GitHub
parent d82f4d90c1
commit 240e1d5813
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/services/sync.service.ts
View File

@@ -114,19 +114,31 @@ export class SyncService {
private removeDuplicateUsers(users: UserEntry[]) { private removeDuplicateUsers(users: UserEntry[]) {
const uniqueUsers = new Array<UserEntry>(); const uniqueUsers = new Array<UserEntry>();
const processedUsers = new Map<string, string>(); const processedActiveUsers = new Map<string, string>();
const processedDeletedUsers = new Map<string, string>();
const duplicateEmails = new Array<string>(); const duplicateEmails = new Array<string>();
// UserEntrys with the same email are ignored if their properties are the same // UserEntrys with the same email are ignored if their properties are the same
// UserEntrys with the same email but different properties will throw an error // UserEntrys with the same email but different properties will throw an error, unless they are all in a deleted state.
users.forEach(u => { users.forEach(u => {
if (processedUsers.has(u.email)) { if (processedActiveUsers.has(u.email)) {
if (processedUsers.get(u.email) != JSON.stringify(u)) { if (processedActiveUsers.get(u.email) !== JSON.stringify(u)) {
duplicateEmails.push(u.email); duplicateEmails.push(u.email);
} }
} else { } else {
if (!u.deleted) {
// Check that active UserEntry does not conflict with a deleted UserEntry
if (processedDeletedUsers.has(u.email)) {
duplicateEmails.push(u.email);
} else {
processedActiveUsers.set(u.email, JSON.stringify(u));
uniqueUsers.push(u); uniqueUsers.push(u);
processedUsers.set(u.email, JSON.stringify(u)); }
} else {
// UserEntrys with duplicate email will not throw an error if they are all deleted. They will be synced.
processedDeletedUsers.set(u.email, JSON.stringify(u));
uniqueUsers.push(u);
}
} }
}); });