diff --git a/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementQuery.cs b/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementQuery.cs index fc7acdeb95..388cc9c0ad 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementQuery.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementQuery.cs @@ -23,7 +23,8 @@ public class AutomaticUserConfirmationPolicyEnforcementQuery( return Invalid(request, new OrganizationEnforcesSingleOrgPolicy()); } - if (automaticUserConfirmationPolicyRequirement.IsEnabledAndUserIsAProvider(request.OrganizationUser.OrganizationId)) + if (automaticUserConfirmationPolicyRequirement.IsEnabledAndUserIsAProvider(request.OrganizationUser + .OrganizationId)) { return Invalid(request, new ProviderUsersCannotJoin()); } @@ -39,7 +40,6 @@ public class AutomaticUserConfirmationPolicyEnforcementQuery( private async Task OrganizationUserBelongsToAnotherOrganizationAsync( AutomaticUserConfirmationPolicyEnforcementRequest request) => - request.OtherOrganizationsOrganizationUsers?.ToArray() is { Length: > 0 } - || (await organizationUserRepository.GetManyByUserAsync(request.User.Id)) - .Any(x => x.OrganizationId != request.OrganizationUser.OrganizationId); + (await organizationUserRepository.GetManyByUserAsync(request.User.Id)).Any(x => + x.OrganizationId != request.OrganizationUser.OrganizationId); } diff --git a/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementRequest.cs b/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementRequest.cs index 216be4bce8..592b3e4633 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementRequest.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementRequest.cs @@ -8,7 +8,7 @@ namespace Bit.Core.AdminConsole.OrganizationFeatures.Policies.Enforcement.AutoCo public record AutomaticUserConfirmationPolicyEnforcementRequest { public OrganizationUser OrganizationUser { get; } - public IEnumerable? OtherOrganizationsOrganizationUsers { get; } + public IEnumerable OtherOrganizationsOrganizationUsers { get; } public User User { get; } /// @@ -31,21 +31,5 @@ public record AutomaticUserConfirmationPolicyEnforcementRequest OtherOrganizationsOrganizationUsers = organizationUsersForOtherOrganizations; User = user; } - - /// - /// Request object for - /// - /// - /// Use this constructor when you haven't retrieved the organization user records for other organizations yet. - /// - /// Organization User to Validate - /// User record for orgUser - public AutomaticUserConfirmationPolicyEnforcementRequest(OrganizationUser organizationUserToValidate, - User user) - { - OrganizationUser = organizationUserToValidate; - OtherOrganizationsOrganizationUsers = null; - User = user; - } }