bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-28 06:03:20 +00:00
Code Issues Releases Wiki Activity

make sure entry ids are unique

Browse Source
This commit is contained in:
Kyle Spearrin
2018-07-17 08:49:15 -04:00
parent 8b9d7a7e2e
commit 2c20796ea1
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/services/azure-directory.service.ts
View File

@@ -67,6 +67,7 @@ export class AzureDirectoryService extends BaseDirectoryService implements Direc
}
private async getUsers(force: boolean, saveDelta: boolean): Promise<UserEntry[]> {
const entryIds = new Set<string>();
const entries: UserEntry[] = [];
let res: any = null;
@@ -90,6 +91,9 @@ export class AzureDirectoryService extends BaseDirectoryService implements Direc
const users: graphType.User[] = res.value;
if (users != null) {
for (const user of users) {
if (user.id == null || entryIds.has(user.id)) {
continue;
}
const entry = this.buildUser(user);
if (this.filterOutResult(setFilter, entry.email)) {
continue;
@@ -101,6 +105,7 @@ export class AzureDirectoryService extends BaseDirectoryService implements Direc
}
entries.push(entry);
entryIds.add(user.id);
}
}
@@ -139,6 +144,7 @@ export class AzureDirectoryService extends BaseDirectoryService implements Direc
private async getGroups(force: boolean, saveDelta: boolean,
setFilter: [boolean, Set<string>]): Promise<GroupEntry[]> {
const entryIds = new Set<string>();
const entries: GroupEntry[] = [];
const changedGroupIds: string[] = [];
const token = await this.configurationService.getGroupDeltaToken();
@@ -166,12 +172,16 @@ export class AzureDirectoryService extends BaseDirectoryService implements Direc
if (groups != null) {
for (const group of groups) {
if (getFullResults) {
if (group.id == null || entryIds.has(group.id)) {
continue;
}
if (this.filterOutResult(setFilter, group.displayName)) {
continue;
}
const entry = await this.buildGroup(group);
entries.push(entry);
entryIds.add(group.id);
} else {
changedGroupIds.push(group.id);
}
@@ -202,12 +212,16 @@ export class AzureDirectoryService extends BaseDirectoryService implements Direc
const allGroups: graphType.Group[] = res.value;
if (allGroups != null) {
for (const group of allGroups) {
if (group.id == null || entryIds.has(group.id)) {
continue;
}
if (this.filterOutResult(setFilter, group.displayName)) {
continue;
}
const entry = await this.buildGroup(group);
entries.push(entry);
entryIds.add(group.id);
}
}