From 764dc40b36e0000807e59b8d6feea5ac4577270d Mon Sep 17 00:00:00 2001
From: Oscar Hinton <oscar@oscarhinton.com>
Date: Mon, 11 Oct 2021 18:35:06 +0200
Subject: [PATCH] Change policyAppliesToUser to behave differently for
 MaximumVaultTimeout (#514)

---
 common/src/services/policy.service.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/common/src/services/policy.service.ts b/common/src/services/policy.service.ts
index 996836bc37..4b035a12f4 100644
--- a/common/src/services/policy.service.ts
+++ b/common/src/services/policy.service.ts
@@ -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;
+    }
 }