[PM-328] Move files for team-tools (#2857)

* Extract Import-Api endpoints into separate controller

Moved ciphers/import and ciphers/import-organization into new ImportController
Paths have been kept intact for now (no changes on clients needed)
Moved request-models used for import into tools-subfolder

* Update CODEOWNERS for team-tools-dev

* Move HibpController (reports) to tools

* Moving files related to Send

* Moving files related to ReferenceEvent

* Removed unneeded newline

src/Api/Auth/Models/Request/Accounts/UpdateKeyRequestModel.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Api.Models.Request;
+using Bit.Api.Tools.Models.Request;
 using Bit.Api.Vault.Models.Request;
 
 namespace Bit.Api.Auth.Models.Request.Accounts;

src/Api/Controllers/AccountsController.cs

@@ -8,7 +8,6 @@ using Bit.Core.Auth.Models.Api.Request.Accounts;
 using Bit.Core.Auth.Models.Api.Response.Accounts;
 using Bit.Core.Auth.Services;
 using Bit.Core.Auth.Utilities;
-using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
@@ -18,6 +17,9 @@ using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
+using Bit.Core.Tools.Entities;
+using Bit.Core.Tools.Repositories;
+using Bit.Core.Tools.Services;
 using Bit.Core.Utilities;
 using Bit.Core.Vault.Entities;
 using Bit.Core.Vault.Repositories;

src/Api/SecretsManager/Controllers/SecretsController.cs

@@ -5,11 +5,13 @@ using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Identity;
-using Bit.Core.Models.Business;
 using Bit.Core.Repositories;
 using Bit.Core.SecretsManager.Commands.Secrets.Interfaces;
 using Bit.Core.SecretsManager.Repositories;
 using Bit.Core.Services;
+using Bit.Core.Tools.Enums;
+using Bit.Core.Tools.Models.Business;
+using Bit.Core.Tools.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 

src/Api/Tools/Controllers/HibpController.cs

@@ -8,7 +8,7 @@ using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.Controllers;
+namespace Bit.Api.Tools.Controllers;
 
 [Route("hibp")]
 [Authorize("Application")]

src/Api/Tools/Controllers/ImportCiphersController.cs

@@ -0,0 +1,79 @@
+using Bit.Api.Tools.Models.Request.Accounts;
+using Bit.Api.Tools.Models.Request.Organizations;
+using Bit.Core.Context;
+using Bit.Core.Exceptions;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
+using Bit.Core.Settings;
+using Bit.Core.Utilities;
+using Bit.Core.Vault.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Bit.Api.Tools.Controllers;
+
+[Route("ciphers")]
+[Authorize("Application")]
+public class ImportCiphersController : Controller
+{
+    private readonly ICipherService _cipherService;
+    private readonly IUserService _userService;
+    private readonly ICurrentContext _currentContext;
+    private readonly ILogger<ImportCiphersController> _logger;
+    private readonly GlobalSettings _globalSettings;
+
+    public ImportCiphersController(
+        ICollectionCipherRepository collectionCipherRepository,
+        ICipherService cipherService,
+        IUserService userService,
+        IProviderService providerService,
+        ICurrentContext currentContext,
+        ILogger<ImportCiphersController> logger,
+        GlobalSettings globalSettings)
+    {
+        _cipherService = cipherService;
+        _userService = userService;
+        _currentContext = currentContext;
+        _logger = logger;
+        _globalSettings = globalSettings;
+    }
+
+    [HttpPost("import")]
+    public async Task PostImport([FromBody] ImportCiphersRequestModel model)
+    {
+        if (!_globalSettings.SelfHosted &&
+            (model.Ciphers.Count() > 6000 || model.FolderRelationships.Count() > 6000 ||
+                model.Folders.Count() > 1000))
+        {
+            throw new BadRequestException("You cannot import this much data at once.");
+        }
+
+        var userId = _userService.GetProperUserId(User).Value;
+        var folders = model.Folders.Select(f => f.ToFolder(userId)).ToList();
+        var ciphers = model.Ciphers.Select(c => c.ToCipherDetails(userId, false)).ToList();
+        await _cipherService.ImportCiphersAsync(folders, ciphers, model.FolderRelationships);
+    }
+
+    [HttpPost("import-organization")]
+    public async Task PostImport([FromQuery] string organizationId,
+        [FromBody] ImportOrganizationCiphersRequestModel model)
+    {
+        if (!_globalSettings.SelfHosted &&
+            (model.Ciphers.Count() > 6000 || model.CollectionRelationships.Count() > 12000 ||
+                model.Collections.Count() > 1000))
+        {
+            throw new BadRequestException("You cannot import this much data at once.");
+        }
+
+        var orgId = new Guid(organizationId);
+        if (!await _currentContext.AccessImportExport(orgId))
+        {
+            throw new NotFoundException();
+        }
+
+        var userId = _userService.GetProperUserId(User).Value;
+        var collections = model.Collections.Select(c => c.ToCollection(orgId)).ToList();
+        var ciphers = model.Ciphers.Select(l => l.ToOrganizationCipherDetails(orgId)).ToList();
+        await _cipherService.ImportCiphersAsync(collections, ciphers, model.CollectionRelationships, userId);
+    }
+}

src/Api/Tools/Controllers/SendsController.cs

@@ -1,22 +1,24 @@
 using System.Text.Json;
 using Azure.Messaging.EventGrid;
-using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
+using Bit.Api.Tools.Models.Request;
+using Bit.Api.Tools.Models.Response;
 using Bit.Api.Utilities;
 using Bit.Core;
 using Bit.Core.Context;
-using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Data;
-using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
+using Bit.Core.Tools.Entities;
+using Bit.Core.Tools.Enums;
+using Bit.Core.Tools.Models.Data;
+using Bit.Core.Tools.Repositories;
+using Bit.Core.Tools.Services;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.Controllers;
+namespace Bit.Api.Tools.Controllers;
 
 [Route("sends")]
 [Authorize("Application")]

src/Api/Tools/Models/Request/Accounts/ImportCiphersRequestModel.cs

@@ -1,6 +1,6 @@
 using Bit.Api.Vault.Models.Request;
 
-namespace Bit.Api.Models.Request.Accounts;
+namespace Bit.Api.Tools.Models.Request.Accounts;
 
 public class ImportCiphersRequestModel
 {

src/Api/Tools/Models/Request/Organizations/ImportOrganizationCiphersRequestModel.cs

@@ -1,6 +1,7 @@
-using Bit.Api.Vault.Models.Request;
+using Bit.Api.Models.Request;
+using Bit.Api.Vault.Models.Request;
 
-namespace Bit.Api.Models.Request.Organizations;
+namespace Bit.Api.Tools.Models.Request.Organizations;
 
 public class ImportOrganizationCiphersRequestModel
 {

src/Api/Tools/Models/Request/SendAccessRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Request;
+namespace Bit.Api.Tools.Models.Request;
 
 public class SendAccessRequestModel
 {

src/Api/Tools/Models/Request/SendRequestModel.cs

@@ -1,13 +1,13 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
-using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Data;
-using Bit.Core.Services;
+using Bit.Core.Tools.Entities;
+using Bit.Core.Tools.Enums;
+using Bit.Core.Tools.Models.Data;
+using Bit.Core.Tools.Services;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.Models.Request;
+namespace Bit.Api.Tools.Models.Request;
 
 public class SendRequestModel
 {

src/Api/Tools/Models/Response/SendAccessResponseModel.cs

@@ -1,12 +1,12 @@
 using System.Text.Json;
-using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.Models.Api;
-using Bit.Core.Models.Data;
 using Bit.Core.Settings;
+using Bit.Core.Tools.Entities;
+using Bit.Core.Tools.Enums;
+using Bit.Core.Tools.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.Models.Response;
+namespace Bit.Api.Tools.Models.Response;
 
 public class SendAccessResponseModel : ResponseModel
 {

src/Api/Tools/Models/Response/SendFileDownloadDataResponseModel.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Models.Api;
 
-namespace Bit.Api.Models.Response;
+namespace Bit.Api.Tools.Models.Response;
 
 public class SendFileDownloadDataResponseModel : ResponseModel
 {

src/Api/Tools/Models/Response/SendFileUploadDataResponseModel.cs

@@ -1,7 +1,7 @@
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 
-namespace Bit.Api.Models.Response;
+namespace Bit.Api.Tools.Models.Response;
 
 public class SendFileUploadDataResponseModel : ResponseModel
 {

src/Api/Tools/Models/Response/SendResponseModel.cs

@@ -1,12 +1,12 @@
 using System.Text.Json;
-using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.Models.Api;
-using Bit.Core.Models.Data;
 using Bit.Core.Settings;
+using Bit.Core.Tools.Entities;
+using Bit.Core.Tools.Enums;
+using Bit.Core.Tools.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.Models.Response;
+namespace Bit.Api.Tools.Models.Response;
 
 public class SendResponseModel : ResponseModel
 {

src/Api/Tools/Models/SendFileModel.cs

@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Bit.Core.Models.Data;
+using Bit.Core.Tools.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.Models;
+namespace Bit.Api.Tools.Models;
 
 public class SendFileModel
 {

src/Api/Tools/Models/SendTextModel.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Models.Data;
+using Bit.Core.Tools.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.Models;
+namespace Bit.Api.Tools.Models;
 
 public class SendTextModel
 {

src/Api/Utilities/MultipartFormDataHelper.cs

@@ -1,5 +1,5 @@
 using System.Text.Json;
-using Bit.Api.Models.Request;
+using Bit.Api.Tools.Models.Request;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Primitives;

src/Api/Vault/Controllers/CiphersController.cs

@@ -1,8 +1,6 @@
 using System.Text.Json;
 using Azure.Messaging.EventGrid;
 using Bit.Api.Auth.Models.Request.Accounts;
-using Bit.Api.Models.Request.Accounts;
-using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;
 using Bit.Api.Utilities;
 using Bit.Api.Vault.Models.Request;
@@ -14,6 +12,7 @@ using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
+using Bit.Core.Tools.Services;
 using Bit.Core.Utilities;
 using Bit.Core.Vault.Entities;
 using Bit.Core.Vault.Models.Data;
@@ -235,45 +234,6 @@ public class CiphersController : Controller
         return new ListResponseModel<CipherMiniDetailsResponseModel>(responses);
     }
 
-    [HttpPost("import")]
-    public async Task PostImport([FromBody] ImportCiphersRequestModel model)
-    {
-        if (!_globalSettings.SelfHosted &&
-            (model.Ciphers.Count() > 6000 || model.FolderRelationships.Count() > 6000 ||
-                model.Folders.Count() > 1000))
-        {
-            throw new BadRequestException("You cannot import this much data at once.");
-        }
-
-        var userId = _userService.GetProperUserId(User).Value;
-        var folders = model.Folders.Select(f => f.ToFolder(userId)).ToList();
-        var ciphers = model.Ciphers.Select(c => c.ToCipherDetails(userId, false)).ToList();
-        await _cipherService.ImportCiphersAsync(folders, ciphers, model.FolderRelationships);
-    }
-
-    [HttpPost("import-organization")]
-    public async Task PostImport([FromQuery] string organizationId,
-        [FromBody] ImportOrganizationCiphersRequestModel model)
-    {
-        if (!_globalSettings.SelfHosted &&
-            (model.Ciphers.Count() > 6000 || model.CollectionRelationships.Count() > 12000 ||
-                model.Collections.Count() > 1000))
-        {
-            throw new BadRequestException("You cannot import this much data at once.");
-        }
-
-        var orgId = new Guid(organizationId);
-        if (!await _currentContext.AccessImportExport(orgId))
-        {
-            throw new NotFoundException();
-        }
-
-        var userId = _userService.GetProperUserId(User).Value;
-        var collections = model.Collections.Select(c => c.ToCollection(orgId)).ToList();
-        var ciphers = model.Ciphers.Select(l => l.ToOrganizationCipherDetails(orgId)).ToList();
-        await _cipherService.ImportCiphersAsync(collections, ciphers, model.CollectionRelationships, userId);
-    }
-
     [HttpPut("{id}/partial")]
     [HttpPost("{id}/partial")]
     public async Task<CipherResponseModel> PutPartial(string id, [FromBody] CipherPartialRequestModel model)

src/Api/Vault/Controllers/SyncController.cs

@@ -7,6 +7,7 @@ using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
+using Bit.Core.Tools.Repositories;
 using Bit.Core.Vault.Repositories;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

src/Api/Vault/Models/Response/SyncResponseModel.cs

@@ -1,10 +1,12 @@
 using Bit.Api.Models.Response;
+using Bit.Api.Tools.Models.Response;
 using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Api.Response;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.Settings;
+using Bit.Core.Tools.Entities;
 using Bit.Core.Vault.Entities;
 using Bit.Core.Vault.Models.Data;