bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-09 03:53:42 +00:00
Code Issues Releases Wiki Activity

Added new logic for single org when auto-confirm is enabled in policy service.

Browse Source
This commit is contained in:
Jared McCannon
2025-11-26 10:06:59 -06:00
parent 3f326f291a
commit 1734d07896
2 changed files with 222 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,21 @@ public class PolicyService : IPolicyService
private async Task<IEnumerable<OrganizationUserPolicyDetails>> QueryOrganizationUserPolicyDetailsAsync(Guid userId, PolicyType policyType, OrganizationUserStatusType minStatus = OrganizationUserStatusType.Accepted)
{
var organizationUserPolicyDetails = await _organizationUserRepository.GetByUserIdWithPolicyDetailsAsync(userId, policyType);
var excludedUserTypes = GetUserTypesExcludedFromPolicy(policyType);
OrganizationUserType[] excludedUserTypes;
if (policyType == PolicyType.SingleOrg
&& _featureService.IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers)
&& await GetPoliciesApplicableToUserAsync(userId, PolicyType.AutomaticUserConfirmation, OrganizationUserStatusType.Revoked) is { Count: > 0 })
{
minStatus = OrganizationUserStatusType.Revoked;
excludedUserTypes = [];
}
else
{
excludedUserTypes = GetUserTypesExcludedFromPolicy(policyType);
}
var orgAbilities = await _applicationCacheService.GetOrganizationAbilitiesAsync();
return organizationUserPolicyDetails.Where(o =>
(!orgAbilities.TryGetValue(o.OrganizationId, out var orgAbility) || orgAbility.UsePolicies) &&