bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2026-01-07 19:13:21 +00:00
Code Issues Releases Wiki Activity

Move policy checks within policyService (#1149)

Browse Source 
* Refactor: use new policyService methods

* Update jslib
This commit is contained in:
Thomas Rittson
2021-09-02 07:51:04 +10:00
committed by GitHub
parent cc359e905b
commit bc73452400
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/settings/organization-plans.component.ts
View File

@@ -268,17 +268,7 @@ export class OrganizationPlansComponent implements OnInit {
}
private async userHasBlockingSingleOrgPolicy() {
const policies = await this.policyService.getAll(PolicyType.SingleOrg);
const orgs = await this.userService.getAllOrganizations();
const orgsWithSingleOrgPolicy = policies
.filter(p => p.enabled && p.type === PolicyType.SingleOrg)
.map(p => p.organizationId);
return orgs.some(org => org.type !== OrganizationUserType.Owner &&
org.type !== OrganizationUserType.Admin &&
org.status !== OrganizationUserStatusType.Invited &&
orgsWithSingleOrgPolicy.includes(org.id));
return this.policyService.policyAppliesToUser(PolicyType.SingleOrg);
}
private async updateOrganization(orgId: string) {