nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

Remove noncompliant users for new policies (#1951)

Browse Source
This commit is contained in:
Thomas Rittson 2022-04-22 08:13:02 +10:00 committed by GitHub
parent de997a2246
commit 669d44c170
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Core/Services/Implementations/PolicyService.cs
View File

@ -84,7 +84,8 @@ namespace Bit.Core.Services
{ {
policy.CreationDate = now; policy.CreationDate = now;
} }
else if (policy.Enabled)
if (policy.Enabled)
{ {
var currentPolicy = await _policyRepository.GetByIdAsync(policy.Id); var currentPolicy = await _policyRepository.GetByIdAsync(policy.Id);
if (!currentPolicy?.Enabled ?? true) if (!currentPolicy?.Enabled ?? true)
@ -95,7 +96,7 @@ namespace Bit.Core.Services
ou.Status != Enums.OrganizationUserStatusType.Invited && ou.Status != Enums.OrganizationUserStatusType.Invited &&
ou.Type != Enums.OrganizationUserType.Owner && ou.Type != Enums.OrganizationUserType.Admin && ou.Type != Enums.OrganizationUserType.Owner && ou.Type != Enums.OrganizationUserType.Admin &&
ou.UserId != savingUserId); ou.UserId != savingUserId);
switch (currentPolicy.Type) switch (policy.Type)
{ {
case Enums.PolicyType.TwoFactorAuthentication: case Enums.PolicyType.TwoFactorAuthentication:
foreach (var orgUser in removableOrgUsers) foreach (var orgUser in removableOrgUsers)