bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-05 23:53:21 +00:00
Code Issues Releases Wiki Activity

fix returns to continues

Browse Source
This commit is contained in:
Kyle Spearrin
2018-05-07 16:23:55 -04:00
parent 18d77f5ff5
commit 3f9db95eba
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/tabs/dashboard.component.ts
View File

@@ -131,7 +131,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
this.sort(this.simGroups);
for (const g of this.simGroups) {
if (g.userMemberExternalIds == null) {
return;
continue;
}
for (const uid of g.userMemberExternalIds) {

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

@@ -88,12 +88,12 @@ export class AzureDirectoryService extends BaseDirectoryService implements Direc
for (const user of users) {
const entry = this.buildUser(user);
if (this.filterOutResult(setFilter, entry.email)) {
return;
continue;
}
if (!entry.disabled && !entry.deleted &&
(entry.email == null || entry.email.indexOf('#') > -1)) {
return;
continue;
}
entries.push(entry);
@@ -158,7 +158,7 @@ export class AzureDirectoryService extends BaseDirectoryService implements Direc
for (const group of groups) {
if (getFullResults) {
if (this.filterOutResult(setFilter, group.displayName)) {
return;
continue;
}
const entry = await this.buildGroup(group);
@@ -194,7 +194,7 @@ export class AzureDirectoryService extends BaseDirectoryService implements Direc
if (allGroups != null) {
for (const group of allGroups) {
if (this.filterOutResult(setFilter, group.displayName)) {
return;
continue;
}
const entry = await this.buildGroup(group);

8
src/services/gsuite-directory.service.ts
View File

@@ -82,7 +82,7 @@ export class GSuiteDirectoryService extends BaseDirectoryService implements Dire
if (res.data.users != null) {
for (const user of res.data.users) {
if (this.filterOutResult(filter, user.primaryEmail)) {
return;
continue;
}
const entry = this.buildUser(user, false);
@@ -102,7 +102,7 @@ export class GSuiteDirectoryService extends BaseDirectoryService implements Dire
if (delRes.data.users != null) {
for (const user of delRes.data.users) {
if (this.filterOutResult(filter, user.primaryEmail)) {
return;
continue;
}
const entry = this.buildUser(user, true);
@@ -165,10 +165,10 @@ export class GSuiteDirectoryService extends BaseDirectoryService implements Dire
if (memRes.data.members != null) {
for (const member of memRes.data.members) {
if (member.role.toLowerCase() !== 'member') {
return;
continue;
}
if (member.status.toLowerCase() !== 'active') {
return;
continue;
}
if (member.type.toLowerCase() === 'user') {