Renamed to validator

src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/AcceptOrgUserCommand.cs

@@ -35,7 +35,7 @@ public class AcceptOrgUserCommand : IAcceptOrgUserCommand
     private readonly IDataProtectorTokenFactory<OrgUserInviteTokenable> _orgUserInviteTokenDataFactory;
     private readonly IFeatureService _featureService;
     private readonly IPolicyRequirementQuery _policyRequirementQuery;
-    private readonly IAutomaticUserConfirmationPolicyEnforcementQuery _automaticUserConfirmationPolicyEnforcementQuery;
+    private readonly IAutomaticUserConfirmationPolicyEnforcementValidator _automaticUserConfirmationPolicyEnforcementValidator;
 
     public AcceptOrgUserCommand(
         IDataProtectionProvider dataProtectionProvider,
@@ -49,7 +49,7 @@ public class AcceptOrgUserCommand : IAcceptOrgUserCommand
         IDataProtectorTokenFactory<OrgUserInviteTokenable> orgUserInviteTokenDataFactory,
         IFeatureService featureService,
         IPolicyRequirementQuery policyRequirementQuery,
-        IAutomaticUserConfirmationPolicyEnforcementQuery automaticUserConfirmationPolicyEnforcementQuery)
+        IAutomaticUserConfirmationPolicyEnforcementValidator automaticUserConfirmationPolicyEnforcementValidator)
     {
         // TODO: remove data protector when old token validation removed
         _dataProtector = dataProtectionProvider.CreateProtector(OrgUserInviteTokenable.DataProtectorPurpose);
@@ -63,7 +63,7 @@ public class AcceptOrgUserCommand : IAcceptOrgUserCommand
         _orgUserInviteTokenDataFactory = orgUserInviteTokenDataFactory;
         _featureService = featureService;
         _policyRequirementQuery = policyRequirementQuery;
-        _automaticUserConfirmationPolicyEnforcementQuery = automaticUserConfirmationPolicyEnforcementQuery;
+        _automaticUserConfirmationPolicyEnforcementValidator = automaticUserConfirmationPolicyEnforcementValidator;
     }
 
     public async Task<OrganizationUser> AcceptOrgUserByEmailTokenAsync(Guid organizationUserId, User user, string emailToken,
@@ -269,7 +269,7 @@ public class AcceptOrgUserCommand : IAcceptOrgUserCommand
     private async Task ValidateAutomaticUserConfirmationPolicyAsync(OrganizationUser orgUser,
         ICollection<OrganizationUser> allOrgUsers, User user)
     {
-        var error = (await _automaticUserConfirmationPolicyEnforcementQuery.IsCompliantAsync(
+        var error = (await _automaticUserConfirmationPolicyEnforcementValidator.IsCompliantAsync(
                 new AutomaticUserConfirmationPolicyEnforcementRequest(orgUser, allOrgUsers, user)))
             .Match(
                 error => error.Message,

src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/AutoConfirmUser/AutomaticallyConfirmOrganizationUsersValidator.cs

@@ -18,7 +18,7 @@ public class AutomaticallyConfirmOrganizationUsersValidator(
     IOrganizationUserRepository organizationUserRepository,
     ITwoFactorIsEnabledQuery twoFactorIsEnabledQuery,
     IPolicyRequirementQuery policyRequirementQuery,
-    IAutomaticUserConfirmationPolicyEnforcementQuery automaticUserConfirmationPolicyEnforcementQuery,
+    IAutomaticUserConfirmationPolicyEnforcementValidator automaticUserConfirmationPolicyEnforcementValidator,
     IUserService userService,
     IProviderUserRepository providerUserRepository,
     IPolicyRepository policyRepository) : IAutomaticallyConfirmOrganizationUsersValidator
@@ -112,7 +112,7 @@ public class AutomaticallyConfirmOrganizationUsersValidator(
 
         var user = await userService.GetUserByIdAsync(request.OrganizationUser!.UserId!.Value);
 
-        return (await automaticUserConfirmationPolicyEnforcementQuery.IsCompliantAsync(
+        return (await automaticUserConfirmationPolicyEnforcementValidator.IsCompliantAsync(
                 new AutomaticUserConfirmationPolicyEnforcementRequest(
                     request.OrganizationUser,
                     allOrganizationUsersForUser.Where(x => x.OrganizationId != request.OrganizationId),

src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ConfirmOrganizationUserCommand.cs

@@ -34,7 +34,7 @@ public class ConfirmOrganizationUserCommand : IConfirmOrganizationUserCommand
     private readonly IPolicyRequirementQuery _policyRequirementQuery;
     private readonly IFeatureService _featureService;
     private readonly ICollectionRepository _collectionRepository;
-    private readonly IAutomaticUserConfirmationPolicyEnforcementQuery _automaticUserConfirmationPolicyEnforcementQuery;
+    private readonly IAutomaticUserConfirmationPolicyEnforcementValidator _automaticUserConfirmationPolicyEnforcementValidator;
 
     public ConfirmOrganizationUserCommand(
         IOrganizationRepository organizationRepository,
@@ -50,7 +50,7 @@ public class ConfirmOrganizationUserCommand : IConfirmOrganizationUserCommand
         IPolicyRequirementQuery policyRequirementQuery,
         IFeatureService featureService,
         ICollectionRepository collectionRepository,
-        IAutomaticUserConfirmationPolicyEnforcementQuery automaticUserConfirmationPolicyEnforcementQuery)
+        IAutomaticUserConfirmationPolicyEnforcementValidator automaticUserConfirmationPolicyEnforcementValidator)
     {
         _organizationRepository = organizationRepository;
         _organizationUserRepository = organizationUserRepository;
@@ -65,7 +65,7 @@ public class ConfirmOrganizationUserCommand : IConfirmOrganizationUserCommand
         _policyRequirementQuery = policyRequirementQuery;
         _featureService = featureService;
         _collectionRepository = collectionRepository;
-        _automaticUserConfirmationPolicyEnforcementQuery = automaticUserConfirmationPolicyEnforcementQuery;
+        _automaticUserConfirmationPolicyEnforcementValidator = automaticUserConfirmationPolicyEnforcementValidator;
     }
 
     public async Task<OrganizationUser> ConfirmUserAsync(Guid organizationId, Guid organizationUserId, string key,
@@ -196,7 +196,7 @@ public class ConfirmOrganizationUserCommand : IConfirmOrganizationUserCommand
 
         if (_featureService.IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers))
         {
-            var error = (await _automaticUserConfirmationPolicyEnforcementQuery.IsCompliantAsync(
+            var error = (await _automaticUserConfirmationPolicyEnforcementValidator.IsCompliantAsync(
                     new AutomaticUserConfirmationPolicyEnforcementRequest(
                         userOrgs.First(x => x.OrganizationId == organizationId),
                         userOrgs.Where(x => x.OrganizationId != organizationId),

src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementRequest.cs

@@ -3,7 +3,7 @@
 namespace Bit.Core.AdminConsole.OrganizationFeatures.Policies.Enforcement.AutoConfirm;
 
 /// <summary>
-/// Request object for <see cref="AutomaticUserConfirmationPolicyEnforcementQuery"/>
+/// Request object for <see cref="AutomaticUserConfirmationPolicyEnforcementValidator"/>
 /// </summary>
 public record AutomaticUserConfirmationPolicyEnforcementRequest
 {
@@ -22,7 +22,7 @@ public record AutomaticUserConfirmationPolicyEnforcementRequest
     public User User { get; }
 
     /// <summary>
-    /// Request object for <see cref="AutomaticUserConfirmationPolicyEnforcementQuery"/>.
+    /// Request object for <see cref="AutomaticUserConfirmationPolicyEnforcementValidator"/>.
     /// </summary>
     /// <remarks>
     /// This record is used to encapsulate the data required for handling the automatic confirmation policy enforcement.

src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementValidator.cs

@@ -5,9 +5,9 @@ using static Bit.Core.AdminConsole.Utilities.v2.Validation.ValidationResultHelpe
 
 namespace Bit.Core.AdminConsole.OrganizationFeatures.Policies.Enforcement.AutoConfirm;
 
-public class AutomaticUserConfirmationPolicyEnforcementQuery(
+public class AutomaticUserConfirmationPolicyEnforcementValidator(
     IPolicyRequirementQuery policyRequirementQuery)
-    : IAutomaticUserConfirmationPolicyEnforcementQuery
+    : IAutomaticUserConfirmationPolicyEnforcementValidator
 {
     public async Task<ValidationResult<AutomaticUserConfirmationPolicyEnforcementRequest>> IsCompliantAsync(
         AutomaticUserConfirmationPolicyEnforcementRequest request)

src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/IAutomaticUserConfirmationPolicyEnforcementValidator.cs

@@ -9,7 +9,7 @@ namespace Bit.Core.AdminConsole.OrganizationFeatures.Policies.Enforcement.AutoCo
 /// valid for the Automatic User Confirmation policy. It also validates that the given user is not a provider
 /// or a member of another organization regardless of status or type.
 /// </summary>
-public interface IAutomaticUserConfirmationPolicyEnforcementQuery
+public interface IAutomaticUserConfirmationPolicyEnforcementValidator
 {
 
     /// <summary>

src/Core/AdminConsole/OrganizationFeatures/Policies/PolicyServiceCollectionExtensions.cs

@@ -25,7 +25,7 @@ public static class PolicyServiceCollectionExtensions
         services.AddPolicySideEffects();
         services.AddPolicyUpdateEvents();
 
-        services.AddScoped<IAutomaticUserConfirmationPolicyEnforcementQuery, AutomaticUserConfirmationPolicyEnforcementQuery>();
+        services.AddScoped<IAutomaticUserConfirmationPolicyEnforcementValidator, AutomaticUserConfirmationPolicyEnforcementValidator>();
     }
 
     [Obsolete("Use AddPolicyUpdateEvents instead.")]

test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/AcceptOrgUserCommandTests.cs

@@ -693,7 +693,7 @@ public class AcceptOrgUserCommandTests
         // Assert
         AssertValidAcceptedOrgUser(resultOrgUser, orgUser, user);
 
-        await sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementQuery>().DidNotReceiveWithAnyArgs()
+        await sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementValidator>().DidNotReceiveWithAnyArgs()
             .IsCompliantAsync(Arg.Any<AutomaticUserConfirmationPolicyEnforcementRequest>());
     }
 
@@ -707,7 +707,7 @@ public class AcceptOrgUserCommandTests
         SetupCommonAcceptOrgUserMocks(sutProvider, user, org, orgUser, adminUserDetails);
 
         // Mock auto-confirm enforcement query to return valid (no auto-confirm restrictions)
-        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementQuery>()
+        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementValidator>()
             .IsCompliantAsync(Arg.Any<AutomaticUserConfirmationPolicyEnforcementRequest>())
             .Returns(Valid(new AutomaticUserConfirmationPolicyEnforcementRequest(orgUser, [], user)));
 
@@ -735,7 +735,7 @@ public class AcceptOrgUserCommandTests
             .IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers)
             .Returns(true);
 
-        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementQuery>()
+        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementValidator>()
             .IsCompliantAsync(Arg.Any<AutomaticUserConfirmationPolicyEnforcementRequest>())
             .Returns(Invalid(
                 new AutomaticUserConfirmationPolicyEnforcementRequest(orgUser, [otherOrgUser], user),
@@ -835,7 +835,7 @@ public class AcceptOrgUserCommandTests
         // Auto-confirm enforcement query returns valid by default (no restrictions)
         var request = new AutomaticUserConfirmationPolicyEnforcementRequest(orgUser, [], user);
 
-        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementQuery>()
+        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementValidator>()
             .IsCompliantAsync(request)
             .Returns(Valid(request));
     }

test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/AutoConfirmUsers/AutomaticallyConfirmOrganizationUsersValidatorTests.cs

@@ -459,7 +459,7 @@ public class AutomaticallyConfirmOrganizationUsersValidatorTests
             .GetAsync<SingleOrganizationPolicyRequirement>(userId)
             .Returns(new SingleOrganizationPolicyRequirement([singleOrgPolicyDetails]));
 
-        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementQuery>()
+        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementValidator>()
             .IsCompliantAsync(Arg.Any<AutomaticUserConfirmationPolicyEnforcementRequest>())
             .Returns(Task.FromResult(
                 Invalid<AutomaticUserConfirmationPolicyEnforcementRequest>(
@@ -528,7 +528,7 @@ public class AutomaticallyConfirmOrganizationUsersValidatorTests
             .GetAsync<SingleOrganizationPolicyRequirement>(userId)
             .Returns(new SingleOrganizationPolicyRequirement([singleOrgPolicyDetails]));
 
-        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementQuery>()
+        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementValidator>()
             .IsCompliantAsync(Arg.Any<AutomaticUserConfirmationPolicyEnforcementRequest>())
             .Returns(Task.FromResult(
                 Invalid<AutomaticUserConfirmationPolicyEnforcementRequest>(
@@ -635,7 +635,7 @@ public class AutomaticallyConfirmOrganizationUsersValidatorTests
             .GetAsync<SingleOrganizationPolicyRequirement>(userId)
             .Returns(new SingleOrganizationPolicyRequirement([]));
 
-        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementQuery>()
+        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementValidator>()
             .IsCompliantAsync(Arg.Any<AutomaticUserConfirmationPolicyEnforcementRequest>())
             .Returns(Task.FromResult(
                 Valid<AutomaticUserConfirmationPolicyEnforcementRequest>(null!)));

test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/ConfirmOrganizationUserCommandTests.cs

@@ -587,7 +587,7 @@ public class ConfirmOrganizationUserCommandTests
             .IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers)
             .Returns(true);
 
-        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementQuery>()
+        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementValidator>()
             .IsCompliantAsync(Arg.Any<AutomaticUserConfirmationPolicyEnforcementRequest>())
             .Returns(Invalid(
                 new AutomaticUserConfirmationPolicyEnforcementRequest(orgUser, [otherOrgUser], user),
@@ -624,7 +624,7 @@ public class ConfirmOrganizationUserCommandTests
             .IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers)
             .Returns(true);
 
-        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementQuery>()
+        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementValidator>()
             .IsCompliantAsync(Arg.Any<AutomaticUserConfirmationPolicyEnforcementRequest>())
             .Returns(Invalid(
                 new AutomaticUserConfirmationPolicyEnforcementRequest(orgUser, [otherOrgUser], user),
@@ -660,7 +660,7 @@ public class ConfirmOrganizationUserCommandTests
             .IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers)
             .Returns(true);
 
-        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementQuery>()
+        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementValidator>()
             .IsCompliantAsync(Arg.Any<AutomaticUserConfirmationPolicyEnforcementRequest>())
             .Returns(Invalid(
                 new AutomaticUserConfirmationPolicyEnforcementRequest(orgUser, [], user),
@@ -696,7 +696,7 @@ public class ConfirmOrganizationUserCommandTests
             .IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers)
             .Returns(true);
 
-        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementQuery>()
+        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementValidator>()
             .IsCompliantAsync(Arg.Any<AutomaticUserConfirmationPolicyEnforcementRequest>())
             .Returns(Valid(new AutomaticUserConfirmationPolicyEnforcementRequest(orgUser, [], user)));
 
@@ -742,7 +742,7 @@ public class ConfirmOrganizationUserCommandTests
             .GetPoliciesApplicableToUserAsync(user.Id, PolicyType.SingleOrg)
             .Returns([singleOrgPolicy]);
 
-        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementQuery>()
+        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementValidator>()
             .IsCompliantAsync(Arg.Any<AutomaticUserConfirmationPolicyEnforcementRequest>())
             .Returns(Invalid(
                 new AutomaticUserConfirmationPolicyEnforcementRequest(orgUser, [otherOrgUser], user),
@@ -789,15 +789,15 @@ public class ConfirmOrganizationUserCommandTests
             .IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers)
             .Returns(true);
 
-        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementQuery>()
+        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementValidator>()
             .IsCompliantAsync(Arg.Is<AutomaticUserConfirmationPolicyEnforcementRequest>(r => r.User.Id == user1.Id))
             .Returns(Valid(new AutomaticUserConfirmationPolicyEnforcementRequest(orgUser1, [], user1)));
 
-        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementQuery>()
+        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementValidator>()
             .IsCompliantAsync(Arg.Is<AutomaticUserConfirmationPolicyEnforcementRequest>(r => r.User.Id == user2.Id))
             .Returns(Valid(new AutomaticUserConfirmationPolicyEnforcementRequest(orgUser2, [], user2)));
 
-        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementQuery>()
+        sutProvider.GetDependency<IAutomaticUserConfirmationPolicyEnforcementValidator>()
             .IsCompliantAsync(Arg.Is<AutomaticUserConfirmationPolicyEnforcementRequest>(r => r.User.Id == user3.Id))
             .Returns(Invalid(
                 new AutomaticUserConfirmationPolicyEnforcementRequest(orgUser3, [otherOrgUser], user3),

test/Core.Test/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementValidatorTests.cs

@@ -15,12 +15,12 @@ using Xunit;
 namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.Policies.Enforcement.AutoConfirm;
 
 [SutProviderCustomize]
-public class AutomaticUserConfirmationPolicyEnforcementQueryTests
+public class AutomaticUserConfirmationPolicyEnforcementValidatorTests
 {
     [Theory]
     [BitAutoData]
     public async Task IsCompliantAsync_WithNoOtherOrganizations_ReturnsValid(
-        SutProvider<AutomaticUserConfirmationPolicyEnforcementQuery> sutProvider,
+        SutProvider<AutomaticUserConfirmationPolicyEnforcementValidator> sutProvider,
         [OrganizationUser(OrganizationUserStatusType.Accepted)] OrganizationUser organizationUser,
         User user)
     {
@@ -44,7 +44,7 @@ public class AutomaticUserConfirmationPolicyEnforcementQueryTests
     [Theory]
     [BitAutoData]
     public async Task IsCompliantAsync_WithPolicyEnabledOnSameOrganizationButNoOtherOrgs_ReturnsValid(
-        SutProvider<AutomaticUserConfirmationPolicyEnforcementQuery> sutProvider,
+        SutProvider<AutomaticUserConfirmationPolicyEnforcementValidator> sutProvider,
         [OrganizationUser(OrganizationUserStatusType.Accepted)] OrganizationUser organizationUser,
         User user)
     {
@@ -75,7 +75,7 @@ public class AutomaticUserConfirmationPolicyEnforcementQueryTests
     [Theory]
     [BitAutoData]
     public async Task IsCompliantAsync_WithPolicyEnabledOnSameOrgAndUserHasOtherOrgs_ReturnsOrganizationEnforcesSingleOrgPolicyError(
-        SutProvider<AutomaticUserConfirmationPolicyEnforcementQuery> sutProvider,
+        SutProvider<AutomaticUserConfirmationPolicyEnforcementValidator> sutProvider,
         [OrganizationUser(OrganizationUserStatusType.Accepted)] OrganizationUser organizationUser,
         OrganizationUser otherOrgUser,
         User user)
@@ -108,7 +108,7 @@ public class AutomaticUserConfirmationPolicyEnforcementQueryTests
     [Theory]
     [BitAutoData]
     public async Task IsCompliantAsync_WithUserIsProvider_ReturnsProviderUsersCannotJoinError(
-        SutProvider<AutomaticUserConfirmationPolicyEnforcementQuery> sutProvider,
+        SutProvider<AutomaticUserConfirmationPolicyEnforcementValidator> sutProvider,
         [OrganizationUser(OrganizationUserStatusType.Accepted)] OrganizationUser organizationUser,
         User user)
     {
@@ -140,7 +140,7 @@ public class AutomaticUserConfirmationPolicyEnforcementQueryTests
     [Theory]
     [BitAutoData]
     public async Task IsCompliantAsync_WithPolicyEnabledOnOtherOrganization_ReturnsOtherOrganizationEnforcesSingleOrgPolicyError(
-        SutProvider<AutomaticUserConfirmationPolicyEnforcementQuery> sutProvider,
+        SutProvider<AutomaticUserConfirmationPolicyEnforcementValidator> sutProvider,
         [OrganizationUser(OrganizationUserStatusType.Accepted)] OrganizationUser organizationUser,
         User user)
     {
@@ -173,7 +173,7 @@ public class AutomaticUserConfirmationPolicyEnforcementQueryTests
     [Theory]
     [BitAutoData]
     public async Task IsCompliantAsync_WithOtherOrganizationsButNoPolicyEnabled_ReturnsValid(
-        SutProvider<AutomaticUserConfirmationPolicyEnforcementQuery> sutProvider,
+        SutProvider<AutomaticUserConfirmationPolicyEnforcementValidator> sutProvider,
         [OrganizationUser(OrganizationUserStatusType.Accepted)] OrganizationUser organizationUser,
         OrganizationUser otherOrgUser,
         User user)
@@ -199,7 +199,7 @@ public class AutomaticUserConfirmationPolicyEnforcementQueryTests
     [Theory]
     [BitAutoData]
     public async Task IsCompliantAsync_WithEmptyOtherOrganizationsAndSingleOrg_ReturnsValid(
-        SutProvider<AutomaticUserConfirmationPolicyEnforcementQuery> sutProvider,
+        SutProvider<AutomaticUserConfirmationPolicyEnforcementValidator> sutProvider,
         [OrganizationUser(OrganizationUserStatusType.Accepted)] OrganizationUser organizationUser,
         User user)
     {
@@ -224,7 +224,7 @@ public class AutomaticUserConfirmationPolicyEnforcementQueryTests
     [Theory]
     [BitAutoData]
     public async Task IsCompliantAsync_ChecksConditionsInCorrectOrder_ReturnsFirstFailure(
-        SutProvider<AutomaticUserConfirmationPolicyEnforcementQuery> sutProvider,
+        SutProvider<AutomaticUserConfirmationPolicyEnforcementValidator> sutProvider,
         [OrganizationUser(OrganizationUserStatusType.Accepted)] OrganizationUser organizationUser,
         OrganizationUser otherOrgUser,
         User user)
@@ -257,7 +257,7 @@ public class AutomaticUserConfirmationPolicyEnforcementQueryTests
     [Theory]
     [BitAutoData]
     public async Task IsCompliantAsync_WithNullOtherOrganizations_ReturnsValidWhenNoOtherOrgs(
-        SutProvider<AutomaticUserConfirmationPolicyEnforcementQuery> sutProvider,
+        SutProvider<AutomaticUserConfirmationPolicyEnforcementValidator> sutProvider,
         [OrganizationUser(OrganizationUserStatusType.Accepted)] OrganizationUser organizationUser,
         User user)
     {