Merge remote-tracking branch 'origin/master' into feature/flexible-collections

2025-12-25 12:43:14 +00:00 · 2023-10-23 08:47:11 +10:00
parent 52e723c57a 728cd1c0b5
commit cd376bee7f
196 changed files with 1219 additions and 817 deletions
--- a/test/Api.Test/AdminConsole/Controllers/GroupsControllerTests.cs
+++ b/test/Api.Test/AdminConsole/Controllers/GroupsControllerTests.cs
@@ -1,16 +1,18 @@
-using Bit.Api.Controllers;
-using Bit.Api.Models.Request;
+using Bit.Api.AdminConsole.Controllers;
+using Bit.Api.AdminConsole.Models.Request;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
 using NSubstitute;
 using Xunit;

-namespace Bit.Api.Test.Controllers;
+namespace Bit.Api.Test.AdminConsole.Controllers;

 [ControllerCustomize(typeof(GroupsController))]
 [SutProviderCustomize]
--- a/test/Api.Test/AdminConsole/Controllers/OrganizationSponsorshipsControllerTests.cs
+++ b/test/Api.Test/AdminConsole/Controllers/OrganizationSponsorshipsControllerTests.cs
@@ -13,7 +13,7 @@ using Bit.Test.Common.AutoFixture.Attributes;
 using NSubstitute;
 using Xunit;

-namespace Bit.Api.Test.Controllers;
+namespace Bit.Api.Test.AdminConsole.Controllers;

 [ControllerCustomize(typeof(OrganizationSponsorshipsController))]
 [SutProviderCustomize]
--- a/test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs
+++ b/test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs
@@ -1,5 +1,5 @@
-using Bit.Api.Controllers;
-using Bit.Api.Models.Request.Organizations;
+using Bit.Api.AdminConsole.Controllers;
+using Bit.Api.AdminConsole.Models.Request.Organizations;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.Repositories;
@@ -10,7 +10,7 @@ using Bit.Test.Common.AutoFixture.Attributes;
 using NSubstitute;
 using Xunit;

-namespace Bit.Api.Test.Controllers;
+namespace Bit.Api.Test.AdminConsole.Controllers;

 [ControllerCustomize(typeof(OrganizationUsersController))]
 [SutProviderCustomize]
--- a/test/Api.Test/AdminConsole/Controllers/OrganizationsControllerTests.cs
+++ b/test/Api.Test/AdminConsole/Controllers/OrganizationsControllerTests.cs
@@ -1,6 +1,6 @@
 using System.Security.Claims;
 using AutoFixture.Xunit2;
-using Bit.Api.Controllers;
+using Bit.Api.AdminConsole.Controllers;
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Data;
@@ -18,7 +18,7 @@ using Bit.Core.Settings;
 using NSubstitute;
 using Xunit;

-namespace Bit.Api.Test.Controllers;
+namespace Bit.Api.Test.AdminConsole.Controllers;

 public class OrganizationsControllerTests : IDisposable
 {
--- a/test/Api.Test/AdminConsole/Public/Controllers/GroupsControllerTests.cs
+++ b/test/Api.Test/AdminConsole/Public/Controllers/GroupsControllerTests.cs
@@ -1,10 +1,12 @@
-using Bit.Api.Models.Public.Request;
-using Bit.Api.Models.Public.Response;
-using Bit.Api.Public.Controllers;
+using Bit.Api.AdminConsole.Public.Controllers;
+using Bit.Api.AdminConsole.Public.Models.Request;
+using Bit.Api.AdminConsole.Public.Models.Response;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
-using Bit.Core.OrganizationFeatures.Groups.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
@@ -12,7 +14,7 @@ using Microsoft.AspNetCore.Mvc;
 using NSubstitute;
 using Xunit;

-namespace Bit.Api.Test.Public.Controllers;
+namespace Bit.Api.Test.AdminConsole.Public.Controllers;

 [ControllerCustomize(typeof(GroupsController))]
 [SutProviderCustomize]
--- a/test/Api.Test/Controllers/OrganizationConnectionsControllerTests.cs
+++ b/test/Api.Test/Controllers/OrganizationConnectionsControllerTests.cs
@@ -143,10 +143,10 @@ public class OrganizationConnectionsControllerTests
    public async Task UpdateConnection_RequiresOwnerPermissions(SutProvider<OrganizationConnectionsController> sutProvider)
    {
        sutProvider.GetDependency<IOrganizationConnectionRepository>()
-            .GetByIdAsync(Arg.Any<Guid>())
+            .GetByIdOrganizationIdAsync(Arg.Any<Guid>(), Arg.Any<Guid>())
            .Returns(new OrganizationConnection());

-        var exception = await Assert.ThrowsAsync<BadRequestException>(() => sutProvider.Sut.UpdateConnection(default, null));
+        var exception = await Assert.ThrowsAsync<BadRequestException>(() => sutProvider.Sut.UpdateConnection(default, new OrganizationConnectionRequestModel()));

        Assert.Contains("You do not have permission to update this connection.", exception.Message);
    }
@@ -164,8 +164,8 @@ public class OrganizationConnectionsControllerTests
        sutProvider.GetDependency<ICurrentContext>().OrganizationOwner(typedModel.OrganizationId).Returns(true);

        var orgConnectionRepository = sutProvider.GetDependency<IOrganizationConnectionRepository>();
-        orgConnectionRepository.GetByIdAsync(existing1.Id).Returns(existing1);
-        orgConnectionRepository.GetByIdAsync(existing2.Id).Returns(existing2);
+        orgConnectionRepository.GetByIdOrganizationIdAsync(existing1.Id, existing1.OrganizationId).Returns(existing1);
+        orgConnectionRepository.GetByIdOrganizationIdAsync(existing2.Id, existing2.OrganizationId).Returns(existing2);
        orgConnectionRepository.GetByOrganizationIdTypeAsync(typedModel.OrganizationId, type).Returns(new[] { existing1, existing2 });

        var exception = await Assert.ThrowsAsync<BadRequestException>(() => sutProvider.Sut.UpdateConnection(existing1.Id, typedModel));
@@ -186,7 +186,7 @@ public class OrganizationConnectionsControllerTests
        sutProvider.GetDependency<ICurrentContext>().OrganizationOwner(typedModel.OrganizationId).Returns(true);

        sutProvider.GetDependency<IOrganizationConnectionRepository>()
-            .GetByIdAsync(existing1.Id)
+            .GetByIdOrganizationIdAsync(existing1.Id, existing1.OrganizationId)
            .Returns(existing1);

        sutProvider.GetDependency<ICurrentContext>().ManageScim(typedModel.OrganizationId).Returns(true);
@@ -212,6 +212,7 @@ public class OrganizationConnectionsControllerTests
        });
        updated.Config = JsonSerializer.Serialize(config);
        updated.Id = existing.Id;
+        updated.OrganizationId = existing.OrganizationId;
        updated.Type = OrganizationConnectionType.CloudBillingSync;
        var model = RequestModelFromEntity<BillingSyncConfig>(updated);

@@ -224,7 +225,7 @@ public class OrganizationConnectionsControllerTests
            .UpdateAsync<BillingSyncConfig>(default)
            .ReturnsForAnyArgs(updated);
        sutProvider.GetDependency<IOrganizationConnectionRepository>()
-            .GetByIdAsync(existing.Id)
+            .GetByIdOrganizationIdAsync(existing.Id, existing.OrganizationId)
            .Returns(existing);

        OrganizationLicense organizationLicense = new OrganizationLicense();
@@ -264,6 +265,7 @@ public class OrganizationConnectionsControllerTests
        });
        updated.Config = JsonSerializer.Serialize(config);
        updated.Id = existing.Id;
+        updated.OrganizationId = existing.OrganizationId;
        updated.Type = OrganizationConnectionType.CloudBillingSync;
        var model = RequestModelFromEntity<BillingSyncConfig>(updated);
        sutProvider.GetDependency<IGlobalSettings>().SelfHosted.Returns(true);
@@ -275,7 +277,7 @@ public class OrganizationConnectionsControllerTests
            .UpdateAsync<BillingSyncConfig>(default)
            .ReturnsForAnyArgs(updated);
        sutProvider.GetDependency<IOrganizationConnectionRepository>()
-            .GetByIdAsync(existing.Id)
+            .GetByIdOrganizationIdAsync(existing.Id, existing.OrganizationId)
            .Returns(existing);

        OrganizationLicense organizationLicense = new OrganizationLicense();
--- a/test/Api.Test/Controllers/OrganizationDomainControllerTests.cs
+++ b/test/Api.Test/Controllers/OrganizationDomainControllerTests.cs
@@ -4,6 +4,7 @@ using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;
 using Bit.Api.Models.Response.Organizations;
 using Bit.Core.Context;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data.Organizations;
 using Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces;
@@ -13,8 +14,6 @@ using Bit.Test.Common.AutoFixture.Attributes;
 using NSubstitute;
 using NSubstitute.ReturnsExtensions;
 using Xunit;
-using Organization = Bit.Core.Entities.Organization;
-using OrganizationDomain = Bit.Core.Entities.OrganizationDomain;

 namespace Bit.Api.Test.Controllers;

@@ -28,7 +27,7 @@ public class OrganizationDomainControllerTests
    {
        sutProvider.GetDependency<ICurrentContext>().ManageSso(orgId).Returns(false);

-        var requestAction = async () => await sutProvider.Sut.Get(orgId.ToString());
+        var requestAction = async () => await sutProvider.Sut.Get(orgId);

        await Assert.ThrowsAsync<UnauthorizedAccessException>(requestAction);
    }
@@ -40,7 +39,7 @@ public class OrganizationDomainControllerTests
        sutProvider.GetDependency<ICurrentContext>().ManageSso(orgId).Returns(true);
        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(orgId).ReturnsNull();

-        var requestAction = async () => await sutProvider.Sut.Get(orgId.ToString());
+        var requestAction = async () => await sutProvider.Sut.Get(orgId);

        await Assert.ThrowsAsync<NotFoundException>(requestAction);
    }
@@ -52,7 +51,7 @@ public class OrganizationDomainControllerTests
        sutProvider.GetDependency<ICurrentContext>().ManageSso(orgId).Returns(true);
        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(orgId).Returns(new Organization());
        sutProvider.GetDependency<IGetOrganizationDomainByOrganizationIdQuery>()
-            .GetDomainsByOrganizationId(orgId).Returns(new List<OrganizationDomain>
+            .GetDomainsByOrganizationIdAsync(orgId).Returns(new List<OrganizationDomain>
            {
                new()
                {
@@ -64,7 +63,7 @@ public class OrganizationDomainControllerTests
                }
            });

-        var result = await sutProvider.Sut.Get(orgId.ToString());
+        var result = await sutProvider.Sut.Get(orgId);

        Assert.IsType<ListResponseModel<OrganizationDomainResponseModel>>(result);
        Assert.Equal(orgId, result.Data.Select(x => x.OrganizationId).FirstOrDefault());
@@ -76,7 +75,7 @@ public class OrganizationDomainControllerTests
    {
        sutProvider.GetDependency<ICurrentContext>().ManageSso(orgId).Returns(false);

-        var requestAction = async () => await sutProvider.Sut.Get(orgId.ToString(), id.ToString());
+        var requestAction = async () => await sutProvider.Sut.Get(orgId, id);

        await Assert.ThrowsAsync<UnauthorizedAccessException>(requestAction);
    }
@@ -88,7 +87,7 @@ public class OrganizationDomainControllerTests
        sutProvider.GetDependency<ICurrentContext>().ManageSso(orgId).Returns(true);
        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(orgId).ReturnsNull();

-        var requestAction = async () => await sutProvider.Sut.Get(orgId.ToString(), id.ToString());
+        var requestAction = async () => await sutProvider.Sut.Get(orgId, id);

        await Assert.ThrowsAsync<NotFoundException>(requestAction);
    }
@@ -99,9 +98,24 @@ public class OrganizationDomainControllerTests
    {
        sutProvider.GetDependency<ICurrentContext>().ManageSso(orgId).Returns(true);
        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(orgId).Returns(new Organization());
-        sutProvider.GetDependency<IGetOrganizationDomainByIdQuery>().GetOrganizationDomainById(id).ReturnsNull();
+        sutProvider.GetDependency<IGetOrganizationDomainByIdOrganizationIdQuery>().GetOrganizationDomainByIdOrganizationIdAsync(id, orgId).ReturnsNull();

-        var requestAction = async () => await sutProvider.Sut.Get(orgId.ToString(), id.ToString());
+        var requestAction = async () => await sutProvider.Sut.Get(orgId, id);
+
+        await Assert.ThrowsAsync<NotFoundException>(requestAction);
+    }
+
+    [Theory, BitAutoData]
+    public async Task GetByOrgIdAndId_ShouldThrowNotFound_WhenOrgIdDoesNotMatch(OrganizationDomain organizationDomain,
+        SutProvider<OrganizationDomainController> sutProvider)
+    {
+        sutProvider.GetDependency<ICurrentContext>().ManageSso(organizationDomain.OrganizationId).Returns(true);
+        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organizationDomain.OrganizationId).Returns(new Organization());
+        sutProvider.GetDependency<IOrganizationDomainRepository>()
+            .GetDomainByIdOrganizationIdAsync(organizationDomain.Id, organizationDomain.OrganizationId)
+            .ReturnsNull();
+
+        var requestAction = async () => await sutProvider.Sut.Get(organizationDomain.OrganizationId, organizationDomain.Id);

        await Assert.ThrowsAsync<NotFoundException>(requestAction);
    }
@@ -112,7 +126,7 @@ public class OrganizationDomainControllerTests
    {
        sutProvider.GetDependency<ICurrentContext>().ManageSso(orgId).Returns(true);
        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(orgId).Returns(new Organization());
-        sutProvider.GetDependency<IGetOrganizationDomainByIdQuery>().GetOrganizationDomainById(id)
+        sutProvider.GetDependency<IGetOrganizationDomainByIdOrganizationIdQuery>().GetOrganizationDomainByIdOrganizationIdAsync(id, orgId)
            .Returns(new OrganizationDomain
            {
                Id = Guid.NewGuid(),
@@ -122,7 +136,7 @@ public class OrganizationDomainControllerTests
                Txt = "btw+12342"
            });

-        var result = await sutProvider.Sut.Get(orgId.ToString(), id.ToString());
+        var result = await sutProvider.Sut.Get(orgId, id);

        Assert.IsType<OrganizationDomainResponseModel>(result);
        Assert.Equal(orgId, result.OrganizationId);
@@ -134,7 +148,7 @@ public class OrganizationDomainControllerTests
    {
        sutProvider.GetDependency<ICurrentContext>().ManageSso(orgId).Returns(false);

-        var requestAction = async () => await sutProvider.Sut.Post(orgId.ToString(), model);
+        var requestAction = async () => await sutProvider.Sut.Post(orgId, model);

        await Assert.ThrowsAsync<UnauthorizedAccessException>(requestAction);
    }
@@ -146,7 +160,7 @@ public class OrganizationDomainControllerTests
        sutProvider.GetDependency<ICurrentContext>().ManageSso(orgId).Returns(true);
        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(orgId).ReturnsNull();

-        var requestAction = async () => await sutProvider.Sut.Post(orgId.ToString(), model);
+        var requestAction = async () => await sutProvider.Sut.Post(orgId, model);

        await Assert.ThrowsAsync<NotFoundException>(requestAction);
    }
@@ -160,7 +174,7 @@ public class OrganizationDomainControllerTests
        sutProvider.GetDependency<ICreateOrganizationDomainCommand>().CreateAsync(Arg.Any<OrganizationDomain>())
            .Returns(new OrganizationDomain());

-        var result = await sutProvider.Sut.Post(orgId.ToString(), model);
+        var result = await sutProvider.Sut.Post(orgId, model);

        await sutProvider.GetDependency<ICreateOrganizationDomainCommand>().ReceivedWithAnyArgs(1)
            .CreateAsync(Arg.Any<OrganizationDomain>());
@@ -173,7 +187,7 @@ public class OrganizationDomainControllerTests
    {
        sutProvider.GetDependency<ICurrentContext>().ManageSso(orgId).Returns(false);

-        var requestAction = async () => await sutProvider.Sut.Verify(orgId.ToString(), id.ToString());
+        var requestAction = async () => await sutProvider.Sut.Verify(orgId, id);

        await Assert.ThrowsAsync<UnauthorizedAccessException>(requestAction);
    }
@@ -185,24 +199,42 @@ public class OrganizationDomainControllerTests
        sutProvider.GetDependency<ICurrentContext>().ManageSso(orgId).Returns(true);
        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(orgId).ReturnsNull();

-        var requestAction = async () => await sutProvider.Sut.Verify(orgId.ToString(), id.ToString());
+        var requestAction = async () => await sutProvider.Sut.Verify(orgId, id);

        await Assert.ThrowsAsync<NotFoundException>(requestAction);
    }

    [Theory, BitAutoData]
-    public async Task Verify_WhenRequestIsValid(Guid orgId, Guid id,
+    public async Task VerifyOrganizationDomain_ShouldThrowNotFound_WhenOrgIdDoesNotMatch(OrganizationDomain organizationDomain,
        SutProvider<OrganizationDomainController> sutProvider)
    {
-        sutProvider.GetDependency<ICurrentContext>().ManageSso(orgId).Returns(true);
-        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(orgId).Returns(new Organization());
-        sutProvider.GetDependency<IVerifyOrganizationDomainCommand>().VerifyOrganizationDomain(id)
+        sutProvider.GetDependency<ICurrentContext>().ManageSso(organizationDomain.OrganizationId).Returns(true);
+        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organizationDomain.OrganizationId).Returns(new Organization());
+        sutProvider.GetDependency<IOrganizationDomainRepository>()
+            .GetDomainByIdOrganizationIdAsync(organizationDomain.Id, organizationDomain.OrganizationId)
+            .ReturnsNull();
+
+        var requestAction = async () => await sutProvider.Sut.Verify(organizationDomain.OrganizationId, organizationDomain.Id);
+
+        await Assert.ThrowsAsync<NotFoundException>(requestAction);
+    }
+
+    [Theory, BitAutoData]
+    public async Task Verify_WhenRequestIsValid(OrganizationDomain organizationDomain,
+        SutProvider<OrganizationDomainController> sutProvider)
+    {
+        sutProvider.GetDependency<ICurrentContext>().ManageSso(organizationDomain.OrganizationId).Returns(true);
+        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organizationDomain.OrganizationId).Returns(new Organization());
+        sutProvider.GetDependency<IOrganizationDomainRepository>()
+            .GetDomainByIdOrganizationIdAsync(organizationDomain.Id, organizationDomain.OrganizationId)
+            .Returns(organizationDomain);
+        sutProvider.GetDependency<IVerifyOrganizationDomainCommand>().VerifyOrganizationDomainAsync(organizationDomain)
            .Returns(new OrganizationDomain());

-        var result = await sutProvider.Sut.Verify(orgId.ToString(), id.ToString());
+        var result = await sutProvider.Sut.Verify(organizationDomain.OrganizationId, organizationDomain.Id);

        await sutProvider.GetDependency<IVerifyOrganizationDomainCommand>().Received(1)
-            .VerifyOrganizationDomain(id);
+            .VerifyOrganizationDomainAsync(organizationDomain);
        Assert.IsType<OrganizationDomainResponseModel>(result);
    }

@@ -212,7 +244,7 @@ public class OrganizationDomainControllerTests
    {
        sutProvider.GetDependency<ICurrentContext>().ManageSso(orgId).Returns(false);

-        var requestAction = async () => await sutProvider.Sut.RemoveDomain(orgId.ToString(), id.ToString());
+        var requestAction = async () => await sutProvider.Sut.RemoveDomain(orgId, id);

        await Assert.ThrowsAsync<UnauthorizedAccessException>(requestAction);
    }
@@ -224,22 +256,40 @@ public class OrganizationDomainControllerTests
        sutProvider.GetDependency<ICurrentContext>().ManageSso(orgId).Returns(true);
        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(orgId).ReturnsNull();

-        var requestAction = async () => await sutProvider.Sut.RemoveDomain(orgId.ToString(), id.ToString());
+        var requestAction = async () => await sutProvider.Sut.RemoveDomain(orgId, id);

        await Assert.ThrowsAsync<NotFoundException>(requestAction);
    }

    [Theory, BitAutoData]
-    public async Task RemoveDomain_WhenRequestIsValid(Guid orgId, Guid id,
+    public async Task RemoveDomain_ShouldThrowNotFound_WhenOrgIdDoesNotMatch(OrganizationDomain organizationDomain,
        SutProvider<OrganizationDomainController> sutProvider)
    {
-        sutProvider.GetDependency<ICurrentContext>().ManageSso(orgId).Returns(true);
-        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(orgId).Returns(new Organization());
+        sutProvider.GetDependency<ICurrentContext>().ManageSso(organizationDomain.OrganizationId).Returns(true);
+        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organizationDomain.OrganizationId).Returns(new Organization());
+        sutProvider.GetDependency<IOrganizationDomainRepository>()
+            .GetDomainByIdOrganizationIdAsync(organizationDomain.Id, organizationDomain.OrganizationId)
+            .ReturnsNull();

-        await sutProvider.Sut.RemoveDomain(orgId.ToString(), id.ToString());
+        var requestAction = async () => await sutProvider.Sut.RemoveDomain(organizationDomain.OrganizationId, organizationDomain.Id);
+
+        await Assert.ThrowsAsync<NotFoundException>(requestAction);
+    }
+
+    [Theory, BitAutoData]
+    public async Task RemoveDomain_WhenRequestIsValid(OrganizationDomain organizationDomain,
+        SutProvider<OrganizationDomainController> sutProvider)
+    {
+        sutProvider.GetDependency<ICurrentContext>().ManageSso(organizationDomain.OrganizationId).Returns(true);
+        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(organizationDomain.OrganizationId).Returns(new Organization());
+        sutProvider.GetDependency<IOrganizationDomainRepository>()
+            .GetDomainByIdOrganizationIdAsync(organizationDomain.Id, organizationDomain.OrganizationId)
+            .Returns(organizationDomain);
+
+        await sutProvider.Sut.RemoveDomain(organizationDomain.OrganizationId, organizationDomain.Id);

        await sutProvider.GetDependency<IDeleteOrganizationDomainCommand>().Received(1)
-            .DeleteAsync(id);
+            .DeleteAsync(organizationDomain);
    }

    [Theory, BitAutoData]
--- a/test/Api.Test/SecretsManager/Controllers/AccessPoliciesControllerTests.cs
+++ b/test/Api.Test/SecretsManager/Controllers/AccessPoliciesControllerTests.cs
@@ -2,8 +2,9 @@
 using Bit.Api.SecretsManager.Controllers;
 using Bit.Api.SecretsManager.Models.Request;
 using Bit.Api.Test.SecretsManager.Enums;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
-using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
--- a/test/Api.Test/SecretsManager/Controllers/SecretsManagerEventsControllerTests.cs
+++ b/test/Api.Test/SecretsManager/Controllers/SecretsManagerEventsControllerTests.cs
@@ -0,0 +1,79 @@
+using System.Security.Claims;
+using Bit.Api.SecretsManager.Controllers;
+using Bit.Core.Exceptions;
+using Bit.Core.Models.Data;
+using Bit.Core.Repositories;
+using Bit.Core.SecretsManager.Entities;
+using Bit.Core.SecretsManager.Repositories;
+using Bit.Test.Common.AutoFixture;
+using Bit.Test.Common.AutoFixture.Attributes;
+using Microsoft.AspNetCore.Authorization;
+using NSubstitute;
+using Xunit;
+
+namespace Bit.Api.Test.SecretsManager.Controllers;
+
+[ControllerCustomize(typeof(SecretsManagerEventsController))]
+[SutProviderCustomize]
+[JsonDocumentCustomize]
+public class SecretsManagerEventsControllerTests
+{
+    [Theory]
+    [BitAutoData]
+    public async void GetServiceAccountEvents_NoAccess_Throws(SutProvider<SecretsManagerEventsController> sutProvider,
+        ServiceAccount data)
+    {
+        sutProvider.GetDependency<IServiceAccountRepository>().GetByIdAsync(default).ReturnsForAnyArgs(data);
+        sutProvider.GetDependency<IAuthorizationService>()
+            .AuthorizeAsync(Arg.Any<ClaimsPrincipal>(), data,
+                Arg.Any<IEnumerable<IAuthorizationRequirement>>()).ReturnsForAnyArgs(AuthorizationResult.Failed());
+
+
+        await Assert.ThrowsAsync<NotFoundException>(() => sutProvider.Sut.GetServiceAccountEventsAsync(data.Id));
+        await sutProvider.GetDependency<IEventRepository>().DidNotReceiveWithAnyArgs()
+            .GetManyByOrganizationServiceAccountAsync(Arg.Any<Guid>(), Arg.Any<Guid>(), Arg.Any<DateTime>(),
+                Arg.Any<DateTime>(), Arg.Any<PageOptions>());
+    }
+
+    [Theory]
+    [BitAutoData]
+    public async void GetServiceAccountEvents_DateRangeOver_Throws(
+        SutProvider<SecretsManagerEventsController> sutProvider,
+        ServiceAccount data)
+    {
+        sutProvider.GetDependency<IServiceAccountRepository>().GetByIdAsync(default).ReturnsForAnyArgs(data);
+        sutProvider.GetDependency<IAuthorizationService>()
+            .AuthorizeAsync(Arg.Any<ClaimsPrincipal>(), data,
+                Arg.Any<IEnumerable<IAuthorizationRequirement>>()).ReturnsForAnyArgs(AuthorizationResult.Success());
+
+        var start = DateTime.UtcNow.AddYears(-1);
+        var end = DateTime.UtcNow.AddYears(1);
+
+        await Assert.ThrowsAsync<BadRequestException>(() =>
+            sutProvider.Sut.GetServiceAccountEventsAsync(data.Id, start, end));
+
+        await sutProvider.GetDependency<IEventRepository>().DidNotReceiveWithAnyArgs()
+            .GetManyByOrganizationServiceAccountAsync(Arg.Any<Guid>(), Arg.Any<Guid>(), Arg.Any<DateTime>(),
+                Arg.Any<DateTime>(), Arg.Any<PageOptions>());
+    }
+
+    [Theory]
+    [BitAutoData]
+    public async void GetServiceAccountEvents_Success(SutProvider<SecretsManagerEventsController> sutProvider,
+        ServiceAccount data)
+    {
+        sutProvider.GetDependency<IServiceAccountRepository>().GetByIdAsync(default).ReturnsForAnyArgs(data);
+        sutProvider.GetDependency<IAuthorizationService>()
+            .AuthorizeAsync(Arg.Any<ClaimsPrincipal>(), data,
+                Arg.Any<IEnumerable<IAuthorizationRequirement>>()).ReturnsForAnyArgs(AuthorizationResult.Success());
+        sutProvider.GetDependency<IEventRepository>()
+            .GetManyByOrganizationServiceAccountAsync(default, default, default, default, default)
+            .ReturnsForAnyArgs(new PagedResult<IEvent>());
+
+        await sutProvider.Sut.GetServiceAccountEventsAsync(data.Id);
+
+        await sutProvider.GetDependency<IEventRepository>().Received(1)
+            .GetManyByOrganizationServiceAccountAsync(data.OrganizationId, data.Id, Arg.Any<DateTime>(),
+                Arg.Any<DateTime>(), Arg.Any<PageOptions>());
+    }
+}