bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-11 22:03:36 +00:00
Code Issues 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
1 changed files with 11 additions and 1 deletions
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 { PolicyData } from '../models/data/policyData';
import { MasterPasswordPolicyOptions } from '../models/domain/masterPasswordPolicyOptions'; import { MasterPasswordPolicyOptions } from '../models/domain/masterPasswordPolicyOptions';
import { Organization } from '../models/domain/organization';
import { Policy } from '../models/domain/policy'; import { Policy } from '../models/domain/policy';
import { ResetPasswordPolicyOptions } from '../models/domain/resetPasswordPolicyOptions'; import { ResetPasswordPolicyOptions } from '../models/domain/resetPasswordPolicyOptions';
import { OrganizationUserStatusType } from '../enums/organizationUserStatusType'; import { OrganizationUserStatusType } from '../enums/organizationUserStatusType';
import { OrganizationUserType } from '../enums/organizationUserType';
import { PolicyType } from '../enums/policyType'; import { PolicyType } from '../enums/policyType';
import { ListResponse } from '../models/response/listResponse'; import { ListResponse } from '../models/response/listResponse';
@@ -189,7 +191,15 @@ export class PolicyService implements PolicyServiceAbstraction {
o.enabled && o.enabled &&
o.status >= OrganizationUserStatusType.Accepted && o.status >= OrganizationUserStatusType.Accepted &&
o.usePolicies && o.usePolicies &&
!o.isExemptFromPolicies && !this.isExcemptFromPolicies(o, policyType) &&
policySet.has(o.id)); policySet.has(o.id));
} }
private isExcemptFromPolicies(organization: Organization, policyType: PolicyType) {
if (policyType === PolicyType.MaximumVaultTimeout) {
return organization.type === OrganizationUserType.Owner;
}
return organization.isExemptFromPolicies;
}
} }