bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-25 04:33:26 +00:00
Code Issues Releases Wiki Activity

removed recursive call.

Browse Source
This commit is contained in:
Jared McCannon
2025-11-26 14:40:24 -06:00
parent 7c5d6aef37
commit 23ca1b6985
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Core/AdminConsole/Services/Implementations/PolicyService.cs
View File

@@ -92,12 +92,12 @@ public class PolicyService : IPolicyService
OrganizationUserType[] excludedUserTypes;
if (policyType == PolicyType.SingleOrg
&& _featureService.IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers)
&& await GetPoliciesApplicableToUserAsync(userId, PolicyType.AutomaticUserConfirmation, OrganizationUserStatusType.Revoked) is { Count: > 0 })
if (policyType == PolicyType.SingleOrg // looking for single org
&& _featureService.IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers) // if autoconfirm is enabled
&& (await _organizationUserRepository.GetByUserIdWithPolicyDetailsAsync(userId, PolicyType.AutomaticUserConfirmation)).Any()) // any auto confirm details associated with user id
{
minStatus = OrganizationUserStatusType.Revoked;
excludedUserTypes = [];
minStatus = OrganizationUserStatusType.Revoked; // all statuses count
excludedUserTypes = []; // no excluded types
}
else
{

6
test/Core.Test/AdminConsole/Services/PolicyServiceTests.cs
View File

@@ -143,7 +143,7 @@ public class PolicyServiceTests
.IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers)
.Returns(true);
// Setup recursive call - user has AutomaticUserConfirmation policy
// Mock repository call - user has AutomaticUserConfirmation policy details
var autoConfirmPolicies = new List<OrganizationUserPolicyDetails>
{
new() { OrganizationId = Guid.NewGuid(), PolicyType = PolicyType.AutomaticUserConfirmation, PolicyEnabled = true, OrganizationUserType = OrganizationUserType.User, OrganizationUserStatus = OrganizationUserStatusType.Revoked, IsProvider = false }
@@ -187,7 +187,7 @@ public class PolicyServiceTests
.IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers)
.Returns(true);
// Setup recursive call - user has AutomaticUserConfirmation policy
// Mock repository call - user has AutomaticUserConfirmation policy details
var autoConfirmPolicies = new List<OrganizationUserPolicyDetails>
{
new() { OrganizationId = Guid.NewGuid(), PolicyType = PolicyType.AutomaticUserConfirmation, PolicyEnabled = true, OrganizationUserType = OrganizationUserType.User, OrganizationUserStatus = OrganizationUserStatusType.Confirmed, IsProvider = false }
@@ -266,7 +266,7 @@ public class PolicyServiceTests
.IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers)
.Returns(true);
// Setup recursive call - user has NO AutomaticUserConfirmation policy
// Mock repository call - user has NO AutomaticUserConfirmation policy details
sutProvider.GetDependency<IOrganizationUserRepository>()
.GetByUserIdWithPolicyDetailsAsync(userId, PolicyType.AutomaticUserConfirmation)
.Returns(new List<OrganizationUserPolicyDetails>());