diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 80e09368a..51bfc53a9 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -8,4 +8,5 @@ bitwarden_license/src/Sso @bitwarden/team-auth-dev src/Identity @bitwarden/team-auth-dev **/SecretsManager @bitwarden/team-secrets-manager-dev +**/Tools @bitwarden/team-tools-dev **/Vault @bitwarden/team-vault-dev diff --git a/src/Admin/Controllers/OrganizationsController.cs b/src/Admin/Controllers/OrganizationsController.cs index 9a07dd11c..21f616267 100644 --- a/src/Admin/Controllers/OrganizationsController.cs +++ b/src/Admin/Controllers/OrganizationsController.cs @@ -1,12 +1,14 @@ using Bit.Admin.Models; using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.Models.Business; using Bit.Core.Models.OrganizationConnectionConfigs; using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings; +using Bit.Core.Tools.Enums; +using Bit.Core.Tools.Models.Business; +using Bit.Core.Tools.Services; using Bit.Core.Utilities; using Bit.Core.Vault.Repositories; using Microsoft.AspNetCore.Authorization; diff --git a/src/Admin/Controllers/ProvidersController.cs b/src/Admin/Controllers/ProvidersController.cs index 25c5a3a80..3b16f2139 100644 --- a/src/Admin/Controllers/ProvidersController.cs +++ b/src/Admin/Controllers/ProvidersController.cs @@ -5,6 +5,7 @@ using Bit.Core.Providers.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings; +using Bit.Core.Tools.Services; using Bit.Core.Utilities; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/src/Admin/Jobs/JobsHostedService.cs b/src/Admin/Jobs/JobsHostedService.cs index cc9aedc80..adba27970 100644 --- a/src/Admin/Jobs/JobsHostedService.cs +++ b/src/Admin/Jobs/JobsHostedService.cs @@ -1,5 +1,6 @@ using System.Runtime.InteropServices; using Bit.Admin.Auth.Jobs; +using Bit.Admin.Tools.Jobs; using Bit.Core.Jobs; using Bit.Core.Settings; using Quartz; diff --git a/src/Admin/Jobs/DeleteSendsJob.cs b/src/Admin/Tools/Jobs/DeleteSendsJob.cs similarity index 92% rename from src/Admin/Jobs/DeleteSendsJob.cs rename to src/Admin/Tools/Jobs/DeleteSendsJob.cs index f26657f20..dafce0399 100644 --- a/src/Admin/Jobs/DeleteSendsJob.cs +++ b/src/Admin/Tools/Jobs/DeleteSendsJob.cs @@ -1,11 +1,11 @@ using Bit.Admin.Auth.Jobs; using Bit.Core; using Bit.Core.Jobs; -using Bit.Core.Repositories; -using Bit.Core.Services; +using Bit.Core.Tools.Repositories; +using Bit.Core.Tools.Services; using Quartz; -namespace Bit.Admin.Jobs; +namespace Bit.Admin.Tools.Jobs; public class DeleteSendsJob : BaseJob { diff --git a/src/Api/Auth/Models/Request/Accounts/UpdateKeyRequestModel.cs b/src/Api/Auth/Models/Request/Accounts/UpdateKeyRequestModel.cs index 102b018fc..625458bcc 100644 --- a/src/Api/Auth/Models/Request/Accounts/UpdateKeyRequestModel.cs +++ b/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; diff --git a/src/Api/Controllers/AccountsController.cs b/src/Api/Controllers/AccountsController.cs index 270d09ff2..c3b4d5bc1 100644 --- a/src/Api/Controllers/AccountsController.cs +++ b/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; diff --git a/src/Api/SecretsManager/Controllers/SecretsController.cs b/src/Api/SecretsManager/Controllers/SecretsController.cs index 5a8ace4f9..dc9f22bf1 100644 --- a/src/Api/SecretsManager/Controllers/SecretsController.cs +++ b/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; diff --git a/src/Api/Controllers/HibpController.cs b/src/Api/Tools/Controllers/HibpController.cs similarity index 98% rename from src/Api/Controllers/HibpController.cs rename to src/Api/Tools/Controllers/HibpController.cs index 517ffb5ef..f12027cb3 100644 --- a/src/Api/Controllers/HibpController.cs +++ b/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")] diff --git a/src/Api/Tools/Controllers/ImportCiphersController.cs b/src/Api/Tools/Controllers/ImportCiphersController.cs new file mode 100644 index 000000000..d3ed7444f --- /dev/null +++ b/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 _logger; + private readonly GlobalSettings _globalSettings; + + public ImportCiphersController( + ICollectionCipherRepository collectionCipherRepository, + ICipherService cipherService, + IUserService userService, + IProviderService providerService, + ICurrentContext currentContext, + ILogger 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); + } +} diff --git a/src/Api/Controllers/SendsController.cs b/src/Api/Tools/Controllers/SendsController.cs similarity index 97% rename from src/Api/Controllers/SendsController.cs rename to src/Api/Tools/Controllers/SendsController.cs index 6d500e24a..f7f3f692a 100644 --- a/src/Api/Controllers/SendsController.cs +++ b/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")] diff --git a/src/Api/Models/Request/Accounts/ImportCiphersRequestModel.cs b/src/Api/Tools/Models/Request/Accounts/ImportCiphersRequestModel.cs similarity index 84% rename from src/Api/Models/Request/Accounts/ImportCiphersRequestModel.cs rename to src/Api/Tools/Models/Request/Accounts/ImportCiphersRequestModel.cs index 30ecedd33..354d73ad0 100644 --- a/src/Api/Models/Request/Accounts/ImportCiphersRequestModel.cs +++ b/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 { diff --git a/src/Api/Models/Request/Organizations/ImportOrganizationCiphersRequestModel.cs b/src/Api/Tools/Models/Request/Organizations/ImportOrganizationCiphersRequestModel.cs similarity index 67% rename from src/Api/Models/Request/Organizations/ImportOrganizationCiphersRequestModel.cs rename to src/Api/Tools/Models/Request/Organizations/ImportOrganizationCiphersRequestModel.cs index 76faa333b..8c88be136 100644 --- a/src/Api/Models/Request/Organizations/ImportOrganizationCiphersRequestModel.cs +++ b/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 { diff --git a/src/Api/Models/Request/SendAccessRequestModel.cs b/src/Api/Tools/Models/Request/SendAccessRequestModel.cs similarity index 79% rename from src/Api/Models/Request/SendAccessRequestModel.cs rename to src/Api/Tools/Models/Request/SendAccessRequestModel.cs index 2a8b3f40a..c29577c2d 100644 --- a/src/Api/Models/Request/SendAccessRequestModel.cs +++ b/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 { diff --git a/src/Api/Models/Request/SendRequestModel.cs b/src/Api/Tools/Models/Request/SendRequestModel.cs similarity index 96% rename from src/Api/Models/Request/SendRequestModel.cs rename to src/Api/Tools/Models/Request/SendRequestModel.cs index 51b15cba3..a68ea28c5 100644 --- a/src/Api/Models/Request/SendRequestModel.cs +++ b/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 { diff --git a/src/Api/Models/Response/SendAccessResponseModel.cs b/src/Api/Tools/Models/Response/SendAccessResponseModel.cs similarity index 91% rename from src/Api/Models/Response/SendAccessResponseModel.cs rename to src/Api/Tools/Models/Response/SendAccessResponseModel.cs index d4620385b..a3bb0f8bc 100644 --- a/src/Api/Models/Response/SendAccessResponseModel.cs +++ b/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 { diff --git a/src/Api/Models/Response/SendFileDownloadDataResponseModel.cs b/src/Api/Tools/Models/Response/SendFileDownloadDataResponseModel.cs similarity index 85% rename from src/Api/Models/Response/SendFileDownloadDataResponseModel.cs rename to src/Api/Tools/Models/Response/SendFileDownloadDataResponseModel.cs index 24e3a53f7..47d5d3a84 100644 --- a/src/Api/Models/Response/SendFileDownloadDataResponseModel.cs +++ b/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 { diff --git a/src/Api/Models/Response/SendFileUploadDataResponseModel.cs b/src/Api/Tools/Models/Response/SendFileUploadDataResponseModel.cs similarity index 89% rename from src/Api/Models/Response/SendFileUploadDataResponseModel.cs rename to src/Api/Tools/Models/Response/SendFileUploadDataResponseModel.cs index 0e7b4997c..aee80de22 100644 --- a/src/Api/Models/Response/SendFileUploadDataResponseModel.cs +++ b/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 { diff --git a/src/Api/Models/Response/SendResponseModel.cs b/src/Api/Tools/Models/Response/SendResponseModel.cs similarity index 94% rename from src/Api/Models/Response/SendResponseModel.cs rename to src/Api/Tools/Models/Response/SendResponseModel.cs index 42552d2a4..0e007f0ac 100644 --- a/src/Api/Models/Response/SendResponseModel.cs +++ b/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 { diff --git a/src/Api/Models/SendFileModel.cs b/src/Api/Tools/Models/SendFileModel.cs similarity index 90% rename from src/Api/Models/SendFileModel.cs rename to src/Api/Tools/Models/SendFileModel.cs index bfe10f86f..4af5b6ed6 100644 --- a/src/Api/Models/SendFileModel.cs +++ b/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 { diff --git a/src/Api/Models/SendTextModel.cs b/src/Api/Tools/Models/SendTextModel.cs similarity index 82% rename from src/Api/Models/SendTextModel.cs rename to src/Api/Tools/Models/SendTextModel.cs index ba2e6f8a6..274e0d537 100644 --- a/src/Api/Models/SendTextModel.cs +++ b/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 { diff --git a/src/Api/Utilities/MultipartFormDataHelper.cs b/src/Api/Utilities/MultipartFormDataHelper.cs index c7ca42d50..a3eb64efb 100644 --- a/src/Api/Utilities/MultipartFormDataHelper.cs +++ b/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; diff --git a/src/Api/Vault/Controllers/CiphersController.cs b/src/Api/Vault/Controllers/CiphersController.cs index 6dd20dc6d..32591c6a2 100644 --- a/src/Api/Vault/Controllers/CiphersController.cs +++ b/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(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 PutPartial(string id, [FromBody] CipherPartialRequestModel model) diff --git a/src/Api/Vault/Controllers/SyncController.cs b/src/Api/Vault/Controllers/SyncController.cs index e16e20075..ec9ab4f96 100644 --- a/src/Api/Vault/Controllers/SyncController.cs +++ b/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; diff --git a/src/Api/Vault/Models/Response/SyncResponseModel.cs b/src/Api/Vault/Models/Response/SyncResponseModel.cs index 096722d61..386b7445b 100644 --- a/src/Api/Vault/Models/Response/SyncResponseModel.cs +++ b/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; diff --git a/src/Billing/Controllers/StripeController.cs b/src/Billing/Controllers/StripeController.cs index f6ecb2ad1..e533bcefc 100644 --- a/src/Billing/Controllers/StripeController.cs +++ b/src/Billing/Controllers/StripeController.cs @@ -1,11 +1,13 @@ using Bit.Billing.Constants; using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.Models.Business; using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings; +using Bit.Core.Tools.Enums; +using Bit.Core.Tools.Models.Business; +using Bit.Core.Tools.Services; using Bit.Core.Utilities; using Microsoft.AspNetCore.Mvc; using Microsoft.Data.SqlClient; diff --git a/src/Core/Entities/Organization.cs b/src/Core/Entities/Organization.cs index 8f1ad49ca..6174da956 100644 --- a/src/Core/Entities/Organization.cs +++ b/src/Core/Entities/Organization.cs @@ -4,6 +4,7 @@ using Bit.Core.Auth.Enums; using Bit.Core.Auth.Models; using Bit.Core.Enums; using Bit.Core.Models.Business; +using Bit.Core.Tools.Entities; using Bit.Core.Utilities; namespace Bit.Core.Entities; diff --git a/src/Core/Entities/User.cs b/src/Core/Entities/User.cs index b850616a6..17c08801a 100644 --- a/src/Core/Entities/User.cs +++ b/src/Core/Entities/User.cs @@ -3,6 +3,7 @@ using System.Text.Json; using Bit.Core.Auth.Enums; using Bit.Core.Auth.Models; using Bit.Core.Enums; +using Bit.Core.Tools.Entities; using Bit.Core.Utilities; using Microsoft.AspNetCore.Identity; diff --git a/src/Core/OrganizationFeatures/Groups/CreateGroupCommand.cs b/src/Core/OrganizationFeatures/Groups/CreateGroupCommand.cs index d8e23d117..f70367b55 100644 --- a/src/Core/OrganizationFeatures/Groups/CreateGroupCommand.cs +++ b/src/Core/OrganizationFeatures/Groups/CreateGroupCommand.cs @@ -1,11 +1,13 @@ using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.Models.Business; using Bit.Core.Models.Data; using Bit.Core.OrganizationFeatures.Groups.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; +using Bit.Core.Tools.Enums; +using Bit.Core.Tools.Models.Business; +using Bit.Core.Tools.Services; namespace Bit.Core.OrganizationFeatures.Groups; diff --git a/src/Core/Services/IPushNotificationService.cs b/src/Core/Services/IPushNotificationService.cs index f85c34884..fcb1c3fda 100644 --- a/src/Core/Services/IPushNotificationService.cs +++ b/src/Core/Services/IPushNotificationService.cs @@ -1,6 +1,6 @@ using Bit.Core.Auth.Entities; -using Bit.Core.Entities; using Bit.Core.Enums; +using Bit.Core.Tools.Entities; using Bit.Core.Vault.Entities; namespace Bit.Core.Services; diff --git a/src/Core/Services/IUserService.cs b/src/Core/Services/IUserService.cs index 09113e792..d0c078d40 100644 --- a/src/Core/Services/IUserService.cs +++ b/src/Core/Services/IUserService.cs @@ -4,6 +4,7 @@ using Bit.Core.Auth.Models; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Models.Business; +using Bit.Core.Tools.Entities; using Bit.Core.Vault.Entities; using Fido2NetLib; using Microsoft.AspNetCore.Identity; diff --git a/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs b/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs index a6833b723..1c0b1cf60 100644 --- a/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs +++ b/src/Core/Services/Implementations/AzureQueuePushNotificationService.cs @@ -2,10 +2,10 @@ using Azure.Storage.Queues; using Bit.Core.Auth.Entities; using Bit.Core.Context; -using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Models; using Bit.Core.Settings; +using Bit.Core.Tools.Entities; using Bit.Core.Utilities; using Bit.Core.Vault.Entities; using Microsoft.AspNetCore.Http; diff --git a/src/Core/Services/Implementations/CollectionService.cs b/src/Core/Services/Implementations/CollectionService.cs index c14020e2d..4dd5c38b9 100644 --- a/src/Core/Services/Implementations/CollectionService.cs +++ b/src/Core/Services/Implementations/CollectionService.cs @@ -1,10 +1,11 @@ using Bit.Core.Context; using Bit.Core.Entities; -using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.Models.Business; using Bit.Core.Models.Data; using Bit.Core.Repositories; +using Bit.Core.Tools.Enums; +using Bit.Core.Tools.Models.Business; +using Bit.Core.Tools.Services; namespace Bit.Core.Services; diff --git a/src/Core/Services/Implementations/MultiServicePushNotificationService.cs b/src/Core/Services/Implementations/MultiServicePushNotificationService.cs index 99a0b557a..7b878bab6 100644 --- a/src/Core/Services/Implementations/MultiServicePushNotificationService.cs +++ b/src/Core/Services/Implementations/MultiServicePushNotificationService.cs @@ -1,8 +1,8 @@ using Bit.Core.Auth.Entities; -using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Repositories; using Bit.Core.Settings; +using Bit.Core.Tools.Entities; using Bit.Core.Utilities; using Bit.Core.Vault.Entities; using Microsoft.AspNetCore.Http; diff --git a/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs b/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs index b5acd6653..ec66660df 100644 --- a/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs +++ b/src/Core/Services/Implementations/NotificationHubPushNotificationService.cs @@ -2,12 +2,12 @@ using System.Text.RegularExpressions; using Bit.Core.Auth.Entities; using Bit.Core.Context; -using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Models; using Bit.Core.Models.Data; using Bit.Core.Repositories; using Bit.Core.Settings; +using Bit.Core.Tools.Entities; using Bit.Core.Vault.Entities; using Microsoft.AspNetCore.Http; using Microsoft.Azure.NotificationHubs; diff --git a/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs b/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs index 3aaa15a27..87dc9b694 100644 --- a/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs +++ b/src/Core/Services/Implementations/NotificationsApiPushNotificationService.cs @@ -1,9 +1,9 @@ using Bit.Core.Auth.Entities; using Bit.Core.Context; -using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Models; using Bit.Core.Settings; +using Bit.Core.Tools.Entities; using Bit.Core.Vault.Entities; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs index 621142558..8830c12a1 100644 --- a/src/Core/Services/Implementations/OrganizationService.cs +++ b/src/Core/Services/Implementations/OrganizationService.cs @@ -14,6 +14,9 @@ using Bit.Core.Models.Data.Organizations.Policies; using Bit.Core.Models.OrganizationConnectionConfigs; using Bit.Core.Repositories; using Bit.Core.Settings; +using Bit.Core.Tools.Enums; +using Bit.Core.Tools.Models.Business; +using Bit.Core.Tools.Services; using Bit.Core.Utilities; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Logging; diff --git a/src/Core/Services/Implementations/RelayPushNotificationService.cs b/src/Core/Services/Implementations/RelayPushNotificationService.cs index 690d57282..4e0858610 100644 --- a/src/Core/Services/Implementations/RelayPushNotificationService.cs +++ b/src/Core/Services/Implementations/RelayPushNotificationService.cs @@ -1,12 +1,12 @@ using Bit.Core.Auth.Entities; using Bit.Core.Context; -using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.IdentityServer; using Bit.Core.Models; using Bit.Core.Models.Api; using Bit.Core.Repositories; using Bit.Core.Settings; +using Bit.Core.Tools.Entities; using Bit.Core.Vault.Entities; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; diff --git a/src/Core/Services/Implementations/UserService.cs b/src/Core/Services/Implementations/UserService.cs index add11bc0f..8aa2dd85c 100644 --- a/src/Core/Services/Implementations/UserService.cs +++ b/src/Core/Services/Implementations/UserService.cs @@ -9,6 +9,10 @@ using Bit.Core.Exceptions; using Bit.Core.Models.Business; using Bit.Core.Repositories; using Bit.Core.Settings; +using Bit.Core.Tools.Entities; +using Bit.Core.Tools.Enums; +using Bit.Core.Tools.Models.Business; +using Bit.Core.Tools.Services; using Bit.Core.Utilities; using Bit.Core.Vault.Entities; using Bit.Core.Vault.Repositories; diff --git a/src/Core/Services/NoopImplementations/NoopPushNotificationService.cs b/src/Core/Services/NoopImplementations/NoopPushNotificationService.cs index 08aea9858..dac84f256 100644 --- a/src/Core/Services/NoopImplementations/NoopPushNotificationService.cs +++ b/src/Core/Services/NoopImplementations/NoopPushNotificationService.cs @@ -1,6 +1,6 @@ using Bit.Core.Auth.Entities; -using Bit.Core.Entities; using Bit.Core.Enums; +using Bit.Core.Tools.Entities; using Bit.Core.Vault.Entities; namespace Bit.Core.Services; diff --git a/src/Core/Entities/IReferenceable.cs b/src/Core/Tools/Entities/IReferenceable.cs similarity index 76% rename from src/Core/Entities/IReferenceable.cs rename to src/Core/Tools/Entities/IReferenceable.cs index 79837781e..39d473c65 100644 --- a/src/Core/Entities/IReferenceable.cs +++ b/src/Core/Tools/Entities/IReferenceable.cs @@ -1,4 +1,4 @@ -namespace Bit.Core.Entities; +namespace Bit.Core.Tools.Entities; public interface IReferenceable { diff --git a/src/Core/Entities/Send.cs b/src/Core/Tools/Entities/Send.cs similarity index 91% rename from src/Core/Entities/Send.cs rename to src/Core/Tools/Entities/Send.cs index 7cc8f3b25..ae30201e8 100644 --- a/src/Core/Entities/Send.cs +++ b/src/Core/Tools/Entities/Send.cs @@ -1,8 +1,9 @@ using System.ComponentModel.DataAnnotations; -using Bit.Core.Enums; +using Bit.Core.Entities; +using Bit.Core.Tools.Enums; using Bit.Core.Utilities; -namespace Bit.Core.Entities; +namespace Bit.Core.Tools.Entities; public class Send : ITableObject { diff --git a/src/Core/Enums/ReferenceEventSource.cs b/src/Core/Tools/Enums/ReferenceEventSource.cs similarity index 84% rename from src/Core/Enums/ReferenceEventSource.cs rename to src/Core/Tools/Enums/ReferenceEventSource.cs index 3d7ad85ff..6f2bd7273 100644 --- a/src/Core/Enums/ReferenceEventSource.cs +++ b/src/Core/Tools/Enums/ReferenceEventSource.cs @@ -1,6 +1,6 @@ using System.Runtime.Serialization; -namespace Bit.Core.Enums; +namespace Bit.Core.Tools.Enums; public enum ReferenceEventSource { diff --git a/src/Core/Enums/ReferenceEventType.cs b/src/Core/Tools/Enums/ReferenceEventType.cs similarity index 97% rename from src/Core/Enums/ReferenceEventType.cs rename to src/Core/Tools/Enums/ReferenceEventType.cs index 65f3918ff..a8a52e631 100644 --- a/src/Core/Enums/ReferenceEventType.cs +++ b/src/Core/Tools/Enums/ReferenceEventType.cs @@ -1,6 +1,6 @@ using System.Runtime.Serialization; -namespace Bit.Core.Enums; +namespace Bit.Core.Tools.Enums; public enum ReferenceEventType { diff --git a/src/Core/Enums/SendType.cs b/src/Core/Tools/Enums/SendType.cs similarity index 63% rename from src/Core/Enums/SendType.cs rename to src/Core/Tools/Enums/SendType.cs index ce59df6b3..cd8f53292 100644 --- a/src/Core/Enums/SendType.cs +++ b/src/Core/Tools/Enums/SendType.cs @@ -1,4 +1,4 @@ -namespace Bit.Core.Enums; +namespace Bit.Core.Tools.Enums; public enum SendType : byte { diff --git a/src/Core/Models/Business/ReferenceEvent.cs b/src/Core/Tools/Models/Business/ReferenceEvent.cs similarity index 93% rename from src/Core/Models/Business/ReferenceEvent.cs rename to src/Core/Tools/Models/Business/ReferenceEvent.cs index 4f20b2455..6dc974c24 100644 --- a/src/Core/Models/Business/ReferenceEvent.cs +++ b/src/Core/Tools/Models/Business/ReferenceEvent.cs @@ -1,8 +1,9 @@ using System.Text.Json.Serialization; -using Bit.Core.Entities; using Bit.Core.Enums; +using Bit.Core.Tools.Entities; +using Bit.Core.Tools.Enums; -namespace Bit.Core.Models.Business; +namespace Bit.Core.Tools.Models.Business; public class ReferenceEvent { diff --git a/src/Core/Models/Data/SendData.cs b/src/Core/Tools/Models/Data/SendData.cs similarity index 85% rename from src/Core/Models/Data/SendData.cs rename to src/Core/Tools/Models/Data/SendData.cs index 7210caae6..bdddb8482 100644 --- a/src/Core/Models/Data/SendData.cs +++ b/src/Core/Tools/Models/Data/SendData.cs @@ -1,4 +1,4 @@ -namespace Bit.Core.Models.Data; +namespace Bit.Core.Tools.Models.Data; public abstract class SendData { diff --git a/src/Core/Models/Data/SendFileData.cs b/src/Core/Tools/Models/Data/SendFileData.cs similarity index 94% rename from src/Core/Models/Data/SendFileData.cs rename to src/Core/Tools/Models/Data/SendFileData.cs index 253ee01ce..6cf1fa3da 100644 --- a/src/Core/Models/Data/SendFileData.cs +++ b/src/Core/Tools/Models/Data/SendFileData.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Bit.Core.Models.Data; +namespace Bit.Core.Tools.Models.Data; public class SendFileData : SendData { diff --git a/src/Core/Models/Data/SendTextData.cs b/src/Core/Tools/Models/Data/SendTextData.cs similarity index 88% rename from src/Core/Models/Data/SendTextData.cs rename to src/Core/Tools/Models/Data/SendTextData.cs index 2aa6d0481..41c6b042a 100644 --- a/src/Core/Models/Data/SendTextData.cs +++ b/src/Core/Tools/Models/Data/SendTextData.cs @@ -1,4 +1,4 @@ -namespace Bit.Core.Models.Data; +namespace Bit.Core.Tools.Models.Data; public class SendTextData : SendData { diff --git a/src/Core/Repositories/ISendRepository.cs b/src/Core/Tools/Repositories/ISendRepository.cs similarity index 67% rename from src/Core/Repositories/ISendRepository.cs rename to src/Core/Tools/Repositories/ISendRepository.cs index b35a059d3..3d67c990f 100644 --- a/src/Core/Repositories/ISendRepository.cs +++ b/src/Core/Tools/Repositories/ISendRepository.cs @@ -1,6 +1,7 @@ -using Bit.Core.Entities; +using Bit.Core.Repositories; +using Bit.Core.Tools.Entities; -namespace Bit.Core.Repositories; +namespace Bit.Core.Tools.Repositories; public interface ISendRepository : IRepository { diff --git a/src/Core/Services/IReferenceEventService.cs b/src/Core/Tools/Services/IReferenceEventService.cs similarity index 57% rename from src/Core/Services/IReferenceEventService.cs rename to src/Core/Tools/Services/IReferenceEventService.cs index 03339f08c..d8fe12b5c 100644 --- a/src/Core/Services/IReferenceEventService.cs +++ b/src/Core/Tools/Services/IReferenceEventService.cs @@ -1,6 +1,6 @@ -using Bit.Core.Models.Business; +using Bit.Core.Tools.Models.Business; -namespace Bit.Core.Services; +namespace Bit.Core.Tools.Services; public interface IReferenceEventService { diff --git a/src/Core/Services/ISendService.cs b/src/Core/Tools/Services/ISendService.cs similarity index 83% rename from src/Core/Services/ISendService.cs rename to src/Core/Tools/Services/ISendService.cs index a2b6b8c35..2c20851ce 100644 --- a/src/Core/Services/ISendService.cs +++ b/src/Core/Tools/Services/ISendService.cs @@ -1,7 +1,7 @@ -using Bit.Core.Entities; -using Bit.Core.Models.Data; +using Bit.Core.Tools.Entities; +using Bit.Core.Tools.Models.Data; -namespace Bit.Core.Services; +namespace Bit.Core.Tools.Services; public interface ISendService { diff --git a/src/Core/Services/ISendStorageService.cs b/src/Core/Tools/Services/ISendStorageService.cs similarity index 86% rename from src/Core/Services/ISendStorageService.cs rename to src/Core/Tools/Services/ISendStorageService.cs index 63c0d44ca..4bf2aa389 100644 --- a/src/Core/Services/ISendStorageService.cs +++ b/src/Core/Tools/Services/ISendStorageService.cs @@ -1,7 +1,7 @@ -using Bit.Core.Entities; -using Bit.Core.Enums; +using Bit.Core.Enums; +using Bit.Core.Tools.Entities; -namespace Bit.Core.Services; +namespace Bit.Core.Tools.Services; public interface ISendFileStorageService { diff --git a/src/Core/Services/Implementations/AzureQueueReferenceEventService.cs b/src/Core/Tools/Services/Implementations/AzureQueueReferenceEventService.cs similarity index 94% rename from src/Core/Services/Implementations/AzureQueueReferenceEventService.cs rename to src/Core/Tools/Services/Implementations/AzureQueueReferenceEventService.cs index 6abbe9783..52769bdaf 100644 --- a/src/Core/Services/Implementations/AzureQueueReferenceEventService.cs +++ b/src/Core/Tools/Services/Implementations/AzureQueueReferenceEventService.cs @@ -1,11 +1,11 @@ using System.Text; using System.Text.Json; using Azure.Storage.Queues; -using Bit.Core.Models.Business; using Bit.Core.Settings; +using Bit.Core.Tools.Models.Business; using Bit.Core.Utilities; -namespace Bit.Core.Services; +namespace Bit.Core.Tools.Services; public class AzureQueueReferenceEventService : IReferenceEventService { diff --git a/src/Core/Services/Implementations/AzureSendFileStorageService.cs b/src/Core/Tools/Services/Implementations/AzureSendFileStorageService.cs similarity index 98% rename from src/Core/Services/Implementations/AzureSendFileStorageService.cs rename to src/Core/Tools/Services/Implementations/AzureSendFileStorageService.cs index d1d7822f2..09f3be29e 100644 --- a/src/Core/Services/Implementations/AzureSendFileStorageService.cs +++ b/src/Core/Tools/Services/Implementations/AzureSendFileStorageService.cs @@ -1,12 +1,12 @@ using Azure.Storage.Blobs; using Azure.Storage.Blobs.Models; using Azure.Storage.Sas; -using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Settings; +using Bit.Core.Tools.Entities; using Microsoft.Extensions.Logging; -namespace Bit.Core.Services; +namespace Bit.Core.Tools.Services; public class AzureSendFileStorageService : ISendFileStorageService { diff --git a/src/Core/Services/Implementations/LocalSendStorageService.cs b/src/Core/Tools/Services/Implementations/LocalSendStorageService.cs similarity index 96% rename from src/Core/Services/Implementations/LocalSendStorageService.cs rename to src/Core/Tools/Services/Implementations/LocalSendStorageService.cs index 30872cbcc..c205028d9 100644 --- a/src/Core/Services/Implementations/LocalSendStorageService.cs +++ b/src/Core/Tools/Services/Implementations/LocalSendStorageService.cs @@ -1,8 +1,8 @@ -using Bit.Core.Entities; -using Bit.Core.Enums; +using Bit.Core.Enums; using Bit.Core.Settings; +using Bit.Core.Tools.Entities; -namespace Bit.Core.Services; +namespace Bit.Core.Tools.Services; public class LocalSendStorageService : ISendFileStorageService { diff --git a/src/Core/Services/Implementations/SendService.cs b/src/Core/Tools/Services/Implementations/SendService.cs similarity index 98% rename from src/Core/Services/Implementations/SendService.cs rename to src/Core/Tools/Services/Implementations/SendService.cs index f16f2da41..b012d2344 100644 --- a/src/Core/Services/Implementations/SendService.cs +++ b/src/Core/Tools/Services/Implementations/SendService.cs @@ -3,15 +3,19 @@ using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.Models.Business; -using Bit.Core.Models.Data; using Bit.Core.Models.Data.Organizations.Policies; 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.Business; +using Bit.Core.Tools.Models.Data; +using Bit.Core.Tools.Repositories; using Bit.Core.Utilities; using Microsoft.AspNetCore.Identity; -namespace Bit.Core.Services; +namespace Bit.Core.Tools.Services; public class SendService : ISendService { diff --git a/src/Core/Services/NoopImplementations/NoopReferenceEventService.cs b/src/Core/Tools/Services/NoopImplementations/NoopReferenceEventService.cs similarity index 70% rename from src/Core/Services/NoopImplementations/NoopReferenceEventService.cs rename to src/Core/Tools/Services/NoopImplementations/NoopReferenceEventService.cs index a32001e85..aecdf4a80 100644 --- a/src/Core/Services/NoopImplementations/NoopReferenceEventService.cs +++ b/src/Core/Tools/Services/NoopImplementations/NoopReferenceEventService.cs @@ -1,6 +1,6 @@ -using Bit.Core.Models.Business; +using Bit.Core.Tools.Models.Business; -namespace Bit.Core.Services; +namespace Bit.Core.Tools.Services; public class NoopReferenceEventService : IReferenceEventService { diff --git a/src/Core/Services/NoopImplementations/NoopSendFileStorageService.cs b/src/Core/Tools/Services/NoopImplementations/NoopSendFileStorageService.cs similarity index 91% rename from src/Core/Services/NoopImplementations/NoopSendFileStorageService.cs rename to src/Core/Tools/Services/NoopImplementations/NoopSendFileStorageService.cs index 08602ef9f..4fb841e7a 100644 --- a/src/Core/Services/NoopImplementations/NoopSendFileStorageService.cs +++ b/src/Core/Tools/Services/NoopImplementations/NoopSendFileStorageService.cs @@ -1,7 +1,7 @@ -using Bit.Core.Entities; -using Bit.Core.Enums; +using Bit.Core.Enums; +using Bit.Core.Tools.Entities; -namespace Bit.Core.Services; +namespace Bit.Core.Tools.Services; public class NoopSendFileStorageService : ISendFileStorageService { diff --git a/src/Core/Vault/Repositories/ICipherRepository.cs b/src/Core/Vault/Repositories/ICipherRepository.cs index 4ffd2545d..3df130aa8 100644 --- a/src/Core/Vault/Repositories/ICipherRepository.cs +++ b/src/Core/Vault/Repositories/ICipherRepository.cs @@ -1,5 +1,6 @@ using Bit.Core.Entities; using Bit.Core.Repositories; +using Bit.Core.Tools.Entities; using Bit.Core.Vault.Entities; using Bit.Core.Vault.Models.Data; diff --git a/src/Core/Vault/Services/Implementations/CipherService.cs b/src/Core/Vault/Services/Implementations/CipherService.cs index c50f10d8f..53254dc73 100644 --- a/src/Core/Vault/Services/Implementations/CipherService.cs +++ b/src/Core/Vault/Services/Implementations/CipherService.cs @@ -3,10 +3,12 @@ using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.Models.Business; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings; +using Bit.Core.Tools.Enums; +using Bit.Core.Tools.Models.Business; +using Bit.Core.Tools.Services; using Bit.Core.Utilities; using Bit.Core.Vault.Entities; using Bit.Core.Vault.Models.Data; diff --git a/src/Infrastructure.Dapper/DapperServiceCollectionExtensions.cs b/src/Infrastructure.Dapper/DapperServiceCollectionExtensions.cs index bd2b81769..d7082184d 100644 --- a/src/Infrastructure.Dapper/DapperServiceCollectionExtensions.cs +++ b/src/Infrastructure.Dapper/DapperServiceCollectionExtensions.cs @@ -1,10 +1,12 @@ using Bit.Core.Auth.Repositories; using Bit.Core.Repositories; using Bit.Core.SecretsManager.Repositories; +using Bit.Core.Tools.Repositories; using Bit.Core.Vault.Repositories; using Bit.Infrastructure.Dapper.Auth.Repositories; using Bit.Infrastructure.Dapper.Repositories; using Bit.Infrastructure.Dapper.SecretsManager.Repositories; +using Bit.Infrastructure.Dapper.Tools.Repositories; using Bit.Infrastructure.Dapper.Vault.Repositories; using Microsoft.Extensions.DependencyInjection; diff --git a/src/Infrastructure.Dapper/Repositories/SendRepository.cs b/src/Infrastructure.Dapper/Tools/Repositories/SendRepository.cs similarity index 89% rename from src/Infrastructure.Dapper/Repositories/SendRepository.cs rename to src/Infrastructure.Dapper/Tools/Repositories/SendRepository.cs index bd23175f1..24cdcbf77 100644 --- a/src/Infrastructure.Dapper/Repositories/SendRepository.cs +++ b/src/Infrastructure.Dapper/Tools/Repositories/SendRepository.cs @@ -1,11 +1,12 @@ using System.Data; -using Bit.Core.Entities; -using Bit.Core.Repositories; using Bit.Core.Settings; +using Bit.Core.Tools.Entities; +using Bit.Core.Tools.Repositories; +using Bit.Infrastructure.Dapper.Repositories; using Dapper; using Microsoft.Data.SqlClient; -namespace Bit.Infrastructure.Dapper.Repositories; +namespace Bit.Infrastructure.Dapper.Tools.Repositories; public class SendRepository : Repository, ISendRepository { diff --git a/src/Infrastructure.Dapper/Vault/Repositories/CipherRepository.cs b/src/Infrastructure.Dapper/Vault/Repositories/CipherRepository.cs index 6b7ff9771..31b8b10f5 100644 --- a/src/Infrastructure.Dapper/Vault/Repositories/CipherRepository.cs +++ b/src/Infrastructure.Dapper/Vault/Repositories/CipherRepository.cs @@ -2,6 +2,7 @@ using System.Text.Json; using Bit.Core.Entities; using Bit.Core.Settings; +using Bit.Core.Tools.Entities; using Bit.Core.Vault.Entities; using Bit.Core.Vault.Models.Data; using Bit.Core.Vault.Repositories; diff --git a/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs b/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs index b21bb5eca..74716e207 100644 --- a/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs +++ b/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs @@ -2,10 +2,12 @@ using Bit.Core.Enums; using Bit.Core.Repositories; using Bit.Core.SecretsManager.Repositories; +using Bit.Core.Tools.Repositories; using Bit.Core.Vault.Repositories; using Bit.Infrastructure.EntityFramework.Auth.Repositories; using Bit.Infrastructure.EntityFramework.Repositories; using Bit.Infrastructure.EntityFramework.SecretsManager.Repositories; +using Bit.Infrastructure.EntityFramework.Tools.Repositories; using Bit.Infrastructure.EntityFramework.Vault.Repositories; using LinqToDB.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; diff --git a/src/Infrastructure.EntityFramework/Models/Send.cs b/src/Infrastructure.EntityFramework/Tools/Models/Send.cs similarity index 70% rename from src/Infrastructure.EntityFramework/Models/Send.cs rename to src/Infrastructure.EntityFramework/Tools/Models/Send.cs index 13bfbb61b..dbb55cd9c 100644 --- a/src/Infrastructure.EntityFramework/Models/Send.cs +++ b/src/Infrastructure.EntityFramework/Tools/Models/Send.cs @@ -2,7 +2,7 @@ namespace Bit.Infrastructure.EntityFramework.Models; -public class Send : Core.Entities.Send +public class Send : Core.Tools.Entities.Send { public virtual Organization Organization { get; set; } public virtual User User { get; set; } @@ -12,6 +12,6 @@ public class SendMapperProfile : Profile { public SendMapperProfile() { - CreateMap().ReverseMap(); + CreateMap().ReverseMap(); } } diff --git a/src/Infrastructure.EntityFramework/Repositories/SendRepository.cs b/src/Infrastructure.EntityFramework/Tools/Repositories/SendRepository.cs similarity index 65% rename from src/Infrastructure.EntityFramework/Repositories/SendRepository.cs rename to src/Infrastructure.EntityFramework/Tools/Repositories/SendRepository.cs index 365071a40..3207ec9e9 100644 --- a/src/Infrastructure.EntityFramework/Repositories/SendRepository.cs +++ b/src/Infrastructure.EntityFramework/Tools/Repositories/SendRepository.cs @@ -1,18 +1,19 @@ using AutoMapper; -using Bit.Core.Repositories; +using Bit.Core.Tools.Repositories; using Bit.Infrastructure.EntityFramework.Models; +using Bit.Infrastructure.EntityFramework.Repositories; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; -namespace Bit.Infrastructure.EntityFramework.Repositories; +namespace Bit.Infrastructure.EntityFramework.Tools.Repositories; -public class SendRepository : Repository, ISendRepository +public class SendRepository : Repository, ISendRepository { public SendRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper) : base(serviceScopeFactory, mapper, (DatabaseContext context) => context.Sends) { } - public override async Task CreateAsync(Core.Entities.Send send) + public override async Task CreateAsync(Core.Tools.Entities.Send send) { send = await base.CreateAsync(send); using (var scope = ServiceScopeFactory.CreateScope()) @@ -29,23 +30,23 @@ public class SendRepository : Repository, ISendR return send; } - public async Task> GetManyByDeletionDateAsync(DateTime deletionDateBefore) + public async Task> GetManyByDeletionDateAsync(DateTime deletionDateBefore) { using (var scope = ServiceScopeFactory.CreateScope()) { var dbContext = GetDatabaseContext(scope); var results = await dbContext.Sends.Where(s => s.DeletionDate < deletionDateBefore).ToListAsync(); - return Mapper.Map>(results); + return Mapper.Map>(results); } } - public async Task> GetManyByUserIdAsync(Guid userId) + public async Task> GetManyByUserIdAsync(Guid userId) { using (var scope = ServiceScopeFactory.CreateScope()) { var dbContext = GetDatabaseContext(scope); var results = await dbContext.Sends.Where(s => s.UserId == userId).ToListAsync(); - return Mapper.Map>(results); + return Mapper.Map>(results); } } } diff --git a/src/Infrastructure.EntityFramework/Vault/Repositories/CipherRepository.cs b/src/Infrastructure.EntityFramework/Vault/Repositories/CipherRepository.cs index fa847ebae..00924c6b6 100644 --- a/src/Infrastructure.EntityFramework/Vault/Repositories/CipherRepository.cs +++ b/src/Infrastructure.EntityFramework/Vault/Repositories/CipherRepository.cs @@ -771,7 +771,7 @@ public class CipherRepository : Repository ciphers, IEnumerable folders, IEnumerable sends) + public async Task UpdateUserKeysAndCiphersAsync(User user, IEnumerable ciphers, IEnumerable folders, IEnumerable sends) { using (var scope = ServiceScopeFactory.CreateScope()) { diff --git a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs index a24703fd9..fbea8faa9 100644 --- a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs +++ b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs @@ -19,6 +19,7 @@ using Bit.Core.Resources; using Bit.Core.Services; using Bit.Core.Settings; using Bit.Core.Tokens; +using Bit.Core.Tools.Services; using Bit.Core.Utilities; using Bit.Core.Vault.Services; using Bit.Infrastructure.Dapper; diff --git a/src/Sql/Sql.sqlproj b/src/Sql/Sql.sqlproj index 19f7ef3ae..bdc16b896 100644 --- a/src/Sql/Sql.sqlproj +++ b/src/Sql/Sql.sqlproj @@ -1,5 +1,6 @@  - + Debug @@ -79,6 +80,11 @@ + + + + + @@ -86,6 +92,7 @@ + @@ -322,12 +329,6 @@ - - - - - - @@ -387,7 +388,6 @@ - @@ -418,7 +418,6 @@ - @@ -433,6 +432,14 @@ + + + + + + + + diff --git a/src/Sql/dbo/Stored Procedures/Send_Create.sql b/src/Sql/Tools/dbo/Stored Procedures/Send_Create.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/Send_Create.sql rename to src/Sql/Tools/dbo/Stored Procedures/Send_Create.sql diff --git a/src/Sql/dbo/Stored Procedures/Send_DeleteById.sql b/src/Sql/Tools/dbo/Stored Procedures/Send_DeleteById.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/Send_DeleteById.sql rename to src/Sql/Tools/dbo/Stored Procedures/Send_DeleteById.sql diff --git a/src/Sql/dbo/Stored Procedures/Send_ReadByDeletionDateBefore.sql b/src/Sql/Tools/dbo/Stored Procedures/Send_ReadByDeletionDateBefore.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/Send_ReadByDeletionDateBefore.sql rename to src/Sql/Tools/dbo/Stored Procedures/Send_ReadByDeletionDateBefore.sql diff --git a/src/Sql/dbo/Stored Procedures/Send_ReadById.sql b/src/Sql/Tools/dbo/Stored Procedures/Send_ReadById.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/Send_ReadById.sql rename to src/Sql/Tools/dbo/Stored Procedures/Send_ReadById.sql diff --git a/src/Sql/dbo/Stored Procedures/Send_ReadByUserId.sql b/src/Sql/Tools/dbo/Stored Procedures/Send_ReadByUserId.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/Send_ReadByUserId.sql rename to src/Sql/Tools/dbo/Stored Procedures/Send_ReadByUserId.sql diff --git a/src/Sql/dbo/Stored Procedures/Send_Update.sql b/src/Sql/Tools/dbo/Stored Procedures/Send_Update.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/Send_Update.sql rename to src/Sql/Tools/dbo/Stored Procedures/Send_Update.sql diff --git a/src/Sql/dbo/Tables/Send.sql b/src/Sql/Tools/dbo/Tables/Send.sql similarity index 100% rename from src/Sql/dbo/Tables/Send.sql rename to src/Sql/Tools/dbo/Tables/Send.sql diff --git a/src/Sql/dbo/Views/SendView.sql b/src/Sql/Tools/dbo/Views/SendView.sql similarity index 100% rename from src/Sql/dbo/Views/SendView.sql rename to src/Sql/Tools/dbo/Views/SendView.sql diff --git a/test/Api.Test/Controllers/AccountsControllerTests.cs b/test/Api.Test/Controllers/AccountsControllerTests.cs index aea58d5b9..0dff6db93 100644 --- a/test/Api.Test/Controllers/AccountsControllerTests.cs +++ b/test/Api.Test/Controllers/AccountsControllerTests.cs @@ -10,6 +10,8 @@ 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.Tools.Services; using Bit.Core.Vault.Repositories; using Microsoft.AspNetCore.Identity; using NSubstitute; diff --git a/test/Api.Test/Controllers/SendsControllerTests.cs b/test/Api.Test/Tools/Controllers/SendsControllerTests.cs similarity index 93% rename from test/Api.Test/Controllers/SendsControllerTests.cs rename to test/Api.Test/Tools/Controllers/SendsControllerTests.cs index 6509906cc..f784448e5 100644 --- a/test/Api.Test/Controllers/SendsControllerTests.cs +++ b/test/Api.Test/Tools/Controllers/SendsControllerTests.cs @@ -1,22 +1,24 @@ using System.Text.Json; using AutoFixture.Xunit2; -using Bit.Api.Controllers; -using Bit.Api.Models.Request; -using Bit.Api.Models.Response; +using Bit.Api.Tools.Controllers; +using Bit.Api.Tools.Models.Request; +using Bit.Api.Tools.Models.Response; using Bit.Core.Context; using Bit.Core.Entities; -using Bit.Core.Enums; using Bit.Core.Exceptions; -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.Repositories; +using Bit.Core.Tools.Services; using Bit.Core.Utilities; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using NSubstitute; using Xunit; -namespace Bit.Api.Test.Controllers; +namespace Bit.Api.Test.Tools.Controllers; public class SendsControllerTests : IDisposable { diff --git a/test/Api.Test/Models/Request/SendRequestModelTests.cs b/test/Api.Test/Tools/Models/Request/SendRequestModelTests.cs similarity index 93% rename from test/Api.Test/Models/Request/SendRequestModelTests.cs rename to test/Api.Test/Tools/Models/Request/SendRequestModelTests.cs index 7ad858d2e..99c4b929e 100644 --- a/test/Api.Test/Models/Request/SendRequestModelTests.cs +++ b/test/Api.Test/Tools/Models/Request/SendRequestModelTests.cs @@ -1,12 +1,11 @@ using System.Text.Json; -using Bit.Api.Models; -using Bit.Api.Models.Request; -using Bit.Core.Enums; -using Bit.Core.Services; +using Bit.Api.Tools.Models; +using Bit.Api.Tools.Models.Request; +using Bit.Core.Tools.Enums; +using Bit.Core.Tools.Services; using Bit.Test.Common.Helpers; using NSubstitute; using Xunit; - namespace Bit.Api.Test.Models.Request; public class SendRequestModelTests diff --git a/test/Api.Test/Vault/Controllers/SyncControllerTests.cs b/test/Api.Test/Vault/Controllers/SyncControllerTests.cs index c21bc38ab..d27a41ece 100644 --- a/test/Api.Test/Vault/Controllers/SyncControllerTests.cs +++ b/test/Api.Test/Vault/Controllers/SyncControllerTests.cs @@ -11,6 +11,8 @@ using Bit.Core.Models.Data; using Bit.Core.Models.Data.Organizations.OrganizationUsers; using Bit.Core.Repositories; using Bit.Core.Services; +using Bit.Core.Tools.Entities; +using Bit.Core.Tools.Repositories; using Bit.Core.Utilities; using Bit.Core.Vault.Entities; using Bit.Core.Vault.Models.Data; diff --git a/test/Core.Test/OrganizationFeatures/Groups/CreateGroupCommandTests.cs b/test/Core.Test/OrganizationFeatures/Groups/CreateGroupCommandTests.cs index 6aefb31a1..92011e49f 100644 --- a/test/Core.Test/OrganizationFeatures/Groups/CreateGroupCommandTests.cs +++ b/test/Core.Test/OrganizationFeatures/Groups/CreateGroupCommandTests.cs @@ -1,12 +1,14 @@ using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.Models.Business; using Bit.Core.Models.Data; using Bit.Core.OrganizationFeatures.Groups; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Test.AutoFixture.OrganizationFixtures; +using Bit.Core.Tools.Enums; +using Bit.Core.Tools.Models.Business; +using Bit.Core.Tools.Services; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; using Bit.Test.Common.Helpers; diff --git a/test/Core.Test/Services/OrganizationServiceTests.cs b/test/Core.Test/Services/OrganizationServiceTests.cs index 9f834aced..aae8e98ad 100644 --- a/test/Core.Test/Services/OrganizationServiceTests.cs +++ b/test/Core.Test/Services/OrganizationServiceTests.cs @@ -16,6 +16,9 @@ using Bit.Core.Settings; using Bit.Core.Test.AutoFixture.OrganizationFixtures; using Bit.Core.Test.AutoFixture.OrganizationUserFixtures; using Bit.Core.Test.AutoFixture.PolicyFixtures; +using Bit.Core.Tools.Enums; +using Bit.Core.Tools.Models.Business; +using Bit.Core.Tools.Services; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; using NSubstitute; diff --git a/test/Core.Test/AutoFixture/SendFixtures.cs b/test/Core.Test/Tools/AutoFixture/SendFixtures.cs similarity index 85% rename from test/Core.Test/AutoFixture/SendFixtures.cs rename to test/Core.Test/Tools/AutoFixture/SendFixtures.cs index 102a4bb5b..c8005f4fa 100644 --- a/test/Core.Test/AutoFixture/SendFixtures.cs +++ b/test/Core.Test/Tools/AutoFixture/SendFixtures.cs @@ -1,8 +1,8 @@ using AutoFixture; -using Bit.Core.Entities; +using Bit.Core.Tools.Entities; using Bit.Test.Common.AutoFixture.Attributes; -namespace Bit.Core.Test.AutoFixture.SendFixtures; +namespace Bit.Core.Test.Tools.AutoFixture.SendFixtures; internal class UserSend : ICustomization { diff --git a/test/Core.Test/Models/Data/SendFileDataTests.cs b/test/Core.Test/Tools/Models/Data/SendFileDataTests.cs similarity index 88% rename from test/Core.Test/Models/Data/SendFileDataTests.cs rename to test/Core.Test/Tools/Models/Data/SendFileDataTests.cs index 6f2afe748..9abc61410 100644 --- a/test/Core.Test/Models/Data/SendFileDataTests.cs +++ b/test/Core.Test/Tools/Models/Data/SendFileDataTests.cs @@ -1,9 +1,9 @@ using System.Text.Json; -using Bit.Core.Models.Data; +using Bit.Core.Tools.Models.Data; using Bit.Test.Common.Helpers; using Xunit; -namespace Bit.Core.Test.Models.Data; +namespace Bit.Core.Test.Tools.Models.Data; public class SendFileDataTests { diff --git a/test/Core.Test/Services/SendServiceTests.cs b/test/Core.Test/Tools/Services/SendServiceTests.cs similarity index 98% rename from test/Core.Test/Services/SendServiceTests.cs rename to test/Core.Test/Tools/Services/SendServiceTests.cs index 6bbf63396..1c573e971 100644 --- a/test/Core.Test/Services/SendServiceTests.cs +++ b/test/Core.Test/Tools/Services/SendServiceTests.cs @@ -3,20 +3,24 @@ using System.Text.Json; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.Models.Data; using Bit.Core.Models.Data.Organizations.Policies; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Test.AutoFixture.CurrentContextFixtures; -using Bit.Core.Test.AutoFixture.SendFixtures; using Bit.Core.Test.Entities; +using Bit.Core.Test.Tools.AutoFixture.SendFixtures; +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.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; using Microsoft.AspNetCore.Identity; using NSubstitute; using Xunit; -namespace Bit.Core.Test.Services; +namespace Bit.Core.Test.Tools.Services; [SutProviderCustomize] [CurrentContextCustomize] diff --git a/test/Infrastructure.EFIntegration.Test/AutoFixture/SendFixtures.cs b/test/Infrastructure.EFIntegration.Test/Tools/AutoFixture/SendFixtures.cs similarity index 91% rename from test/Infrastructure.EFIntegration.Test/AutoFixture/SendFixtures.cs rename to test/Infrastructure.EFIntegration.Test/Tools/AutoFixture/SendFixtures.cs index 162bdf6e5..b4e4710d7 100644 --- a/test/Infrastructure.EFIntegration.Test/AutoFixture/SendFixtures.cs +++ b/test/Infrastructure.EFIntegration.Test/Tools/AutoFixture/SendFixtures.cs @@ -1,13 +1,15 @@ using AutoFixture; using AutoFixture.Kernel; -using Bit.Core.Entities; using Bit.Core.Test.AutoFixture.UserFixtures; +using Bit.Core.Tools.Entities; +using Bit.Infrastructure.EFIntegration.Test.AutoFixture; using Bit.Infrastructure.EFIntegration.Test.AutoFixture.Relays; using Bit.Infrastructure.EntityFramework.Repositories; +using Bit.Infrastructure.EntityFramework.Tools.Repositories; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; -namespace Bit.Infrastructure.EFIntegration.Test.AutoFixture; +namespace Bit.Infrastructure.EFIntegration.Test.Tools.AutoFixture; internal class SendBuilder : ISpecimenBuilder { diff --git a/test/Infrastructure.EFIntegration.Test/Repositories/EqualityComparers/SendCompare.cs b/test/Infrastructure.EFIntegration.Test/Tools/Repositories/EqualityComparers/SendCompare.cs similarity index 85% rename from test/Infrastructure.EFIntegration.Test/Repositories/EqualityComparers/SendCompare.cs rename to test/Infrastructure.EFIntegration.Test/Tools/Repositories/EqualityComparers/SendCompare.cs index b4723051c..bc10b6e5b 100644 --- a/test/Infrastructure.EFIntegration.Test/Repositories/EqualityComparers/SendCompare.cs +++ b/test/Infrastructure.EFIntegration.Test/Tools/Repositories/EqualityComparers/SendCompare.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; -using Bit.Core.Entities; +using Bit.Core.Tools.Entities; -namespace Bit.Infrastructure.EFIntegration.Test.Repositories.EqualityComparers; +namespace Bit.Infrastructure.EFIntegration.Test.Tools.Repositories.EqualityComparers; public class SendCompare : IEqualityComparer { diff --git a/test/Infrastructure.EFIntegration.Test/Repositories/SendRepositoryTests.cs b/test/Infrastructure.EFIntegration.Test/Tools/Repositories/SendRepositoryTests.cs similarity index 80% rename from test/Infrastructure.EFIntegration.Test/Repositories/SendRepositoryTests.cs rename to test/Infrastructure.EFIntegration.Test/Tools/Repositories/SendRepositoryTests.cs index 628b5562c..c9e276d45 100644 --- a/test/Infrastructure.EFIntegration.Test/Repositories/SendRepositoryTests.cs +++ b/test/Infrastructure.EFIntegration.Test/Tools/Repositories/SendRepositoryTests.cs @@ -1,12 +1,15 @@ using Bit.Core.Entities; using Bit.Core.Test.AutoFixture.Attributes; -using Bit.Infrastructure.EFIntegration.Test.AutoFixture; -using Bit.Infrastructure.EFIntegration.Test.Repositories.EqualityComparers; +using Bit.Core.Tools.Entities; +using Bit.Infrastructure.EFIntegration.Test.Tools.AutoFixture; +using Bit.Infrastructure.EFIntegration.Test.Tools.Repositories.EqualityComparers; using Xunit; using EfRepo = Bit.Infrastructure.EntityFramework.Repositories; +using EfSendRepo = Bit.Infrastructure.EntityFramework.Tools.Repositories; using SqlRepo = Bit.Infrastructure.Dapper.Repositories; +using SqlSendRepo = Bit.Infrastructure.Dapper.Tools.Repositories; -namespace Bit.Infrastructure.EFIntegration.Test.Repositories; +namespace Bit.Infrastructure.EFIntegration.Test.Tools.Repositories; public class SendRepositoryTests { @@ -16,10 +19,10 @@ public class SendRepositoryTests User user, Organization org, SendCompare equalityComparer, - List suts, + List suts, List efUserRepos, List efOrgRepos, - SqlRepo.SendRepository sqlSendRepo, + SqlSendRepo.SendRepository sqlSendRepo, SqlRepo.UserRepository sqlUserRepo, SqlRepo.OrganizationRepository sqlOrgRepo ) diff --git a/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs b/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs index 3ee554d60..96c9d2b04 100644 --- a/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs +++ b/test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs @@ -2,6 +2,7 @@ using Bit.Core.Auth.Services; using Bit.Core.Repositories; using Bit.Core.Services; +using Bit.Core.Tools.Services; using Bit.Infrastructure.EntityFramework.Repositories; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.Testing;