Skip to content
This repository has been archived by the owner on Jun 17, 2022. It is now read-only.

Commit

Permalink
Change policyAppliesToUser to behave differently for MaximumVaultTime…
Browse files Browse the repository at this point in the history
…out (#514)
  • Loading branch information
Hinton committed Oct 11, 2021
1 parent 542852a commit 764dc40
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion common/src/services/policy.service.ts
Expand Up @@ -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';
Expand Down Expand Up @@ -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;
}
}

0 comments on commit 764dc40

Please sign in to comment.