[EC-508] SCIM CQRS Refactor - Users/Delete

bitwarden-server.sln

@@ -98,6 +98,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Api.IntegrationTest", "test
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scim.IntegrationTest", "bitwarden_license\test\Scim.IntegrationTest\Scim.IntegrationTest.csproj", "{FE998849-5FC8-41A2-B7C9-9227901471A0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scim.Test", "bitwarden_license\test\Scim.Test\Scim.Test.csproj", "{B1595DA3-4C60-41AA-8BF0-499A5F75A885}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -238,6 +240,10 @@ Global
 		{FE998849-5FC8-41A2-B7C9-9227901471A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FE998849-5FC8-41A2-B7C9-9227901471A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE998849-5FC8-41A2-B7C9-9227901471A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1595DA3-4C60-41AA-8BF0-499A5F75A885}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1595DA3-4C60-41AA-8BF0-499A5F75A885}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1595DA3-4C60-41AA-8BF0-499A5F75A885}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1595DA3-4C60-41AA-8BF0-499A5F75A885}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -276,6 +282,7 @@ Global
 		{7EFB1124-F40A-40EB-9EDA-94FD540AA8FD} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84F}
         {CBE96C6D-A4D6-46E1-94C5-42D6CAD8531C} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84F}
 		{FE998849-5FC8-41A2-B7C9-9227901471A0} = {287CFF34-BBDB-4BC4-AF88-1E19A5A4679B}
+		{B1595DA3-4C60-41AA-8BF0-499A5F75A885} = {287CFF34-BBDB-4BC4-AF88-1E19A5A4679B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E01CBF68-2E20-425F-9EDB-E0A6510CA92F}

bitwarden_license/src/Scim/Commands/Users/DeleteUserCommand.cs

@@ -0,0 +1,32 @@
+using Bit.Core.Exceptions;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
+using Bit.Scim.Commands.Users.Interfaces;
+using Bit.Scim.Models;
+
+namespace Bit.Scim.Commands.Users;
+
+public class DeleteUserCommand : IDeleteUserCommand
+{
+    private readonly IOrganizationService _organizationService;
+    private readonly IOrganizationUserRepository _organizationUserRepository;
+
+    public DeleteUserCommand(
+        IOrganizationService organizationService,
+        IOrganizationUserRepository organizationUserRepository)
+    {
+        _organizationService = organizationService;
+        _organizationUserRepository = organizationUserRepository;
+    }
+
+    public async Task DeleteUserAsync(Guid organizationId, Guid id, ScimUserRequestModel model)
+    {
+        var orgUser = await _organizationUserRepository.GetByIdAsync(id);
+        if (orgUser == null || orgUser.OrganizationId != organizationId)
+        {
+            throw new NotFoundException("User not found.");
+        }
+
+        await _organizationService.DeleteUserAsync(organizationId, id, null);
+    }
+}

bitwarden_license/src/Scim/Commands/Users/Interfaces/IDeleteUserCommand.cs

@@ -0,0 +1,8 @@
+using Bit.Scim.Models;
+
+namespace Bit.Scim.Commands.Users.Interfaces;
+
+public interface IDeleteUserCommand
+{
+    Task DeleteUserAsync(Guid organizationId, Guid id, ScimUserRequestModel model);
+}

bitwarden_license/src/Scim/Controllers/v2/UsersController.cs

@@ -1,8 +1,10 @@
 using Bit.Core.Enums;
+using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
+using Bit.Scim.Commands.Users.Interfaces;
 using Bit.Scim.Context;
 using Bit.Scim.Models;
 using Microsoft.AspNetCore.Authorization;
@@ -21,6 +23,7 @@ public class UsersController : Controller
     private readonly IOrganizationService _organizationService;
     private readonly IScimContext _scimContext;
     private readonly ScimSettings _scimSettings;
+    private readonly IDeleteUserCommand _deleteUserCommand;
     private readonly ILogger<UsersController> _logger;
 
     public UsersController(
@@ -30,6 +33,7 @@ public UsersController(
         IOrganizationService organizationService,
         IScimContext scimContext,
         IOptions<ScimSettings> scimSettings,
+        IDeleteUserCommand deleteUserCommand,
         ILogger<UsersController> logger)
     {
         _userService = userService;
@@ -38,6 +42,7 @@ public UsersController(
         _organizationService = organizationService;
         _scimContext = scimContext;
         _scimSettings = scimSettings?.Value;
+        _deleteUserCommand = deleteUserCommand;
         _logger = logger;
     }
 
@@ -264,17 +269,19 @@ public async Task<IActionResult> Patch(Guid organizationId, Guid id, [FromBody]
     [HttpDelete("{id}")]
     public async Task<IActionResult> Delete(Guid organizationId, Guid id, [FromBody] ScimUserRequestModel model)
     {
-        var orgUser = await _organizationUserRepository.GetByIdAsync(id);
-        if (orgUser == null || orgUser.OrganizationId != organizationId)
+        try
         {
-            return new NotFoundObjectResult(new ScimErrorResponseModel
+            await _deleteUserCommand.DeleteUserAsync(organizationId, id, model);
+            return new NoContentResult();
+        }
+        catch (NotFoundException ex)
+        {
+            return NotFound(new ScimErrorResponseModel
             {
-                Status = 404,
-                Detail = "User not found."
+                Status = StatusCodes.Status404NotFound,
+                Detail = ex.Message
             });
         }
-        await _organizationService.DeleteUserAsync(organizationId, id, null);
-        return new NoContentResult();
     }
 
     private async Task<bool> HandleActiveOperationAsync(Core.Entities.OrganizationUser orgUser, bool active)

bitwarden_license/src/Scim/Startup.cs

@@ -2,6 +2,8 @@
 using Bit.Core.Context;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
+using Bit.Scim.Commands.Users;
+using Bit.Scim.Commands.Users.Interfaces;
 using Bit.Scim.Context;
 using Bit.Scim.Utilities;
 using Bit.SharedWeb.Utilities;
@@ -75,6 +77,8 @@ public void ConfigureServices(IServiceCollection services)
             config.Filters.Add(new LoggingExceptionHandlerFilterAttribute());
         });
         services.Configure<RouteOptions>(options => options.LowercaseUrls = true);
+
+        services.AddScoped<IDeleteUserCommand, DeleteUserCommand>();
     }
 
     public void Configure(

bitwarden_license/test/Scim.Test/Commands/Users/DeleteUserCommandTests.cs

@@ -0,0 +1,56 @@
+using Bit.Core.Entities;
+using Bit.Core.Exceptions;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
+using Bit.Scim.Commands.Users;
+using Bit.Scim.Models;
+using Bit.Test.Common.AutoFixture;
+using Bit.Test.Common.AutoFixture.Attributes;
+using NSubstitute;
+using Xunit;
+
+namespace Bit.Scim.Test.Commands.Users;
+
+[SutProviderCustomize]
+public class DeleteUserCommandTests
+{
+    [Theory]
+    [BitAutoData]
+    public async Task DeleteUser_Success(SutProvider<DeleteUserCommand> sutProvider, Guid organizationId, Guid organizationUserId, ScimUserRequestModel model)
+    {
+        sutProvider.GetDependency<IOrganizationUserRepository>()
+            .GetByIdAsync(organizationUserId)
+            .Returns(new OrganizationUser
+            {
+                Id = organizationUserId,
+                OrganizationId = organizationId
+            });
+
+        await sutProvider.Sut.DeleteUserAsync(organizationId, organizationUserId, model);
+
+        await sutProvider.GetDependency<IOrganizationUserRepository>().Received(1).GetByIdAsync(organizationUserId);
+        await sutProvider.GetDependency<IOrganizationService>().Received(1).DeleteUserAsync(organizationId, organizationUserId, null);
+    }
+
+    [Theory]
+    [BitAutoData]
+    public async Task DeleteUser_NotFound_Throws(SutProvider<DeleteUserCommand> sutProvider, Guid organizationId, Guid organizationUserId, ScimUserRequestModel model)
+    {
+        await Assert.ThrowsAsync<NotFoundException>(async () => await sutProvider.Sut.DeleteUserAsync(organizationId, organizationUserId, model));
+    }
+
+    [Theory]
+    [BitAutoData]
+    public async Task DeleteUser_MismatchingOrganizationId_Throws(SutProvider<DeleteUserCommand> sutProvider, Guid organizationId, Guid organizationUserId, ScimUserRequestModel model)
+    {
+        sutProvider.GetDependency<IOrganizationUserRepository>()
+            .GetByIdAsync(organizationUserId)
+            .Returns(new OrganizationUser
+            {
+                Id = organizationUserId,
+                OrganizationId = Guid.NewGuid()
+            });
+
+        await Assert.ThrowsAsync<NotFoundException>(async () => await sutProvider.Sut.DeleteUserAsync(organizationId, organizationUserId, model));
+    }
+}

bitwarden_license/test/Scim.Test/Scim.Test.csproj

@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="NSubstitute" Version="$(NSubstitueVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Scim\Scim.csproj" />
+    <ProjectReference Include="..\..\..\test\Common\Common.csproj" />
+  </ItemGroup>
+</Project>