[AC-1200] Admin Console code ownership - move OrganizationFeatures (#3369)

2025-07-01 16:12:49 -05:00 · 2023-10-27 07:47:44 +10:00
parent 26dd8b0e47
commit ad230fb6a5
66 changed files with 151 additions and 152 deletions
--- a/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommandTest.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommandTest.cs
@ -1,27 +0,0 @@
-using Bit.Core.Entities;
-using Bit.Core.Enums;
-using Bit.Core.OrganizationFeatures.OrganizationApiKeys;
-using Bit.Core.Repositories;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using NSubstitute;
-using NSubstitute.ReceivedExtensions;
-using Xunit;
-
-namespace Bit.Core.Test.OrganizationFeatures.OrganizationApiKeys;
-
-[SutProviderCustomize]
-public class CreateOrganizationApiKeyCommandTest
-{
-    [Theory]
-    [BitAutoData]
-    public async Task CreateAsync_CreatesOrganizationApiKey(SutProvider<CreateOrganizationApiKeyCommand> sutProvider,
-        Guid organizationId, OrganizationApiKeyType keyType)
-    {
-        await sutProvider.Sut.CreateAsync(organizationId, keyType);
-
-        await sutProvider.GetDependency<IOrganizationApiKeyRepository>().Received(1)
-            .CreateAsync(Arg.Is<OrganizationApiKey>(o => o.OrganizationId == organizationId
-                                                         && o.Type == keyType));
-    }
-}
--- a/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQueryTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQueryTests.cs
@ -1,80 +0,0 @@
-using Bit.Core.Entities;
-using Bit.Core.Enums;
-using Bit.Core.OrganizationFeatures.OrganizationApiKeys;
-using Bit.Core.Repositories;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using NSubstitute;
-using Xunit;
-
-namespace Bit.Core.Test.OrganizationFeatures.OrganizationApiKeys;
-
-[SutProviderCustomize]
-public class GetOrganizationApiKeyQueryTests
-{
-    [Theory]
-    [BitAutoData]
-    public async Task GetOrganizationApiKey_HasOne_Returns(SutProvider<GetOrganizationApiKeyQuery> sutProvider,
-        Guid id, Guid organizationId, OrganizationApiKeyType keyType)
-    {
-        sutProvider.GetDependency<IOrganizationApiKeyRepository>()
-            .GetManyByOrganizationIdTypeAsync(organizationId, keyType)
-            .Returns(new List<OrganizationApiKey>
-            {
-                new OrganizationApiKey
-                {
-                    Id = id,
-                    OrganizationId = organizationId,
-                    ApiKey = "test",
-                    Type = keyType,
-                    RevisionDate = DateTime.Now.AddDays(-1),
-                },
-            });
-
-        var apiKey = await sutProvider.Sut.GetOrganizationApiKeyAsync(organizationId, keyType);
-        Assert.NotNull(apiKey);
-        Assert.Equal(id, apiKey.Id);
-    }
-
-    [Theory]
-    [BitAutoData]
-    public async Task GetOrganizationApiKey_HasTwo_Throws(SutProvider<GetOrganizationApiKeyQuery> sutProvider,
-        Guid organizationId, OrganizationApiKeyType keyType)
-    {
-        sutProvider.GetDependency<IOrganizationApiKeyRepository>()
-            .GetManyByOrganizationIdTypeAsync(organizationId, keyType)
-            .Returns(new List<OrganizationApiKey>
-            {
-                new OrganizationApiKey
-                {
-                    Id = Guid.NewGuid(),
-                    OrganizationId = organizationId,
-                    ApiKey = "test",
-                    Type = keyType,
-                    RevisionDate = DateTime.Now.AddDays(-1),
-                },
-                new OrganizationApiKey
-                {
-                    Id = Guid.NewGuid(),
-                    OrganizationId = organizationId,
-                    ApiKey = "test_other",
-                    Type = keyType,
-                    RevisionDate = DateTime.Now.AddDays(-1),
-                },
-            });
-
-        await Assert.ThrowsAsync<InvalidOperationException>(
-            async () => await sutProvider.Sut.GetOrganizationApiKeyAsync(organizationId, keyType));
-    }
-
-    [Theory]
-    [BitAutoData]
-    public async Task GetOrganizationApiKey_BadType_Throws(SutProvider<GetOrganizationApiKeyQuery> sutProvider,
-        Guid organizationId, OrganizationApiKeyType keyType)
-    {
-        keyType = (OrganizationApiKeyType)byte.MaxValue;
-
-        await Assert.ThrowsAsync<ArgumentOutOfRangeException>(
-            async () => await sutProvider.Sut.GetOrganizationApiKeyAsync(organizationId, keyType));
-    }
-}
--- a/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommandTests.cs
@ -1,22 +0,0 @@
-using Bit.Core.Entities;
-using Bit.Core.OrganizationFeatures.OrganizationApiKeys;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using Bit.Test.Common.Helpers;
-using Xunit;
-
-namespace Bit.Core.Test.OrganizationFeatures.OrganizationApiKeys;
-
-[SutProviderCustomize]
-public class RotateOrganizationApiKeyCommandTests
-{
-    [Theory, BitAutoData]
-    public async Task RotateApiKeyAsync_RotatesKey(SutProvider<RotateOrganizationApiKeyCommand> sutProvider,
-        OrganizationApiKey organizationApiKey)
-    {
-        var existingKey = organizationApiKey.ApiKey;
-        organizationApiKey = await sutProvider.Sut.RotateApiKeyAsync(organizationApiKey);
-        Assert.NotEqual(existingKey, organizationApiKey.ApiKey);
-        AssertHelper.AssertRecent(organizationApiKey.RevisionDate);
-    }
-}
--- a/test/Core.Test/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommandTests.cs
@ -1,26 +0,0 @@
-using Bit.Core.Models.Data.Organizations.OrganizationConnections;
-using Bit.Core.Models.OrganizationConnectionConfigs;
-using Bit.Core.OrganizationFeatures.OrganizationConnections;
-using Bit.Core.Repositories;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using Bit.Test.Common.Helpers;
-using NSubstitute;
-using Xunit;
-
-namespace Bit.Core.Test.OrganizationFeatures.OrganizationConnections;
-
-[SutProviderCustomize]
-public class CreateOrganizationConnectionCommandTests
-{
-    [Theory]
-    [BitAutoData]
-    public async Task CreateAsync_CallsCreate(OrganizationConnectionData<BillingSyncConfig> data,
-        SutProvider<CreateOrganizationConnectionCommand> sutProvider)
-    {
-        await sutProvider.Sut.CreateAsync(data);
-
-        await sutProvider.GetDependency<IOrganizationConnectionRepository>().Received(1)
-            .CreateAsync(Arg.Is(AssertHelper.AssertPropertyEqual(data.ToEntity())));
-    }
-}
--- a/test/Core.Test/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommandTests.cs
@ -1,24 +0,0 @@
-using Bit.Core.Entities;
-using Bit.Core.OrganizationFeatures.OrganizationConnections;
-using Bit.Core.Repositories;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using NSubstitute;
-using Xunit;
-
-namespace Bit.Core.Test.OrganizationFeatures.OrganizationConnections;
-
-[SutProviderCustomize]
-public class DeleteOrganizationConnectionCommandTests
-{
-    [Theory]
-    [BitAutoData]
-    public async Task DeleteAsync_CallsDelete(OrganizationConnection connection,
-        SutProvider<DeleteOrganizationConnectionCommand> sutProvider)
-    {
-        await sutProvider.Sut.DeleteAsync(connection);
-
-        await sutProvider.GetDependency<IOrganizationConnectionRepository>().Received(1)
-            .DeleteAsync(connection);
-    }
-}
--- a/test/Core.Test/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommandTests.cs
@ -1,58 +0,0 @@
-using Bit.Core.Entities;
-using Bit.Core.Exceptions;
-using Bit.Core.Models.Data.Organizations.OrganizationConnections;
-using Bit.Core.Models.OrganizationConnectionConfigs;
-using Bit.Core.OrganizationFeatures.OrganizationConnections;
-using Bit.Core.Repositories;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using Bit.Test.Common.Helpers;
-using NSubstitute;
-using Xunit;
-
-namespace Bit.Core.Test.OrganizationFeatures.OrganizationConnections;
-
-[SutProviderCustomize]
-public class UpdateOrganizationConnectionCommandTests
-{
-    [Theory]
-    [BitAutoData]
-    public async Task UpdateAsync_NoId_Fails(OrganizationConnectionData<BillingSyncConfig> data,
-        SutProvider<UpdateOrganizationConnectionCommand> sutProvider)
-    {
-        data.Id = null;
-
-        var exception = await Assert.ThrowsAsync<Exception>(() => sutProvider.Sut.UpdateAsync(data));
-
-        Assert.Contains("Cannot update connection, Connection does not exist.", exception.Message);
-        await sutProvider.GetDependency<IOrganizationConnectionRepository>().DidNotReceiveWithAnyArgs()
-            .UpsertAsync(default);
-    }
-
-    [Theory]
-    [BitAutoData]
-    public async Task UpdateAsync_ConnectionDoesNotExist_ThrowsNotFound(
-        OrganizationConnectionData<BillingSyncConfig> data,
-        SutProvider<UpdateOrganizationConnectionCommand> sutProvider)
-    {
-        var exception = await Assert.ThrowsAsync<NotFoundException>(() => sutProvider.Sut.UpdateAsync(data));
-
-        await sutProvider.GetDependency<IOrganizationConnectionRepository>().DidNotReceiveWithAnyArgs()
-            .UpsertAsync(default);
-    }
-
-    [Theory]
-    [BitAutoData]
-    public async Task UpdateAsync_CallsUpsert(OrganizationConnectionData<BillingSyncConfig> data,
-        OrganizationConnection existing,
-        SutProvider<UpdateOrganizationConnectionCommand> sutProvider)
-    {
-        data.Id = existing.Id;
-
-        sutProvider.GetDependency<IOrganizationConnectionRepository>().GetByIdAsync(data.Id.Value).Returns(existing);
-        await sutProvider.Sut.UpdateAsync(data);
-
-        await sutProvider.GetDependency<IOrganizationConnectionRepository>().Received(1)
-            .UpsertAsync(Arg.Is(AssertHelper.AssertPropertyEqual(data.ToEntity())));
-    }
-}
--- a/test/Core.Test/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommandTests.cs
@ -1,57 +0,0 @@
-using Bit.Core.Entities;
-using Bit.Core.Enums;
-using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.OrganizationConnections;
-using Bit.Core.Repositories;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using NSubstitute;
-using Xunit;
-
-namespace Bit.Core.Test.OrganizationFeatures.OrganizationConnections;
-
-[SutProviderCustomize]
-public class ValidateBillingSyncKeyCommandTests
-{
-    [Theory]
-    [BitAutoData]
-    public async Task ValidateBillingSyncKeyAsync_NullOrganization_Throws(SutProvider<ValidateBillingSyncKeyCommand> sutProvider)
-    {
-        await Assert.ThrowsAsync<BadRequestException>(() => sutProvider.Sut.ValidateBillingSyncKeyAsync(null, null));
-    }
-
-    [Theory]
-    [BitAutoData((string)null)]
-    [BitAutoData("")]
-    [BitAutoData("       ")]
-    public async Task ValidateBillingSyncKeyAsync_BadString_ReturnsFalse(string billingSyncKey, SutProvider<ValidateBillingSyncKeyCommand> sutProvider)
-    {
-        Assert.False(await sutProvider.Sut.ValidateBillingSyncKeyAsync(new Organization(), billingSyncKey));
-    }
-
-    [Theory]
-    [BitAutoData]
-    public async Task ValidateBillingSyncKeyAsync_KeyEquals_ReturnsTrue(SutProvider<ValidateBillingSyncKeyCommand> sutProvider,
-        Organization organization, OrganizationApiKey orgApiKey, string billingSyncKey)
-    {
-        orgApiKey.ApiKey = billingSyncKey;
-
-        sutProvider.GetDependency<IOrganizationApiKeyRepository>()
-            .GetManyByOrganizationIdTypeAsync(organization.Id, OrganizationApiKeyType.BillingSync)
-            .Returns(new[] { orgApiKey });
-
-        Assert.True(await sutProvider.Sut.ValidateBillingSyncKeyAsync(organization, billingSyncKey));
-    }
-
-    [Theory]
-    [BitAutoData]
-    public async Task ValidateBillingSyncKeyAsync_KeyDoesNotEqual_ReturnsFalse(SutProvider<ValidateBillingSyncKeyCommand> sutProvider,
-        Organization organization, OrganizationApiKey orgApiKey, string billingSyncKey)
-    {
-        sutProvider.GetDependency<IOrganizationApiKeyRepository>()
-            .GetManyByOrganizationIdTypeAsync(organization.Id, OrganizationApiKeyType.BillingSync)
-            .Returns(new[] { orgApiKey });
-
-        Assert.False(await sutProvider.Sut.ValidateBillingSyncKeyAsync(organization, billingSyncKey));
-    }
-}
--- a/test/Core.Test/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommandTests.cs
@ -1,130 +0,0 @@
-using Bit.Core.Entities;
-using Bit.Core.Enums;
-using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.OrganizationDomains;
-using Bit.Core.Repositories;
-using Bit.Core.Services;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using NSubstitute;
-using NSubstitute.ExceptionExtensions;
-using NSubstitute.ReturnsExtensions;
-using Xunit;
-
-namespace Bit.Core.Test.OrganizationFeatures.OrganizationDomains;
-
-[SutProviderCustomize]
-public class CreateOrganizationDomainCommandTests
-{
-    [Theory, BitAutoData]
-    public async Task CreateAsync_ShouldCreateOrganizationDomainAndLogEvent_WhenDetailsAreValid(OrganizationDomain orgDomain, SutProvider<CreateOrganizationDomainCommand> sutProvider)
-    {
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetClaimedDomainsByDomainNameAsync(orgDomain.DomainName)
-            .Returns(new List<OrganizationDomain>());
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetDomainByOrgIdAndDomainNameAsync(orgDomain.OrganizationId, orgDomain.DomainName)
-            .ReturnsNull();
-        sutProvider.GetDependency<IDnsResolverService>()
-            .ResolveAsync(orgDomain.DomainName, orgDomain.Txt)
-            .Returns(false);
-        orgDomain.SetNextRunDate(12);
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .CreateAsync(orgDomain)
-            .Returns(orgDomain);
-
-
-        var result = await sutProvider.Sut.CreateAsync(orgDomain);
-
-        Assert.Equal(orgDomain.Id, result.Id);
-        Assert.Equal(orgDomain.OrganizationId, result.OrganizationId);
-        Assert.NotNull(result.LastCheckedDate);
-        Assert.Equal(orgDomain.NextRunDate, result.NextRunDate);
-        await sutProvider.GetDependency<IEventService>().Received(1)
-            .LogOrganizationDomainEventAsync(Arg.Any<OrganizationDomain>(), EventType.OrganizationDomain_Added);
-        await sutProvider.GetDependency<IEventService>().Received(1)
-            .LogOrganizationDomainEventAsync(Arg.Any<OrganizationDomain>(), Arg.Is<EventType>(x => x == EventType.OrganizationDomain_NotVerified));
-    }
-
-    [Theory, BitAutoData]
-    public async Task CreateAsync_ShouldThrowConflictException_WhenDomainIsClaimed(OrganizationDomain orgDomain,
-        SutProvider<CreateOrganizationDomainCommand> sutProvider)
-    {
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetClaimedDomainsByDomainNameAsync(orgDomain.DomainName)
-            .Returns(new List<OrganizationDomain>()
-            {
-                orgDomain
-            });
-
-        var requestAction = async () => await sutProvider.Sut.CreateAsync(orgDomain);
-
-        var exception = await Assert.ThrowsAsync<ConflictException>(requestAction);
-        Assert.Contains("The domain is not available to be claimed.", exception.Message);
-    }
-
-    [Theory, BitAutoData]
-    public async Task CreateAsync_ShouldThrowConflictException_WhenEntryIsDuplicatedForOrganization(OrganizationDomain orgDomain,
-        SutProvider<CreateOrganizationDomainCommand> sutProvider)
-    {
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetClaimedDomainsByDomainNameAsync(orgDomain.DomainName)
-            .Returns(new List<OrganizationDomain>());
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetDomainByOrgIdAndDomainNameAsync(orgDomain.OrganizationId, orgDomain.DomainName)
-            .Returns(orgDomain);
-
-        var requestAction = async () => await sutProvider.Sut.CreateAsync(orgDomain);
-
-        var exception = await Assert.ThrowsAsync<ConflictException>(requestAction);
-        Assert.Contains("A domain already exists for this organization.", exception.Message);
-    }
-
-    [Theory, BitAutoData]
-    public async Task CreateAsync_ShouldNotSetVerifiedDate_WhenDomainCannotBeResolved(OrganizationDomain orgDomain,
-        SutProvider<CreateOrganizationDomainCommand> sutProvider)
-    {
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetClaimedDomainsByDomainNameAsync(orgDomain.DomainName)
-            .Returns(new List<OrganizationDomain>());
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetDomainByOrgIdAndDomainNameAsync(orgDomain.OrganizationId, orgDomain.DomainName)
-            .ReturnsNull();
-        sutProvider.GetDependency<IDnsResolverService>()
-            .ResolveAsync(orgDomain.DomainName, orgDomain.Txt)
-            .Throws(new DnsQueryException(""));
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .CreateAsync(orgDomain)
-            .Returns(orgDomain);
-
-        await sutProvider.Sut.CreateAsync(orgDomain);
-
-        Assert.Null(orgDomain.VerifiedDate);
-    }
-
-    [Theory, BitAutoData]
-    public async Task CreateAsync_ShouldSetVerifiedDateAndLogEvent_WhenDomainIsResolved(OrganizationDomain orgDomain,
-        SutProvider<CreateOrganizationDomainCommand> sutProvider)
-    {
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetClaimedDomainsByDomainNameAsync(orgDomain.DomainName)
-            .Returns(new List<OrganizationDomain>());
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetDomainByOrgIdAndDomainNameAsync(orgDomain.OrganizationId, orgDomain.DomainName)
-            .ReturnsNull();
-        sutProvider.GetDependency<IDnsResolverService>()
-            .ResolveAsync(orgDomain.DomainName, orgDomain.Txt)
-            .Returns(true);
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .CreateAsync(orgDomain)
-            .Returns(orgDomain);
-
-        var result = await sutProvider.Sut.CreateAsync(orgDomain);
-
-        Assert.NotNull(result.VerifiedDate);
-        await sutProvider.GetDependency<IEventService>().Received(1)
-            .LogOrganizationDomainEventAsync(Arg.Any<OrganizationDomain>(), EventType.OrganizationDomain_Added);
-        await sutProvider.GetDependency<IEventService>().Received(1)
-            .LogOrganizationDomainEventAsync(Arg.Any<OrganizationDomain>(), Arg.Is<EventType>(x => x == EventType.OrganizationDomain_Verified));
-    }
-}
--- a/test/Core.Test/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommandTests.cs
@ -1,33 +0,0 @@
-using Bit.Core.Entities;
-using Bit.Core.Enums;
-using Bit.Core.OrganizationFeatures.OrganizationDomains;
-using Bit.Core.Repositories;
-using Bit.Core.Services;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using NSubstitute;
-using Xunit;
-
-namespace Bit.Core.Test.OrganizationFeatures.OrganizationDomains;
-
-[SutProviderCustomize]
-public class DeleteOrganizationDomainCommandTests
-{
-    [Theory, BitAutoData]
-    public async Task DeleteAsync_Success(Guid id, SutProvider<DeleteOrganizationDomainCommand> sutProvider)
-    {
-        var expected = new OrganizationDomain
-        {
-            Id = id,
-            OrganizationId = Guid.NewGuid(),
-            DomainName = "Test Domain",
-            Txt = "btw+test18383838383"
-        };
-
-        await sutProvider.Sut.DeleteAsync(expected);
-
-        await sutProvider.GetDependency<IOrganizationDomainRepository>().Received(1).DeleteAsync(expected);
-        await sutProvider.GetDependency<IEventService>().Received(1)
-            .LogOrganizationDomainEventAsync(Arg.Any<OrganizationDomain>(), EventType.OrganizationDomain_Removed);
-    }
-}
--- a/test/Core.Test/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQueryTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQueryTests.cs
@ -1,80 +0,0 @@
-using Bit.Core.Entities;
-using Bit.Core.OrganizationFeatures.OrganizationDomains;
-using Bit.Core.Repositories;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using NSubstitute;
-using Xunit;
-
-namespace Bit.Core.Test.OrganizationFeatures.OrganizationDomains;
-
-[SutProviderCustomize]
-public class GetOrganizationDomainByIdOrganizationIdQueryTests
-{
-    [Theory, BitAutoData]
-    public async Task GetOrganizationDomainByIdAndOrganizationIdAsync_WithExistingParameters_ReturnsExpectedEntity(
-        OrganizationDomain organizationDomain, SutProvider<GetOrganizationDomainByIdOrganizationIdQuery> sutProvider)
-    {
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetDomainByIdOrganizationIdAsync(organizationDomain.Id, organizationDomain.OrganizationId)
-            .Returns(organizationDomain);
-
-        var result = await sutProvider.Sut.GetOrganizationDomainByIdOrganizationIdAsync(organizationDomain.Id, organizationDomain.OrganizationId);
-
-        await sutProvider.GetDependency<IOrganizationDomainRepository>().Received(1)
-            .GetDomainByIdOrganizationIdAsync(organizationDomain.Id, organizationDomain.OrganizationId);
-
-        Assert.Equal(organizationDomain, result);
-    }
-
-    [Theory, BitAutoData]
-    public async Task GetOrganizationDomainByIdAndOrganizationIdAsync_WithNonExistingParameters_ReturnsNull(
-        Guid id, Guid organizationId, OrganizationDomain organizationDomain,
-        SutProvider<GetOrganizationDomainByIdOrganizationIdQuery> sutProvider)
-    {
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetDomainByIdOrganizationIdAsync(organizationDomain.Id, organizationDomain.OrganizationId)
-            .Returns(organizationDomain);
-
-        var result = await sutProvider.Sut.GetOrganizationDomainByIdOrganizationIdAsync(id, organizationId);
-
-        await sutProvider.GetDependency<IOrganizationDomainRepository>().Received(1)
-            .GetDomainByIdOrganizationIdAsync(id, organizationId);
-
-        Assert.Null(result);
-    }
-
-    [Theory, BitAutoData]
-    public async Task GetOrganizationDomainByIdAndOrganizationIdAsync_WithNonExistingId_ReturnsNull(
-        Guid id, OrganizationDomain organizationDomain,
-        SutProvider<GetOrganizationDomainByIdOrganizationIdQuery> sutProvider)
-    {
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetDomainByIdOrganizationIdAsync(organizationDomain.Id, organizationDomain.OrganizationId)
-            .Returns(organizationDomain);
-
-        var result = await sutProvider.Sut.GetOrganizationDomainByIdOrganizationIdAsync(id, organizationDomain.OrganizationId);
-
-        await sutProvider.GetDependency<IOrganizationDomainRepository>().Received(1)
-            .GetDomainByIdOrganizationIdAsync(id, organizationDomain.OrganizationId);
-
-        Assert.Null(result);
-    }
-
-    [Theory, BitAutoData]
-    public async Task GetOrganizationDomainByIdAndOrganizationIdAsync_WithNonExistingOrgId_ReturnsNull(
-        Guid organizationId, OrganizationDomain organizationDomain,
-        SutProvider<GetOrganizationDomainByIdOrganizationIdQuery> sutProvider)
-    {
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetDomainByIdOrganizationIdAsync(organizationDomain.Id, organizationDomain.OrganizationId)
-            .Returns(organizationDomain);
-
-        var result = await sutProvider.Sut.GetOrganizationDomainByIdOrganizationIdAsync(organizationDomain.Id, organizationId);
-
-        await sutProvider.GetDependency<IOrganizationDomainRepository>().Received(1)
-            .GetDomainByIdOrganizationIdAsync(organizationDomain.Id, organizationId);
-
-        Assert.Null(result);
-    }
-}
--- a/test/Core.Test/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQueryTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQueryTests.cs
@ -1,22 +0,0 @@
-using Bit.Core.OrganizationFeatures.OrganizationDomains;
-using Bit.Core.Repositories;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using NSubstitute;
-using Xunit;
-
-namespace Bit.Core.Test.OrganizationFeatures.OrganizationDomains;
-
-[SutProviderCustomize]
-public class GetOrganizationDomainByOrganizationIdQueryTests
-{
-    [Theory, BitAutoData]
-    public async Task GetDomainsByOrganizationId_CallsGetDomainsByOrganizationIdAsync(Guid orgId,
-        SutProvider<GetOrganizationDomainByOrganizationIdQuery> sutProvider)
-    {
-        await sutProvider.Sut.GetDomainsByOrganizationIdAsync(orgId);
-
-        await sutProvider.GetDependency<IOrganizationDomainRepository>().Received(1)
-            .GetDomainsByOrganizationIdAsync(orgId);
-    }
-}
--- a/test/Core.Test/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommandTests.cs
@ -1,120 +0,0 @@
-using Bit.Core.Entities;
-using Bit.Core.Enums;
-using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.OrganizationDomains;
-using Bit.Core.Repositories;
-using Bit.Core.Services;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using NSubstitute;
-using Xunit;
-
-namespace Bit.Core.Test.OrganizationFeatures.OrganizationDomains;
-
-[SutProviderCustomize]
-public class VerifyOrganizationDomainCommandTests
-{
-    [Theory, BitAutoData]
-    public async Task VerifyOrganizationDomain_ShouldThrowConflict_WhenDomainHasBeenClaimed(Guid id,
-        SutProvider<VerifyOrganizationDomainCommand> sutProvider)
-    {
-        var expected = new OrganizationDomain
-        {
-            Id = id,
-            OrganizationId = Guid.NewGuid(),
-            DomainName = "Test Domain",
-            Txt = "btw+test18383838383"
-        };
-        expected.SetVerifiedDate();
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetByIdAsync(id)
-            .Returns(expected);
-
-        var requestAction = async () => await sutProvider.Sut.VerifyOrganizationDomainAsync(expected);
-
-        var exception = await Assert.ThrowsAsync<ConflictException>(requestAction);
-        Assert.Contains("Domain has already been verified.", exception.Message);
-    }
-
-    [Theory, BitAutoData]
-    public async Task VerifyOrganizationDomain_ShouldThrowConflict_WhenDomainHasBeenClaimedByAnotherOrganization(Guid id,
-        SutProvider<VerifyOrganizationDomainCommand> sutProvider)
-    {
-        var expected = new OrganizationDomain
-        {
-            Id = id,
-            OrganizationId = Guid.NewGuid(),
-            DomainName = "Test Domain",
-            Txt = "btw+test18383838383"
-        };
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetByIdAsync(id)
-            .Returns(expected);
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetClaimedDomainsByDomainNameAsync(expected.DomainName)
-            .Returns(new List<OrganizationDomain> { expected });
-
-        var requestAction = async () => await sutProvider.Sut.VerifyOrganizationDomainAsync(expected);
-
-        var exception = await Assert.ThrowsAsync<ConflictException>(requestAction);
-        Assert.Contains("The domain is not available to be claimed.", exception.Message);
-    }
-
-    [Theory, BitAutoData]
-    public async Task VerifyOrganizationDomain_ShouldVerifyDomainUpdateAndLogEvent_WhenTxtRecordExists(Guid id,
-        SutProvider<VerifyOrganizationDomainCommand> sutProvider)
-    {
-        var expected = new OrganizationDomain
-        {
-            Id = id,
-            OrganizationId = Guid.NewGuid(),
-            DomainName = "Test Domain",
-            Txt = "btw+test18383838383"
-        };
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetByIdAsync(id)
-            .Returns(expected);
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetClaimedDomainsByDomainNameAsync(expected.DomainName)
-            .Returns(new List<OrganizationDomain>());
-        sutProvider.GetDependency<IDnsResolverService>()
-            .ResolveAsync(expected.DomainName, Arg.Any<string>())
-            .Returns(true);
-
-        var result = await sutProvider.Sut.VerifyOrganizationDomainAsync(expected);
-
-        Assert.NotNull(result.VerifiedDate);
-        await sutProvider.GetDependency<IOrganizationDomainRepository>().Received(1)
-            .ReplaceAsync(Arg.Any<OrganizationDomain>());
-        await sutProvider.GetDependency<IEventService>().Received(1)
-            .LogOrganizationDomainEventAsync(Arg.Any<OrganizationDomain>(), EventType.OrganizationDomain_Verified);
-    }
-
-    [Theory, BitAutoData]
-    public async Task VerifyOrganizationDomain_ShouldNotSetVerifiedDate_WhenTxtRecordDoesNotExist(Guid id,
-        SutProvider<VerifyOrganizationDomainCommand> sutProvider)
-    {
-        var expected = new OrganizationDomain
-        {
-            Id = id,
-            OrganizationId = Guid.NewGuid(),
-            DomainName = "Test Domain",
-            Txt = "btw+test18383838383"
-        };
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetByIdAsync(id)
-            .Returns(expected);
-        sutProvider.GetDependency<IOrganizationDomainRepository>()
-            .GetClaimedDomainsByDomainNameAsync(expected.DomainName)
-            .Returns(new List<OrganizationDomain>());
-        sutProvider.GetDependency<IDnsResolverService>()
-            .ResolveAsync(expected.DomainName, Arg.Any<string>())
-            .Returns(false);
-
-        var result = await sutProvider.Sut.VerifyOrganizationDomainAsync(expected);
-
-        Assert.Null(result.VerifiedDate);
-        await sutProvider.GetDependency<IEventService>().Received(1)
-            .LogOrganizationDomainEventAsync(Arg.Any<OrganizationDomain>(), EventType.OrganizationDomain_NotVerified);
-    }
-}
--- a/test/Core.Test/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQueryTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQueryTests.cs
@ -1,110 +0,0 @@
-using Bit.Core.Entities;
-using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.OrganizationUsers;
-using Bit.Core.Repositories;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using NSubstitute;
-using Xunit;
-
-namespace Bit.Core.Test.OrganizationFeatures.OrganizationUsers;
-
-[SutProviderCustomize]
-public class CountNewSmSeatsRequiredQueryTests
-{
-    [Theory]
-    [BitAutoData(2, 5, 2, 0)]
-    [BitAutoData(0, 5, 2, 0)]
-    [BitAutoData(6, 5, 2, 3)]
-    [BitAutoData(2, 5, 10, 7)]
-    public async Task CountNewSmSeatsRequiredAsync_ReturnsCorrectCount(
-        int usersToAdd,
-        int organizationSmSeats,
-        int currentOccupiedSmSeats,
-        int expectedNewSmSeatsRequired,
-        Organization organization,
-        SutProvider<CountNewSmSeatsRequiredQuery> sutProvider)
-    {
-        organization.UseSecretsManager = true;
-        organization.SmSeats = organizationSmSeats;
-
-        sutProvider.GetDependency<IOrganizationRepository>()
-            .GetByIdAsync(organization.Id)
-            .Returns(organization);
-
-        sutProvider.GetDependency<IOrganizationUserRepository>()
-            .GetOccupiedSmSeatCountByOrganizationIdAsync(organization.Id)
-            .Returns(currentOccupiedSmSeats);
-
-        var result = await sutProvider.Sut.CountNewSmSeatsRequiredAsync(organization.Id, usersToAdd);
-
-        Assert.Equal(expectedNewSmSeatsRequired, result);
-    }
-
-    [Theory]
-    [BitAutoData(0)]
-    [BitAutoData(5)]
-    public async Task CountNewSmSeatsRequiredAsync_WithNullSmSeats_ReturnsZero(
-        int usersToAdd,
-        Organization organization,
-        SutProvider<CountNewSmSeatsRequiredQuery> sutProvider)
-    {
-        const int expected = 0;
-
-        organization.UseSecretsManager = true;
-        organization.SmSeats = null;
-
-        sutProvider.GetDependency<IOrganizationRepository>()
-            .GetByIdAsync(organization.Id)
-            .Returns(organization);
-
-        var result = await sutProvider.Sut.CountNewSmSeatsRequiredAsync(organization.Id, usersToAdd);
-
-        Assert.Equal(expected, result);
-    }
-
-    [Theory, BitAutoData]
-    public async Task CountNewSmSeatsRequiredAsync_WithNonExistentOrganizationId_ThrowsNotFound(
-        Guid organizationId, int usersToAdd,
-        SutProvider<CountNewSmSeatsRequiredQuery> sutProvider)
-    {
-        await Assert.ThrowsAsync<NotFoundException>(async () => await sutProvider.Sut.CountNewSmSeatsRequiredAsync(organizationId, usersToAdd));
-    }
-
-    [Theory, BitAutoData]
-    public async Task CountNewSmSeatsRequiredAsync_WithOrganizationUseSecretsManagerFalse_ThrowsNotFound(
-        Organization organization, int usersToAdd,
-        SutProvider<CountNewSmSeatsRequiredQuery> sutProvider)
-    {
-        organization.UseSecretsManager = false;
-
-        sutProvider.GetDependency<IOrganizationRepository>()
-            .GetByIdAsync(organization.Id)
-            .Returns(organization);
-
-        var exception = await Assert.ThrowsAsync<BadRequestException>(async () =>
-            await sutProvider.Sut.CountNewSmSeatsRequiredAsync(organization.Id, usersToAdd));
-        Assert.Contains("Organization does not use Secrets Manager", exception.Message);
-    }
-
-    [Theory, BitAutoData]
-    public async Task CountNewSmSeatsRequiredAsync_WithSecretsManagerBeta_ReturnsZero(
-        int usersToAdd,
-        Organization organization,
-        SutProvider<CountNewSmSeatsRequiredQuery> sutProvider)
-    {
-        organization.UseSecretsManager = true;
-        organization.SecretsManagerBeta = true;
-
-        sutProvider.GetDependency<IOrganizationRepository>()
-            .GetByIdAsync(organization.Id)
-            .Returns(organization);
-
-        var result = await sutProvider.Sut.CountNewSmSeatsRequiredAsync(organization.Id, usersToAdd);
-
-        Assert.Equal(0, result);
-
-        await sutProvider.GetDependency<IOrganizationUserRepository>().DidNotReceiveWithAnyArgs()
-            .GetOccupiedSmSeatCountByOrganizationIdAsync(default);
-    }
-}
--- a/test/Core.Test/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommandTests.cs
@ -1,72 +0,0 @@
-using Bit.Core.Entities;
-using Bit.Core.Enums;
-using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.OrganizationUsers;
-using Bit.Core.Repositories;
-using Bit.Core.Services;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using NSubstitute;
-using Xunit;
-
-namespace Bit.Core.Test.OrganizationFeatures.OrganizationUsers;
-
-[SutProviderCustomize]
-public class DeleteOrganizationUserCommandTests
-{
-    [Theory]
-    [BitAutoData]
-    public async Task DeleteUser_Success(SutProvider<DeleteOrganizationUserCommand> sutProvider, Guid organizationId, Guid organizationUserId)
-    {
-        sutProvider.GetDependency<IOrganizationUserRepository>()
-            .GetByIdAsync(organizationUserId)
-            .Returns(new OrganizationUser
-            {
-                Id = organizationUserId,
-                OrganizationId = organizationId
-            });
-
-        await sutProvider.Sut.DeleteUserAsync(organizationId, organizationUserId, null);
-
-        await sutProvider.GetDependency<IOrganizationService>().Received(1).DeleteUserAsync(organizationId, organizationUserId, null);
-    }
-
-    [Theory]
-    [BitAutoData]
-    public async Task DeleteUser_NotFound_Throws(SutProvider<DeleteOrganizationUserCommand> sutProvider, Guid organizationId, Guid organizationUserId)
-    {
-        await Assert.ThrowsAsync<NotFoundException>(async () => await sutProvider.Sut.DeleteUserAsync(organizationId, organizationUserId, null));
-    }
-
-    [Theory]
-    [BitAutoData]
-    public async Task DeleteUser_MismatchingOrganizationId_Throws(SutProvider<DeleteOrganizationUserCommand> sutProvider, Guid organizationId, Guid organizationUserId)
-    {
-        sutProvider.GetDependency<IOrganizationUserRepository>()
-            .GetByIdAsync(organizationUserId)
-            .Returns(new OrganizationUser
-            {
-                Id = organizationUserId,
-                OrganizationId = Guid.NewGuid()
-            });
-
-        await Assert.ThrowsAsync<NotFoundException>(async () => await sutProvider.Sut.DeleteUserAsync(organizationId, organizationUserId, null));
-    }
-
-    [Theory]
-    [BitAutoData]
-    public async Task DeleteUser_WithEventSystemUser_Success(SutProvider<DeleteOrganizationUserCommand> sutProvider, Guid organizationId, Guid organizationUserId, EventSystemUser eventSystemUser)
-    {
-        sutProvider.GetDependency<IOrganizationUserRepository>()
-            .GetByIdAsync(organizationUserId)
-            .Returns(new OrganizationUser
-            {
-                Id = organizationUserId,
-                OrganizationId = organizationId
-            });
-
-        await sutProvider.Sut.DeleteUserAsync(organizationId, organizationUserId, eventSystemUser);
-
-        await sutProvider.GetDependency<IOrganizationService>().Received(1).DeleteUserAsync(organizationId, organizationUserId, eventSystemUser);
-    }
-}
--- a/test/Core.Test/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommandTests.cs
+++ b/test/Core.Test/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommandTests.cs
@ -1,50 +0,0 @@
-using Bit.Core.Entities;
-using Bit.Core.Enums;
-using Bit.Core.OrganizationFeatures.OrganizationUsers;
-using Bit.Core.Repositories;
-using Bit.Core.Services;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using NSubstitute;
-using Xunit;
-
-namespace Bit.Core.Test.OrganizationFeatures.OrganizationUsers;
-
-[SutProviderCustomize]
-public class UpdateOrganizationUserGroupsCommandTests
-{
-    [Theory, BitAutoData]
-    public async Task UpdateUserGroups_Passes(
-        OrganizationUser organizationUser,
-        IEnumerable<Guid> groupIds,
-        SutProvider<UpdateOrganizationUserGroupsCommand> sutProvider)
-    {
-        await sutProvider.Sut.UpdateUserGroupsAsync(organizationUser, groupIds, null);
-
-        await sutProvider.GetDependency<IOrganizationService>().DidNotReceiveWithAnyArgs()
-            .ValidateOrganizationUserUpdatePermissions(default, default, default, default);
-        await sutProvider.GetDependency<IOrganizationUserRepository>().Received(1)
-            .UpdateGroupsAsync(organizationUser.Id, groupIds);
-        await sutProvider.GetDependency<IEventService>().Received(1)
-            .LogOrganizationUserEventAsync(organizationUser, EventType.OrganizationUser_UpdatedGroups);
-    }
-
-    [Theory, BitAutoData]
-    public async Task UpdateUserGroups_WithSavingUserId_Passes(
-        OrganizationUser organizationUser,
-        IEnumerable<Guid> groupIds,
-        Guid savingUserId,
-        SutProvider<UpdateOrganizationUserGroupsCommand> sutProvider)
-    {
-        organizationUser.Permissions = null;
-
-        await sutProvider.Sut.UpdateUserGroupsAsync(organizationUser, groupIds, savingUserId);
-
-        await sutProvider.GetDependency<IOrganizationService>().Received(1)
-            .ValidateOrganizationUserUpdatePermissions(organizationUser.OrganizationId, organizationUser.Type, null, organizationUser.GetPermissions());
-        await sutProvider.GetDependency<IOrganizationUserRepository>().Received(1)
-            .UpdateGroupsAsync(organizationUser.Id, groupIds);
-        await sutProvider.GetDependency<IEventService>().Received(1)
-            .LogOrganizationUserEventAsync(organizationUser, EventType.OrganizationUser_UpdatedGroups);
-    }
-}