[SM-394] Secrets Manager (#2164)

Long lived feature branch for Secrets Manager

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>
Co-authored-by: cd-bitwarden <106776772+cd-bitwarden@users.noreply.github.com>
Co-authored-by: CarleyDiaz-Bitwarden <103955722+CarleyDiaz-Bitwarden@users.noreply.github.com>
Co-authored-by: Thomas Avery <tavery@bitwarden.com>
Co-authored-by: Colton Hurst <colton@coltonhurst.com>

test/Api.IntegrationTest/Controllers/ProjectsControllerTest.cs

@@ -0,0 +1,181 @@
+using System.Net.Http.Headers;
+using System.Text.Json;
+using Bit.Api.IntegrationTest.Factories;
+using Bit.Api.IntegrationTest.Helpers;
+using Bit.Api.SecretManagerFeatures.Models.Request;
+using Bit.Core.Entities;
+using Bit.Core.Repositories;
+using Bit.Test.Common.Helpers;
+using Xunit;
+
+namespace Bit.Api.IntegrationTest.Controllers;
+
+public class ProjectsControllerTest : IClassFixture<ApiApplicationFactory>, IAsyncLifetime
+{
+    private readonly string _mockEncryptedString =
+        "2.3Uk+WNBIoU5xzmVFNcoWzz==|1MsPIYuRfdOHfu/0uY6H2Q==|/98sp4wb6pHP1VTZ9JcNCYgQjEUMFPlqJgCwRk1YXKg=";
+
+    private readonly HttpClient _client;
+    private readonly ApiApplicationFactory _factory;
+    private readonly IProjectRepository _projectRepository;
+    private Organization _organization = null!;
+
+    public ProjectsControllerTest(ApiApplicationFactory factory)
+    {
+        _factory = factory;
+        _client = _factory.CreateClient();
+        _projectRepository = _factory.GetService<IProjectRepository>();
+    }
+
+    public async Task InitializeAsync()
+    {
+        var ownerEmail = $"integration-test{Guid.NewGuid()}@bitwarden.com";
+        var tokens = await _factory.LoginWithNewAccount(ownerEmail);
+        var (organization, _) = await OrganizationTestHelpers.SignUpAsync(_factory, ownerEmail: ownerEmail, billingEmail: ownerEmail);
+        _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokens.Token);
+        _organization = organization;
+    }
+
+    public Task DisposeAsync()
+    {
+        _client.Dispose();
+        return Task.CompletedTask;
+    }
+
+    [Fact]
+    public async Task CreateProject()
+    {
+        var request = new ProjectCreateRequestModel()
+        {
+            Name = _mockEncryptedString
+        };
+
+        var response = await _client.PostAsJsonAsync($"/organizations/{_organization.Id}/projects", request);
+        response.EnsureSuccessStatusCode();
+        var result = await response.Content.ReadFromJsonAsync<Project>();
+
+        Assert.NotNull(result);
+        Assert.Equal(request.Name, result!.Name);
+        AssertHelper.AssertRecent(result.RevisionDate);
+        AssertHelper.AssertRecent(result.CreationDate);
+        Assert.Null(result.DeletedDate);
+
+        var createdProject = await _projectRepository.GetByIdAsync(result.Id);
+        Assert.NotNull(result);
+        Assert.Equal(request.Name, createdProject.Name);
+        AssertHelper.AssertRecent(createdProject.RevisionDate);
+        AssertHelper.AssertRecent(createdProject.CreationDate);
+        Assert.Null(createdProject.DeletedDate);
+    }
+
+    [Fact]
+    public async Task UpdateProject()
+    {
+        var initialProject = await _projectRepository.CreateAsync(new Project
+        {
+            OrganizationId = _organization.Id,
+            Name = _mockEncryptedString
+        });
+
+        var mockEncryptedString2 = "2.3Uk+WNBIoU5xzmVFNcoWzz==|1MsPIYuRfdOHfu/0uY6H2Q==|/98xy4wb6pHP1VTZ9JcNCYgQjEUMFPlqJgCwRk1YXKg=";
+
+        var request = new ProjectUpdateRequestModel()
+        {
+            Name = mockEncryptedString2
+        };
+
+        var response = await _client.PutAsJsonAsync($"/projects/{initialProject.Id}", request);
+        response.EnsureSuccessStatusCode();
+        var result = await response.Content.ReadFromJsonAsync<Project>();
+        Assert.NotEqual(initialProject.Name, result!.Name);
+        AssertHelper.AssertRecent(result.RevisionDate);
+        Assert.NotEqual(initialProject.RevisionDate, result.RevisionDate);
+        Assert.Null(result.DeletedDate);
+
+        var updatedProject = await _projectRepository.GetByIdAsync(result.Id);
+        Assert.NotNull(result);
+        Assert.Equal(request.Name, updatedProject.Name);
+        AssertHelper.AssertRecent(updatedProject.RevisionDate);
+        AssertHelper.AssertRecent(updatedProject.CreationDate);
+        Assert.Null(updatedProject.DeletedDate);
+        Assert.NotEqual(initialProject.Name, updatedProject.Name);
+        Assert.NotEqual(initialProject.RevisionDate, updatedProject.RevisionDate);
+    }
+
+    [Fact]
+    public async Task GetProject()
+    {
+        var createdProject = await _projectRepository.CreateAsync(new Project
+        {
+            OrganizationId = _organization.Id,
+            Name = _mockEncryptedString
+        });
+
+        var response = await _client.GetAsync($"/projects/{createdProject.Id}");
+        response.EnsureSuccessStatusCode();
+        var result = await response.Content.ReadFromJsonAsync<Project>();
+        Assert.Equal(createdProject.Name, result!.Name);
+        Assert.Equal(createdProject.RevisionDate, result.RevisionDate);
+        Assert.Equal(createdProject.CreationDate, result.CreationDate);
+        Assert.Null(result.DeletedDate);
+    }
+
+    [Fact]
+    public async Task GetProjectsByOrganization()
+    {
+        var projectsToCreate = 3;
+        var projectIds = new List<Guid>();
+        for (var i = 0; i < projectsToCreate; i++)
+        {
+            var project = await _projectRepository.CreateAsync(new Project
+            {
+                OrganizationId = _organization.Id,
+                Name = _mockEncryptedString
+            });
+            projectIds.Add(project.Id);
+        }
+
+        var response = await _client.GetAsync($"/organizations/{_organization.Id}/projects");
+        response.EnsureSuccessStatusCode();
+        var content = await response.Content.ReadAsStringAsync();
+
+        var jsonResult = JsonDocument.Parse(content);
+
+        Assert.NotEmpty(jsonResult.RootElement.GetProperty("data").EnumerateArray());
+        Assert.Equal(projectIds.Count(), jsonResult.RootElement.GetProperty("data").EnumerateArray().Count());
+    }
+
+    [Fact]
+    public async Task DeleteProjects()
+    {
+        var projectsToDelete = 3;
+        var projectIds = new List<Guid>();
+        for (var i = 0; i < projectsToDelete; i++)
+        {
+            var project = await _projectRepository.CreateAsync(new Project
+            {
+                OrganizationId = _organization.Id,
+                Name = _mockEncryptedString,
+            });
+            projectIds.Add(project.Id);
+        }
+
+        var response = await _client.PostAsync("/projects/delete", JsonContent.Create(projectIds));
+        response.EnsureSuccessStatusCode();
+
+        var content = await response.Content.ReadAsStringAsync();
+        Assert.NotEmpty(content);
+
+        var jsonResult = JsonDocument.Parse(content);
+        var index = 0;
+        foreach (var element in jsonResult.RootElement.GetProperty("data").EnumerateArray())
+        {
+            Assert.Equal(projectIds[index].ToString(), element.GetProperty("id").ToString());
+            Assert.Empty(element.GetProperty("error").ToString());
+            index++;
+        }
+
+        var projects = await _projectRepository.GetManyByIds(projectIds);
+        Assert.Empty(projects);
+    }
+}

test/Api.IntegrationTest/Controllers/SecretsControllerTest.cs

@@ -0,0 +1,237 @@
+using System.Net.Http.Headers;
+using System.Text.Json;
+using Bit.Api.IntegrationTest.Factories;
+using Bit.Api.IntegrationTest.Helpers;
+using Bit.Api.SecretManagerFeatures.Models.Request;
+using Bit.Core.Entities;
+using Bit.Core.Repositories;
+using Bit.Test.Common.Helpers;
+using Xunit;
+
+namespace Bit.Api.IntegrationTest.Controllers;
+
+public class SecretsControllerTest : IClassFixture<ApiApplicationFactory>, IAsyncLifetime
+{
+    private readonly string _mockEncryptedString =
+        "2.3Uk+WNBIoU5xzmVFNcoWzz==|1MsPIYuRfdOHfu/0uY6H2Q==|/98sp4wb6pHP1VTZ9JcNCYgQjEUMFPlqJgCwRk1YXKg=";
+
+    private readonly HttpClient _client;
+    private readonly ApiApplicationFactory _factory;
+    private readonly ISecretRepository _secretRepository;
+    private readonly IProjectRepository _projectRepository;
+    private Organization _organization = null!;
+
+    public SecretsControllerTest(ApiApplicationFactory factory)
+    {
+        _factory = factory;
+        _client = _factory.CreateClient();
+        _secretRepository = _factory.GetService<ISecretRepository>();
+        _projectRepository = _factory.GetService<IProjectRepository>();
+    }
+
+    public async Task InitializeAsync()
+    {
+        var ownerEmail = $"integration-test{Guid.NewGuid()}@bitwarden.com";
+        var tokens = await _factory.LoginWithNewAccount(ownerEmail);
+        var (organization, _) = await OrganizationTestHelpers.SignUpAsync(_factory, ownerEmail: ownerEmail, billingEmail: ownerEmail);
+        _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokens.Token);
+        _organization = organization;
+    }
+
+    public Task DisposeAsync()
+    {
+        return Task.CompletedTask;
+    }
+
+    [Fact]
+    public async Task CreateSecret()
+    {
+        var request = new SecretCreateRequestModel()
+        {
+            Key = _mockEncryptedString,
+            Value = _mockEncryptedString,
+            Note = _mockEncryptedString
+        };
+
+        var response = await _client.PostAsJsonAsync($"/organizations/{_organization.Id}/secrets", request);
+        response.EnsureSuccessStatusCode();
+        var result = await response.Content.ReadFromJsonAsync<Secret>();
+
+        Assert.NotNull(result);
+        Assert.Equal(request.Key, result!.Key);
+        Assert.Equal(request.Value, result.Value);
+        Assert.Equal(request.Note, result.Note);
+        AssertHelper.AssertRecent(result.RevisionDate);
+        AssertHelper.AssertRecent(result.CreationDate);
+        Assert.Null(result.DeletedDate);
+
+        var createdSecret = await _secretRepository.GetByIdAsync(result.Id);
+        Assert.NotNull(result);
+        Assert.Equal(request.Key, createdSecret.Key);
+        Assert.Equal(request.Value, createdSecret.Value);
+        Assert.Equal(request.Note, createdSecret.Note);
+        AssertHelper.AssertRecent(createdSecret.RevisionDate);
+        AssertHelper.AssertRecent(createdSecret.CreationDate);
+        Assert.Null(createdSecret.DeletedDate);
+    }
+
+    [Fact]
+    public async Task CreateSecretWithProject()
+    {
+        var project = await _projectRepository.CreateAsync(new Project()
+        {
+            Id = new Guid(),
+            OrganizationId = _organization.Id,
+            Name = _mockEncryptedString
+        });
+        var projectIds = new[] { project.Id };
+        var secretRequest = new SecretCreateRequestModel()
+        {
+            Key = _mockEncryptedString,
+            Value = _mockEncryptedString,
+            Note = _mockEncryptedString,
+            ProjectIds = projectIds,
+        };
+        var secretResponse = await _client.PostAsJsonAsync($"/organizations/{_organization.Id}/secrets", secretRequest);
+        secretResponse.EnsureSuccessStatusCode();
+        var secretResult = await secretResponse.Content.ReadFromJsonAsync<Secret>();
+
+        var secret = (await _secretRepository.GetManyByProjectIdAsync(project.Id)).First();
+
+        Assert.NotNull(secretResult);
+        Assert.Equal(secret.Id, secretResult!.Id);
+        Assert.Equal(secret.OrganizationId, secretResult.OrganizationId);
+        Assert.Equal(secret.Key, secretResult.Key);
+        Assert.Equal(secret.Value, secretResult.Value);
+        Assert.Equal(secret.Note, secretResult.Note);
+        Assert.Equal(secret.CreationDate, secretResult.CreationDate);
+        Assert.Equal(secret.RevisionDate, secretResult.RevisionDate);
+    }
+
+    [Fact]
+    public async Task UpdateSecret()
+    {
+        var initialSecret = await _secretRepository.CreateAsync(new Secret
+        {
+            OrganizationId = _organization.Id,
+            Key = _mockEncryptedString,
+            Value = _mockEncryptedString,
+            Note = _mockEncryptedString
+        });
+
+        var request = new SecretUpdateRequestModel()
+        {
+            Key = _mockEncryptedString,
+            Value = "2.3Uk+WNBIoU5xzmVFNcoWzz==|1MsPIYuRfdOHfu/0uY6H2Q==|/98xy4wb6pHP1VTZ9JcNCYgQjEUMFPlqJgCwRk1YXKg=",
+            Note = _mockEncryptedString
+        };
+
+        var response = await _client.PutAsJsonAsync($"/secrets/{initialSecret.Id}", request);
+        response.EnsureSuccessStatusCode();
+        var result = await response.Content.ReadFromJsonAsync<Secret>();
+        Assert.Equal(request.Key, result!.Key);
+        Assert.Equal(request.Value, result.Value);
+        Assert.NotEqual(initialSecret.Value, result.Value);
+        Assert.Equal(request.Note, result.Note);
+        AssertHelper.AssertRecent(result.RevisionDate);
+        Assert.NotEqual(initialSecret.RevisionDate, result.RevisionDate);
+        Assert.Null(result.DeletedDate);
+
+        var updatedSecret = await _secretRepository.GetByIdAsync(result.Id);
+        Assert.NotNull(result);
+        Assert.Equal(request.Key, updatedSecret.Key);
+        Assert.Equal(request.Value, updatedSecret.Value);
+        Assert.Equal(request.Note, updatedSecret.Note);
+        AssertHelper.AssertRecent(updatedSecret.RevisionDate);
+        AssertHelper.AssertRecent(updatedSecret.CreationDate);
+        Assert.Null(updatedSecret.DeletedDate);
+        Assert.NotEqual(initialSecret.Value, updatedSecret.Value);
+        Assert.NotEqual(initialSecret.RevisionDate, updatedSecret.RevisionDate);
+    }
+
+    [Fact]
+    public async Task DeleteSecrets()
+    {
+        var secretsToDelete = 3;
+        var secretIds = new List<Guid>();
+        for (var i = 0; i < secretsToDelete; i++)
+        {
+            var secret = await _secretRepository.CreateAsync(new Secret
+            {
+                OrganizationId = _organization.Id,
+                Key = _mockEncryptedString,
+                Value = _mockEncryptedString,
+                Note = _mockEncryptedString
+            });
+            secretIds.Add(secret.Id);
+        }
+
+        var response = await _client.PostAsync("/secrets/delete", JsonContent.Create(secretIds));
+        response.EnsureSuccessStatusCode();
+
+        var content = await response.Content.ReadAsStringAsync();
+        Assert.NotEmpty(content);
+
+        var jsonResult = JsonDocument.Parse(content);
+        var index = 0;
+        foreach (var element in jsonResult.RootElement.GetProperty("data").EnumerateArray())
+        {
+            Assert.Equal(secretIds[index].ToString(), element.GetProperty("id").ToString());
+            Assert.Empty(element.GetProperty("error").ToString());
+            index++;
+        }
+
+        var secrets = await _secretRepository.GetManyByIds(secretIds);
+        Assert.Empty(secrets);
+    }
+
+    [Fact]
+    public async Task GetSecret()
+    {
+        var createdSecret = await _secretRepository.CreateAsync(new Secret
+        {
+            OrganizationId = _organization.Id,
+            Key = _mockEncryptedString,
+            Value = _mockEncryptedString,
+            Note = _mockEncryptedString
+        });
+
+
+        var response = await _client.GetAsync($"/secrets/{createdSecret.Id}");
+        response.EnsureSuccessStatusCode();
+        var result = await response.Content.ReadFromJsonAsync<Secret>();
+        Assert.Equal(createdSecret.Key, result!.Key);
+        Assert.Equal(createdSecret.Value, result.Value);
+        Assert.Equal(createdSecret.Note, result.Note);
+        Assert.Equal(createdSecret.RevisionDate, result.RevisionDate);
+        Assert.Equal(createdSecret.CreationDate, result.CreationDate);
+        Assert.Null(result.DeletedDate);
+    }
+
+    [Fact]
+    public async Task GetSecretsByOrganization()
+    {
+        var secretsToCreate = 3;
+        var secretIds = new List<Guid>();
+        for (var i = 0; i < secretsToCreate; i++)
+        {
+            var secret = await _secretRepository.CreateAsync(new Secret
+            {
+                OrganizationId = _organization.Id,
+                Key = _mockEncryptedString,
+                Value = _mockEncryptedString,
+                Note = _mockEncryptedString
+            });
+            secretIds.Add(secret.Id);
+        }
+
+        var response = await _client.GetAsync($"/organizations/{_organization.Id}/secrets");
+        response.EnsureSuccessStatusCode();
+        var content = await response.Content.ReadAsStringAsync();
+
+        var jsonResult = JsonDocument.Parse(content);
+
+        Assert.NotEmpty(jsonResult.RootElement.GetProperty("secrets").EnumerateArray());
+        Assert.Equal(secretIds.Count(), jsonResult.RootElement.GetProperty("secrets").EnumerateArray().Count());
+    }
+}

test/Api.IntegrationTest/Controllers/ServiceAccountsControllerTests.cs

@@ -0,0 +1,183 @@
+using System.Net.Http.Headers;
+using System.Text.Json;
+using Bit.Api.IntegrationTest.Factories;
+using Bit.Api.IntegrationTest.Helpers;
+using Bit.Api.SecretManagerFeatures.Models.Request;
+using Bit.Core.Entities;
+using Bit.Core.Repositories;
+using Bit.Test.Common.Helpers;
+using Xunit;
+
+namespace Bit.Api.IntegrationTest.Controllers;
+
+public class ServiceAccountsControllerTest : IClassFixture<ApiApplicationFactory>, IAsyncLifetime
+{
+    private readonly string _mockEncryptedString =
+        "2.3Uk+WNBIoU5xzmVFNcoWzz==|1MsPIYuRfdOHfu/0uY6H2Q==|/98sp4wb6pHP1VTZ9JcNCYgQjEUMFPlqJgCwRk1YXKg=";
+
+    private readonly HttpClient _client;
+    private readonly ApiApplicationFactory _factory;
+    private readonly IServiceAccountRepository _serviceAccountRepository;
+    private Organization _organization = null!;
+
+    public ServiceAccountsControllerTest(ApiApplicationFactory factory)
+    {
+        _factory = factory;
+        _client = _factory.CreateClient();
+        _serviceAccountRepository = _factory.GetService<IServiceAccountRepository>();
+    }
+
+    public async Task InitializeAsync()
+    {
+        var ownerEmail = $"integration-test{Guid.NewGuid()}@bitwarden.com";
+        var tokens = await _factory.LoginWithNewAccount(ownerEmail);
+        var (organization, _) = await OrganizationTestHelpers.SignUpAsync(_factory, ownerEmail: ownerEmail, billingEmail: ownerEmail);
+        _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokens.Token);
+        _organization = organization;
+    }
+
+    public Task DisposeAsync()
+    {
+        return Task.CompletedTask;
+    }
+
+    [Fact]
+    public async Task GetServiceAccountsByOrganization()
+    {
+        var serviceAccountsToCreate = 3;
+        var serviceAccountIds = new List<Guid>();
+        for (var i = 0; i < serviceAccountsToCreate; i++)
+        {
+            var serviceAccount = await _serviceAccountRepository.CreateAsync(new ServiceAccount
+            {
+                OrganizationId = _organization.Id,
+                Name = _mockEncryptedString,
+            });
+            serviceAccountIds.Add(serviceAccount.Id);
+        }
+
+        var response = await _client.GetAsync($"/organizations/{_organization.Id}/service-accounts");
+        response.EnsureSuccessStatusCode();
+        var content = await response.Content.ReadAsStringAsync();
+
+        var jsonResult = JsonDocument.Parse(content);
+
+        Assert.NotEmpty(jsonResult.RootElement.GetProperty("data").EnumerateArray());
+        Assert.Equal(serviceAccountIds.Count(), jsonResult.RootElement.GetProperty("data").EnumerateArray().Count());
+    }
+
+    [Fact]
+    public async Task CreateServiceAccount()
+    {
+        var request = new ServiceAccountCreateRequestModel()
+        {
+            Name = _mockEncryptedString,
+        };
+
+        var response = await _client.PostAsJsonAsync($"/organizations/{_organization.Id}/service-accounts", request);
+        response.EnsureSuccessStatusCode();
+        var result = await response.Content.ReadFromJsonAsync<ServiceAccount>();
+
+        Assert.NotNull(result);
+        Assert.Equal(request.Name, result!.Name);
+        AssertHelper.AssertRecent(result.RevisionDate);
+        AssertHelper.AssertRecent(result.CreationDate);
+
+        var createdServiceAccount = await _serviceAccountRepository.GetByIdAsync(result.Id);
+        Assert.NotNull(result);
+        Assert.Equal(request.Name, createdServiceAccount.Name);
+        AssertHelper.AssertRecent(createdServiceAccount.RevisionDate);
+        AssertHelper.AssertRecent(createdServiceAccount.CreationDate);
+    }
+
+    [Fact]
+    public async Task UpdateServiceAccount()
+    {
+        var initialServiceAccount = await _serviceAccountRepository.CreateAsync(new ServiceAccount
+        {
+            OrganizationId = _organization.Id,
+            Name = _mockEncryptedString,
+        });
+
+        var request = new ServiceAccountUpdateRequestModel()
+        {
+            Name = "2.3Uk+WNBIoU5xzmVFNcoWzz==|1MsPIYuRfdOHfu/0uY6H2Q==|/98xy4wb6pHP1VTZ9JcNCYgQjEUMFPlqJgCwRk1YXKg=",
+        };
+
+        var response = await _client.PutAsJsonAsync($"/service-accounts/{initialServiceAccount.Id}", request);
+        response.EnsureSuccessStatusCode();
+        var result = await response.Content.ReadFromJsonAsync<ServiceAccount>();
+        Assert.NotNull(result);
+        Assert.Equal(request.Name, result!.Name);
+        Assert.NotEqual(initialServiceAccount.Name, result.Name);
+        AssertHelper.AssertRecent(result.RevisionDate);
+        Assert.NotEqual(initialServiceAccount.RevisionDate, result.RevisionDate);
+
+        var updatedServiceAccount = await _serviceAccountRepository.GetByIdAsync(initialServiceAccount.Id);
+        Assert.NotNull(result);
+        Assert.Equal(request.Name, updatedServiceAccount.Name);
+        AssertHelper.AssertRecent(updatedServiceAccount.RevisionDate);
+        AssertHelper.AssertRecent(updatedServiceAccount.CreationDate);
+        Assert.NotEqual(initialServiceAccount.Name, updatedServiceAccount.Name);
+        Assert.NotEqual(initialServiceAccount.RevisionDate, updatedServiceAccount.RevisionDate);
+    }
+
+    [Fact]
+    public async Task CreateServiceAccountAccessToken()
+    {
+        var serviceAccount = await _serviceAccountRepository.CreateAsync(new ServiceAccount
+        {
+            OrganizationId = _organization.Id,
+            Name = _mockEncryptedString,
+        });
+
+        var mockExpiresAt = DateTime.UtcNow.AddDays(30);
+        var request = new AccessTokenCreateRequestModel()
+        {
+            Name = _mockEncryptedString,
+            EncryptedPayload = _mockEncryptedString,
+            Key = _mockEncryptedString,
+            ExpireAt = mockExpiresAt
+        };
+
+        var response = await _client.PostAsJsonAsync($"/service-accounts/{serviceAccount.Id}/access-tokens", request);
+        response.EnsureSuccessStatusCode();
+        var result = await response.Content.ReadFromJsonAsync<ApiKey>();
+
+        Assert.NotNull(result);
+        Assert.Equal(request.Name, result!.Name);
+        Assert.NotNull(result.ClientSecret);
+        Assert.Equal(mockExpiresAt, result.ExpireAt);
+        AssertHelper.AssertRecent(result.RevisionDate);
+        AssertHelper.AssertRecent(result.CreationDate);
+    }
+
+    [Fact]
+    public async Task CreateServiceAccountAccessTokenExpireAtNullAsync()
+    {
+        var serviceAccount = await _serviceAccountRepository.CreateAsync(new ServiceAccount
+        {
+            OrganizationId = _organization.Id,
+            Name = _mockEncryptedString,
+        });
+
+        var request = new AccessTokenCreateRequestModel()
+        {
+            Name = _mockEncryptedString,
+            EncryptedPayload = _mockEncryptedString,
+            Key = _mockEncryptedString,
+            ExpireAt = null
+        };
+
+        var response = await _client.PostAsJsonAsync($"/service-accounts/{serviceAccount.Id}/access-tokens", request);
+        response.EnsureSuccessStatusCode();
+        var result = await response.Content.ReadFromJsonAsync<ApiKey>();
+
+        Assert.NotNull(result);
+        Assert.Equal(request.Name, result!.Name);
+        Assert.NotNull(result.ClientSecret);
+        Assert.Null(result.ExpireAt);
+        AssertHelper.AssertRecent(result.RevisionDate);
+        AssertHelper.AssertRecent(result.CreationDate);
+    }
+}

test/Api.IntegrationTest/Factories/ApiApplicationFactory.cs

@@ -12,6 +12,7 @@ public class ApiApplicationFactory : WebApplicationFactoryBase<Startup>
     public ApiApplicationFactory()
     {
         _identityApplicationFactory = new IdentityApplicationFactory();
+        _identityApplicationFactory.DatabaseName = DatabaseName;
     }
 
     protected override void ConfigureWebHost(IWebHostBuilder builder)
@@ -20,6 +21,10 @@ public class ApiApplicationFactory : WebApplicationFactoryBase<Startup>
 
         builder.ConfigureTestServices(services =>
         {
+            // Remove scheduled background jobs to prevent errors in parallel test execution
+            var jobService = services.First(sd => sd.ServiceType == typeof(Microsoft.Extensions.Hosting.IHostedService) && sd.ImplementationType == typeof(Bit.Api.Jobs.JobsHostedService));
+            services.Remove(jobService);
+
             services.PostConfigure<IdentityServerAuthenticationOptions>(IdentityServerAuthenticationDefaults.AuthenticationScheme, options =>
             {
                 options.JwtBackChannelHandler = _identityApplicationFactory.Server.CreateHandler();

test/Api.IntegrationTest/Helpers/OrganizationTestHelpers.cs

@@ -0,0 +1,33 @@
+using Bit.Core.Entities;
+using Bit.Core.Enums;
+using Bit.Core.Models.Business;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
+using Bit.IntegrationTestCommon.Factories;
+
+namespace Bit.Api.IntegrationTest.Helpers;
+
+public static class OrganizationTestHelpers
+{
+    public static async Task<Tuple<Organization, OrganizationUser>> SignUpAsync<T>(WebApplicationFactoryBase<T> factory,
+        PlanType plan = PlanType.Free,
+        string ownerEmail = "integration-test@bitwarden.com",
+        string name = "Integration Test Org",
+        string billingEmail = "integration-test@bitwarden.com",
+        string ownerKey = "test-key") where T : class
+    {
+        var userRepository = factory.GetService<IUserRepository>();
+        var organizationService = factory.GetService<IOrganizationService>();
+
+        var owner = await userRepository.GetByEmailAsync(ownerEmail);
+
+        return await organizationService.SignUpAsync(new OrganizationSignup
+        {
+            Name = name,
+            BillingEmail = billingEmail,
+            Plan = plan,
+            OwnerKey = ownerKey,
+            Owner = owner,
+        });
+    }
+}

test/Api.IntegrationTest/packages.lock.json

@@ -674,6 +674,15 @@
           "Microsoft.Extensions.DependencyModel": "6.0.0"
         }
       },
+      "Microsoft.EntityFrameworkCore.SqlServer": {
+        "type": "Transitive",
+        "resolved": "6.0.12",
+        "contentHash": "bdKnSz1w+WZz9QYWhs3wwGuMn4YssjdR+HOBpzChQ6C3+dblq4Pammm5fzugcPOhTgCiWftOT2jPOT5hEy4bYg==",
+        "dependencies": {
+          "Microsoft.Data.SqlClient": "2.1.4",
+          "Microsoft.EntityFrameworkCore.Relational": "6.0.12"
+        }
+      },
       "Microsoft.Extensions.ApiDescription.Server": {
         "type": "Transitive",
         "resolved": "3.0.0",
@@ -3132,6 +3141,7 @@
         "dependencies": {
           "Azure.Messaging.EventGrid": "[4.10.0, )",
           "Commercial.Core": "[2022.12.0, )",
+          "Commercial.Infrastructure.EntityFramework": "[2022.12.0, )",
           "Core": "[2022.12.0, )",
           "SharedWeb": "[2022.12.0, )",
           "Swashbuckle.AspNetCore": "[6.3.1, )"
@@ -3143,6 +3153,14 @@
           "Core": "[2022.12.0, )"
         }
       },
+      "commercial.infrastructure.entityframework": {
+        "type": "Project",
+        "dependencies": {
+          "AutoMapper.Extensions.Microsoft.DependencyInjection": "[11.0.0, )",
+          "Core": "[2022.12.0, )",
+          "Infrastructure.EntityFramework": "[2022.12.0, )"
+        }
+      },
       "common": {
         "type": "Project",
         "dependencies": {
@@ -3216,6 +3234,7 @@
           "AutoMapper.Extensions.Microsoft.DependencyInjection": "[11.0.0, )",
           "Core": "[2022.12.0, )",
           "Microsoft.EntityFrameworkCore.Relational": "[6.0.12, )",
+          "Microsoft.EntityFrameworkCore.SqlServer": "[6.0.12, )",
           "Microsoft.EntityFrameworkCore.Sqlite": "[6.0.12, )",
           "Npgsql.EntityFrameworkCore.PostgreSQL": "[6.0.8, )",
           "Pomelo.EntityFrameworkCore.MySql": "[6.0.2, )",