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

formatting

Browse Source
This commit is contained in:
Kyle Spearrin
2018-10-26 07:34:16 -04:00
parent 447b674469
commit 70c1eb0623
2 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

Submodule jslib updated: 2f6426deb4...b0eea9d7ce

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

@@ -21,6 +21,13 @@ const NextLink = '@odata.nextLink';
const DeltaLink = '@odata.deltaLink'; const DeltaLink = '@odata.deltaLink';
const ObjectType = '@odata.type'; const ObjectType = '@odata.type';
enum UserSetType {
IncludeUser,
ExcludeUser,
IncludeGroup,
ExcludeGroup,
}
export class AzureDirectoryService extends BaseDirectoryService implements DirectoryService { export class AzureDirectoryService extends BaseDirectoryService implements DirectoryService {
private client: graph.Client; private client: graph.Client;
private dirConfig: AzureConfiguration; private dirConfig: AzureConfiguration;
@@ -162,34 +169,35 @@ export class AzureDirectoryService extends BaseDirectoryService implements Direc
} }
private async filterOutUserResult(setFilter: [UserSetType, Set<string>], user: UserEntry): Promise<boolean> { private async filterOutUserResult(setFilter: [UserSetType, Set<string>], user: UserEntry): Promise<boolean> {
if (setFilter != null) { if (setFilter == null) {
return false;
}
let userSetTypeExclude = null; let userSetTypeExclude = null;
if (setFilter[0] === UserSetType.IncludeUser) { if (setFilter[0] === UserSetType.IncludeUser) {
userSetTypeExclude = false; userSetTypeExclude = false;
} else if (setFilter[0] === UserSetType.ExcludeUser) { } else if (setFilter[0] === UserSetType.ExcludeUser) {
userSetTypeExclude = true; userSetTypeExclude = true;
} }
if (userSetTypeExclude != null) { if (userSetTypeExclude != null) {
return this.filterOutResult([userSetTypeExclude, setFilter[1]], user.email); return this.filterOutResult([userSetTypeExclude, setFilter[1]], user.email);
} else { }
try { try {
let memberGroups = await this.client.api(`/users/${user.externalId}/checkMemberGroups`).post({ const memberGroups = await this.client.api(`/users/${user.externalId}/checkMemberGroups`).post({
groupIds: Array.from(setFilter[1]) groupIds: Array.from(setFilter[1]),
}); });
if (memberGroups.value.length > 0 && setFilter[0] == UserSetType.IncludeGroup) { if (memberGroups.value.length > 0 && setFilter[0] === UserSetType.IncludeGroup) {
return false; return false;
} else if (memberGroups.value.length > 0 && setFilter[0] == UserSetType.ExcludeGroup) { } else if (memberGroups.value.length > 0 && setFilter[0] === UserSetType.ExcludeGroup) {
return true; return true;
} else if (memberGroups.value.length == 0 && setFilter[0] == UserSetType.IncludeGroup) { } else if (memberGroups.value.length === 0 && setFilter[0] === UserSetType.IncludeGroup) {
return true; return true;
} else if (memberGroups.value.length == 0 && setFilter[0] == UserSetType.ExcludeGroup) { } else if (memberGroups.value.length === 0 && setFilter[0] === UserSetType.ExcludeGroup) {
return false; return false;
} }
} catch(ex) { } catch { }
return false;
}
}
}
return false; return false;
} }
@@ -349,10 +357,3 @@ export class AzureDirectoryService extends BaseDirectoryService implements Direc
this.accessTokenExpiration = exp; this.accessTokenExpiration = exp;
} }
} }
enum UserSetType {
IncludeUser,
ExcludeUser,
IncludeGroup,
ExcludeGroup
}