Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-06 09:20:43 +01:00
Code Issues Projects Releases Wiki Activity

Change policyAppliesToUser to behave differently for MaximumVaultTimeout (#514)

Browse Source
This commit is contained in:
Oscar Hinton 2021-10-11 18:35:06 +02:00 committed by GitHub
parent 542852a3be
commit 764dc40b36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/services/policy.service.ts
View File

@ -5,10 +5,12 @@ import { UserService } from '../abstractions/user.service';
import { PolicyData } from '../models/data/policyData';
import { MasterPasswordPolicyOptions } from '../models/domain/masterPasswordPolicyOptions';
import { Organization } from '../models/domain/organization';
import { Policy } from '../models/domain/policy';
import { ResetPasswordPolicyOptions } from '../models/domain/resetPasswordPolicyOptions';
import { OrganizationUserStatusType } from '../enums/organizationUserStatusType';
import { OrganizationUserType } from '../enums/organizationUserType';
import { PolicyType } from '../enums/policyType';
import { ListResponse } from '../models/response/listResponse';
@ -189,7 +191,15 @@ export class PolicyService implements PolicyServiceAbstraction {
o.enabled &&
o.status >= OrganizationUserStatusType.Accepted &&
o.usePolicies &&
!o.isExemptFromPolicies &&
!this.isExcemptFromPolicies(o, policyType) &&
policySet.has(o.id));
}
private isExcemptFromPolicies(organization: Organization, policyType: PolicyType) {
if (policyType === PolicyType.MaximumVaultTimeout) {
return organization.type === OrganizationUserType.Owner;
}
return organization.isExemptFromPolicies;
}
}