SM-99: Individual Project / Secrets Tab

bitwarden_license/src/Commercial.Infrastructure.EntityFramework/Repositories/SecretRepository.cs

@@ -52,6 +52,42 @@ public SecretRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper
         }
     }
 
+    public async Task<IEnumerable<Core.Entities.Secret>> GetManyByProjectIdAsync(Guid projectId)
+    {
+        using (var scope = ServiceScopeFactory.CreateScope())
+        {
+            var dbContext = GetDatabaseContext(scope);
+            var secrets = await dbContext.Secret
+                .Where(s => s.Projects.Any(p => p.Id == projectId) && s.DeletedDate == null).Include("Projects")
+                .OrderBy(s => s.RevisionDate).ToListAsync();
+
+            return Mapper.Map<List<Core.Entities.Secret>>(secrets);
+        }
+    }
+
+    public override async Task<Core.Entities.Secret> CreateAsync(Core.Entities.Secret secret)
+    {
+        using (var scope = ServiceScopeFactory.CreateScope())
+        {
+            var dbContext = GetDatabaseContext(scope);
+            secret.SetNewId();
+            var entity = Mapper.Map<Secret>(secret);
+
+            if (secret.Projects?.Count > 0)
+            {
+                foreach (var p in entity.Projects)
+                {
+                    dbContext.Attach(p);
+                }
+            }
+
+            await dbContext.AddAsync(entity);
+            await dbContext.SaveChangesAsync();
+            secret.Id = entity.Id;
+            return secret;
+        }
+    }
+
     public async Task SoftDeleteManyByIdAsync(IEnumerable<Guid> ids)
     {
         using (var scope = ServiceScopeFactory.CreateScope())

src/Api/Controllers/SecretsController.cs

@@ -15,13 +15,15 @@ namespace Bit.Api.Controllers;
 public class SecretsController : Controller
 {
     private readonly ISecretRepository _secretRepository;
+    private readonly IProjectRepository _projectRepository;
     private readonly ICreateSecretCommand _createSecretCommand;
     private readonly IUpdateSecretCommand _updateSecretCommand;
     private readonly IDeleteSecretCommand _deleteSecretCommand;
 
-    public SecretsController(ISecretRepository secretRepository, ICreateSecretCommand createSecretCommand, IUpdateSecretCommand updateSecretCommand, IDeleteSecretCommand deleteSecretCommand)
+    public SecretsController(ISecretRepository secretRepository, IProjectRepository projectRepository, ICreateSecretCommand createSecretCommand, IUpdateSecretCommand updateSecretCommand, IDeleteSecretCommand deleteSecretCommand)
     {
         _secretRepository = secretRepository;
+        _projectRepository = projectRepository;
         _createSecretCommand = createSecretCommand;
         _updateSecretCommand = updateSecretCommand;
         _deleteSecretCommand = deleteSecretCommand;
@@ -45,6 +47,14 @@ public async Task<SecretResponseModel> GetSecretAsync([FromRoute] Guid id)
         return new SecretResponseModel(secret);
     }
 
+    [HttpGet("projects/{projectId}/secrets")]
+    public async Task<SecretWithProjectsListResponseModel> GetSecretsByProjectAsync([FromRoute] Guid projectId)
+    {
+        var secrets = await _secretRepository.GetManyByProjectIdAsync(projectId);
+        var responses = secrets.Select(s => new SecretResponseModel(s));
+        return new SecretWithProjectsListResponseModel(secrets);
+    }
+
     [HttpPost("organizations/{organizationId}/secrets")]
     public async Task<SecretResponseModel> CreateSecretAsync([FromRoute] Guid organizationId, [FromBody] SecretCreateRequestModel createRequest)
     {

src/Api/SecretManagerFeatures/Models/Request/SecretCreateRequestModel.cs

@@ -18,6 +18,8 @@ public class SecretCreateRequestModel
     [EncryptedString]
     public string Note { get; set; }
 
+    public Guid? ProjectId { get; set; }
+
     public Secret ToSecret(Guid organizationId)
     {
         return new Secret()
@@ -27,6 +29,7 @@ public Secret ToSecret(Guid organizationId)
             Value = Value,
             Note = Note,
             DeletedDate = null,
+            Projects = ProjectId.HasValue ? new List<Project>() { new() { Id = ProjectId.Value } } : null,
         };
     }
 }

src/Api/SecretManagerFeatures/Models/Response/SecretResponseModel.cs

@@ -36,4 +36,3 @@ public SecretResponseModel(Secret secret, string obj = "secret")
 
     public DateTime RevisionDate { get; set; }
 }
-

src/Core/Repositories/ISecretRepository.cs

@@ -6,6 +6,7 @@ public interface ISecretRepository
 {
     Task<IEnumerable<Secret>> GetManyByOrganizationIdAsync(Guid organizationId);
     Task<IEnumerable<Secret>> GetManyByIds(IEnumerable<Guid> ids);
+    Task<IEnumerable<Secret>> GetManyByProjectIdAsync(Guid projectId);
     Task<Secret> GetByIdAsync(Guid id);
     Task<Secret> CreateAsync(Secret secret);
     Task ReplaceAsync(Secret secret);