From 26dd8b0e47a82c0d3edacf14172786da90de6891 Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Fri, 27 Oct 2023 03:38:29 +1000 Subject: [PATCH] [AC-1284] AC Team code ownership moves - Provider (#3359) --- .../Providers/CreateProviderCommand.cs | 11 ++++++----- .../Services/ProviderService.cs | 12 +++++++----- .../Utilities/ServiceCollectionExtensions.cs | 8 ++++---- .../AutoFixture/ProviderUserFixtures.cs | 6 +++--- .../CreateProviderCommandTests.cs | 11 ++++++----- .../Services/ProviderServiceTests.cs | 17 +++++++++-------- src/Admin/Controllers/ProvidersController.cs | 8 +++++--- src/Admin/Models/CreateProviderModel.cs | 4 ++-- src/Admin/Models/OrganizationEditModel.cs | 4 ++-- src/Admin/Models/OrganizationViewModel.cs | 2 +- src/Admin/Models/ProviderEditModel.cs | 4 ++-- src/Admin/Models/ProviderViewModel.cs | 6 +++--- src/Admin/Models/ProvidersModel.cs | 2 +- .../Organizations/_ProviderInformation.cshtml | 2 +- src/Admin/Views/Providers/Admins.cshtml | 1 + src/Admin/Views/Providers/Create.cshtml | 1 + src/Admin/Views/Providers/Organizations.cshtml | 1 + .../Views/Providers/_ViewInformation.cshtml | 1 + .../Views/Shared/_OrganizationForm.cshtml | 1 + src/Admin/Views/_ViewImports.cshtml | 1 - .../Controllers/OrganizationsController.cs | 1 + .../ProviderOrganizationsController.cs | 3 ++- .../Controllers/ProviderUsersController.cs | 5 +++-- .../Controllers/ProvidersController.cs | 3 ++- .../Providers/ProviderSetupRequestModel.cs | 2 +- .../Providers/ProviderUpdateRequestModel.cs | 2 +- .../Providers/ProviderUserRequestModels.cs | 4 ++-- .../ProfileOrganizationResponseModel.cs | 4 ++-- ...ProfileProviderOrganizationResponseModel.cs | 3 ++- .../Providers/ProfileProviderResponseModel.cs | 3 ++- .../ProviderOrganizationResponseModel.cs | 4 ++-- .../Providers/ProviderResponseModel.cs | 2 +- .../Providers/ProviderUserResponseModel.cs | 5 +++-- src/Api/Controllers/AccountsController.cs | 3 ++- src/Api/Controllers/EventsController.cs | 1 + .../Models/Response/ProfileResponseModel.cs | 2 +- .../Controllers/ImportCiphersController.cs | 2 -- src/Api/Vault/Controllers/CiphersController.cs | 1 + src/Api/Vault/Controllers/SyncController.cs | 3 ++- .../Vault/Models/Response/SyncResponseModel.cs | 1 + .../Context/CurrentContextProvider.cs | 6 +++--- .../Entities/Provider/Provider.cs | 5 +++-- .../Entities/Provider/ProviderOrganization.cs | 5 +++-- .../Entities/Provider/ProviderUser.cs | 5 +++-- .../Enums/Provider/ProviderStatusType.cs | 2 +- .../Enums/Provider/ProviderType.cs | 2 +- .../Enums/Provider/ProviderUserStatusType.cs | 2 +- .../Enums/Provider/ProviderUserType.cs | 2 +- .../Business/Provider/ProviderUserInvite.cs | 4 ++-- .../Models/Data/Provider/ProviderAbility.cs | 6 ++---- .../ProviderOrganizationOrganizationDetails.cs | 2 +- .../ProviderOrganizationProviderDetails.cs | 4 ++-- .../ProviderUserOrganizationDetails.cs | 6 +++--- .../Provider/ProviderUserProviderDetails.cs | 4 ++-- .../Data/Provider/ProviderUserPublicKey.cs | 2 +- .../Data/Provider/ProviderUserUserDetails.cs | 4 ++-- .../Interfaces/ICreateProviderCommand.cs | 4 ++-- .../IProviderOrganizationRepository.cs | 7 ++++--- .../Repositories/IProviderRepository.cs | 7 ++++--- .../Repositories/IProviderUserRepository.cs | 9 +++++---- .../Services/IProviderService.cs | 8 ++++---- .../NoopImplementations/NoopProviderService.cs | 8 ++++---- src/Core/Context/CurrentContext.cs | 5 ++++- src/Core/Context/ICurrentContext.cs | 2 ++ .../OrganizationUserOrganizationDetails.cs | 2 +- .../AddSecretsManagerSubscriptionCommand.cs | 6 +++--- src/Core/Services/IApplicationCacheService.cs | 6 +++--- src/Core/Services/IEventService.cs | 2 +- src/Core/Services/IMailService.cs | 4 ++-- .../Services/Implementations/EventService.cs | 4 +++- .../Implementations/HandlebarsMailService.cs | 2 +- .../InMemoryApplicationCacheService.cs | 7 ++++--- ...nMemoryServiceBusApplicationCacheService.cs | 1 + .../Implementations/OrganizationService.cs | 2 +- .../Services/Implementations/UserService.cs | 1 + .../NoopImplementations/NoopEventService.cs | 2 +- .../NoopImplementations/NoopMailService.cs | 4 ++-- src/Core/Utilities/CoreHelpers.cs | 3 ++- src/Identity/IdentityServer/ClientStore.cs | 1 + src/Identity/IdentityServer/ProfileService.cs | 1 + .../ProviderOrganizationRepository.cs | 9 +++++---- .../Repositories/ProviderRepository.cs | 9 +++++---- .../Repositories/ProviderUserRepository.cs | 11 ++++++----- .../AdminConsole/Models/Provider/Provider.cs | 15 +++++++++++++++ .../Models/Provider/ProviderOrganization.cs | 18 ++++++++++++++++++ .../Models/Provider/ProviderUser.cs | 18 ++++++++++++++++++ .../ProviderOrganizationRepository.cs | 13 +++++++------ .../Repositories/ProviderRepository.cs | 11 ++++++----- .../Repositories/ProviderUserRepository.cs | 14 ++++++++------ ...rOrganizationCountByOrganizationIdsQuery.cs | 6 ++++-- ...OrganizationDetailsReadByProviderIdQuery.cs | 6 ++++-- .../ProviderOrganizationReadByUserIdQuery.cs | 6 ++++-- ...ProviderUserOrganizationDetailsViewQuery.cs | 6 ++++-- ...erProviderDetailsReadByUserIdStatusQuery.cs | 8 +++++--- .../Models/Provider/Provider.cs | 15 --------------- .../Models/Provider/ProviderOrganization.cs | 17 ----------------- .../Models/Provider/ProviderUser.cs | 17 ----------------- .../Repositories/DatabaseContext.cs | 1 + .../Repositories/DatabaseContextExtensions.cs | 4 ++-- ...UserReadPublicKeysByProviderUserIdsQuery.cs | 4 ++-- .../Utilities/ServiceCollectionExtensions.cs | 1 + .../OrganizationsControllerTests.cs | 1 + .../Controllers/AccountsControllerTests.cs | 1 + .../Vault/Controllers/SyncControllerTests.cs | 4 +++- ...ddSecretsManagerSubscriptionCommandTests.cs | 8 ++++---- test/Core.Test/Services/EventServiceTests.cs | 3 ++- .../Services/HandlebarsMailServiceTests.cs | 2 +- .../InMemoryApplicationCacheServiceTests.cs | 3 ++- ...ryServiceBusApplicationCacheServiceTests.cs | 3 ++- .../Services/OrganizationServiceTests.cs | 5 +++-- test/Core.Test/Services/UserServiceTests.cs | 1 + test/Core.Test/Utilities/CoreHelpersTests.cs | 3 ++- .../EntityFrameworkRepositoryFixtures.cs | 1 + .../AutoFixture/PolicyFixtures.cs | 1 + .../OrganizationUserRepositoryTests.cs | 16 +++++++++------- 115 files changed, 325 insertions(+), 252 deletions(-) rename bitwarden_license/src/Commercial.Core/{ => AdminConsole}/Providers/CreateProviderCommand.cs (87%) rename bitwarden_license/src/Commercial.Core/{ => AdminConsole}/Services/ProviderService.cs (98%) rename bitwarden_license/test/Commercial.Core.Test/{ => AdminConsole}/AutoFixture/ProviderUserFixtures.cs (83%) rename bitwarden_license/test/Commercial.Core.Test/{ => AdminConsole}/ProviderFeatures/CreateProviderCommandTests.cs (86%) rename bitwarden_license/test/Commercial.Core.Test/{ => AdminConsole}/Services/ProviderServiceTests.cs (98%) rename src/Core/{ => AdminConsole}/Context/CurrentContextProvider.cs (79%) rename src/Core/{ => AdminConsole}/Entities/Provider/Provider.cs (88%) rename src/Core/{ => AdminConsole}/Entities/Provider/ProviderOrganization.cs (83%) rename src/Core/{ => AdminConsole}/Entities/Provider/ProviderUser.cs (84%) rename src/Core/{ => AdminConsole}/Enums/Provider/ProviderStatusType.cs (60%) rename src/Core/{ => AdminConsole}/Enums/Provider/ProviderType.cs (87%) rename src/Core/{ => AdminConsole}/Enums/Provider/ProviderUserStatusType.cs (66%) rename src/Core/{ => AdminConsole}/Enums/Provider/ProviderUserType.cs (62%) rename src/Core/{ => AdminConsole}/Models/Business/Provider/ProviderUserInvite.cs (90%) rename src/Core/{ => AdminConsole}/Models/Data/Provider/ProviderAbility.cs (70%) rename src/Core/{ => AdminConsole}/Models/Data/Provider/ProviderOrganizationOrganizationDetails.cs (91%) rename src/Core/{ => AdminConsole}/Models/Data/Provider/ProviderOrganizationProviderDetails.cs (72%) rename src/Core/{ => AdminConsole}/Models/Data/Provider/ProviderUserOrganizationDetails.cs (89%) rename src/Core/{ => AdminConsole}/Models/Data/Provider/ProviderUserProviderDetails.cs (82%) rename src/Core/{ => AdminConsole}/Models/Data/Provider/ProviderUserPublicKey.cs (72%) rename src/Core/{ => AdminConsole}/Models/Data/Provider/ProviderUserUserDetails.cs (78%) rename src/Core/{ => AdminConsole}/Providers/Interfaces/ICreateProviderCommand.cs (60%) rename src/Core/{ => AdminConsole}/Repositories/IProviderOrganizationRepository.cs (76%) rename src/Core/{ => AdminConsole}/Repositories/IProviderRepository.cs (63%) rename src/Core/{ => AdminConsole}/Repositories/IProviderUserRepository.cs (85%) rename src/Core/{ => AdminConsole}/Services/IProviderService.cs (89%) rename src/Core/{ => AdminConsole}/Services/NoopImplementations/NoopProviderService.cs (92%) rename src/Infrastructure.Dapper/{ => AdminConsole}/Repositories/ProviderOrganizationRepository.cs (96%) rename src/Infrastructure.Dapper/{ => AdminConsole}/Repositories/ProviderRepository.cs (88%) rename src/Infrastructure.Dapper/{ => AdminConsole}/Repositories/ProviderUserRepository.cs (95%) create mode 100644 src/Infrastructure.EntityFramework/AdminConsole/Models/Provider/Provider.cs create mode 100644 src/Infrastructure.EntityFramework/AdminConsole/Models/Provider/ProviderOrganization.cs create mode 100644 src/Infrastructure.EntityFramework/AdminConsole/Models/Provider/ProviderUser.cs rename src/Infrastructure.EntityFramework/{ => AdminConsole}/Repositories/ProviderOrganizationRepository.cs (84%) rename src/Infrastructure.EntityFramework/{ => AdminConsole}/Repositories/ProviderRepository.cs (90%) rename src/Infrastructure.EntityFramework/{ => AdminConsole}/Repositories/ProviderUserRepository.cs (94%) rename src/Infrastructure.EntityFramework/{ => AdminConsole}/Repositories/Queries/ProviderOrganizationCountByOrganizationIdsQuery.cs (70%) rename src/Infrastructure.EntityFramework/{ => AdminConsole}/Repositories/Queries/ProviderOrganizationOrganizationDetailsReadByProviderIdQuery.cs (85%) rename src/Infrastructure.EntityFramework/{ => AdminConsole}/Repositories/Queries/ProviderOrganizationReadByUserIdQuery.cs (80%) rename src/Infrastructure.EntityFramework/{ => AdminConsole}/Repositories/Queries/ProviderUserOrganizationDetailsViewQuery.cs (87%) rename src/Infrastructure.EntityFramework/{ => AdminConsole}/Repositories/Queries/ProviderUserProviderDetailsReadByUserIdStatusQuery.cs (81%) delete mode 100644 src/Infrastructure.EntityFramework/Models/Provider/Provider.cs delete mode 100644 src/Infrastructure.EntityFramework/Models/Provider/ProviderOrganization.cs delete mode 100644 src/Infrastructure.EntityFramework/Models/Provider/ProviderUser.cs diff --git a/bitwarden_license/src/Commercial.Core/Providers/CreateProviderCommand.cs b/bitwarden_license/src/Commercial.Core/AdminConsole/Providers/CreateProviderCommand.cs similarity index 87% rename from bitwarden_license/src/Commercial.Core/Providers/CreateProviderCommand.cs rename to bitwarden_license/src/Commercial.Core/AdminConsole/Providers/CreateProviderCommand.cs index 36b6fe85c8..738723a819 100644 --- a/bitwarden_license/src/Commercial.Core/Providers/CreateProviderCommand.cs +++ b/bitwarden_license/src/Commercial.Core/AdminConsole/Providers/CreateProviderCommand.cs @@ -1,11 +1,12 @@ -using Bit.Core.Entities.Provider; -using Bit.Core.Enums.Provider; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Providers.Interfaces; +using Bit.Core.AdminConsole.Repositories; +using Bit.Core.AdminConsole.Services; using Bit.Core.Exceptions; -using Bit.Core.Providers.Interfaces; using Bit.Core.Repositories; -using Bit.Core.Services; -namespace Bit.Commercial.Core.Providers; +namespace Bit.Commercial.Core.AdminConsole.Providers; public class CreateProviderCommand : ICreateProviderCommand { diff --git a/bitwarden_license/src/Commercial.Core/Services/ProviderService.cs b/bitwarden_license/src/Commercial.Core/AdminConsole/Services/ProviderService.cs similarity index 98% rename from bitwarden_license/src/Commercial.Core/Services/ProviderService.cs rename to bitwarden_license/src/Commercial.Core/AdminConsole/Services/ProviderService.cs index d186eb6d41..a03e92c3f0 100644 --- a/bitwarden_license/src/Commercial.Core/Services/ProviderService.cs +++ b/bitwarden_license/src/Commercial.Core/AdminConsole/Services/ProviderService.cs @@ -1,11 +1,13 @@ -using Bit.Core.Context; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Models.Business.Provider; +using Bit.Core.AdminConsole.Repositories; +using Bit.Core.AdminConsole.Services; +using Bit.Core.Context; using Bit.Core.Entities; -using Bit.Core.Entities.Provider; using Bit.Core.Enums; -using Bit.Core.Enums.Provider; using Bit.Core.Exceptions; using Bit.Core.Models.Business; -using Bit.Core.Models.Business.Provider; using Bit.Core.Models.Data; using Bit.Core.Repositories; using Bit.Core.Services; @@ -13,7 +15,7 @@ using Bit.Core.Settings; using Bit.Core.Utilities; using Microsoft.AspNetCore.DataProtection; -namespace Bit.Commercial.Core.Services; +namespace Bit.Commercial.Core.AdminConsole.Services; public class ProviderService : IProviderService { diff --git a/bitwarden_license/src/Commercial.Core/Utilities/ServiceCollectionExtensions.cs b/bitwarden_license/src/Commercial.Core/Utilities/ServiceCollectionExtensions.cs index b9d21915bf..09788406de 100644 --- a/bitwarden_license/src/Commercial.Core/Utilities/ServiceCollectionExtensions.cs +++ b/bitwarden_license/src/Commercial.Core/Utilities/ServiceCollectionExtensions.cs @@ -1,7 +1,7 @@ -using Bit.Commercial.Core.Providers; -using Bit.Commercial.Core.Services; -using Bit.Core.Providers.Interfaces; -using Bit.Core.Services; +using Bit.Commercial.Core.AdminConsole.Providers; +using Bit.Commercial.Core.AdminConsole.Services; +using Bit.Core.AdminConsole.Providers.Interfaces; +using Bit.Core.AdminConsole.Services; using Microsoft.Extensions.DependencyInjection; namespace Bit.Commercial.Core.Utilities; diff --git a/bitwarden_license/test/Commercial.Core.Test/AutoFixture/ProviderUserFixtures.cs b/bitwarden_license/test/Commercial.Core.Test/AdminConsole/AutoFixture/ProviderUserFixtures.cs similarity index 83% rename from bitwarden_license/test/Commercial.Core.Test/AutoFixture/ProviderUserFixtures.cs rename to bitwarden_license/test/Commercial.Core.Test/AdminConsole/AutoFixture/ProviderUserFixtures.cs index 48f70c3350..fc47e80c87 100644 --- a/bitwarden_license/test/Commercial.Core.Test/AutoFixture/ProviderUserFixtures.cs +++ b/bitwarden_license/test/Commercial.Core.Test/AdminConsole/AutoFixture/ProviderUserFixtures.cs @@ -1,9 +1,9 @@ using System.Reflection; using AutoFixture; using AutoFixture.Xunit2; -using Bit.Core.Enums.Provider; +using Bit.Core.AdminConsole.Enums.Provider; -namespace Bit.Commercial.Core.Test.AutoFixture; +namespace Bit.Commercial.Core.Test.AdminConsole.AutoFixture; internal class ProviderUser : ICustomization { @@ -18,7 +18,7 @@ internal class ProviderUser : ICustomization public void Customize(IFixture fixture) { - fixture.Customize(composer => composer + fixture.Customize(composer => composer .With(o => o.Type, Type) .With(o => o.Status, Status)); } diff --git a/bitwarden_license/test/Commercial.Core.Test/ProviderFeatures/CreateProviderCommandTests.cs b/bitwarden_license/test/Commercial.Core.Test/AdminConsole/ProviderFeatures/CreateProviderCommandTests.cs similarity index 86% rename from bitwarden_license/test/Commercial.Core.Test/ProviderFeatures/CreateProviderCommandTests.cs rename to bitwarden_license/test/Commercial.Core.Test/AdminConsole/ProviderFeatures/CreateProviderCommandTests.cs index 721ed24d9c..399ed6ea1e 100644 --- a/bitwarden_license/test/Commercial.Core.Test/ProviderFeatures/CreateProviderCommandTests.cs +++ b/bitwarden_license/test/Commercial.Core.Test/AdminConsole/ProviderFeatures/CreateProviderCommandTests.cs @@ -1,16 +1,17 @@ -using Bit.Commercial.Core.Providers; +using Bit.Commercial.Core.AdminConsole.Providers; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Repositories; +using Bit.Core.AdminConsole.Services; using Bit.Core.Entities; -using Bit.Core.Entities.Provider; -using Bit.Core.Enums.Provider; using Bit.Core.Exceptions; using Bit.Core.Repositories; -using Bit.Core.Services; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; using NSubstitute; using Xunit; -namespace Bit.Commercial.Core.Test.ProviderFeatures; +namespace Bit.Commercial.Core.Test.AdminConsole.ProviderFeatures; [SutProviderCustomize] public class CreateProviderCommandTests diff --git a/bitwarden_license/test/Commercial.Core.Test/Services/ProviderServiceTests.cs b/bitwarden_license/test/Commercial.Core.Test/AdminConsole/Services/ProviderServiceTests.cs similarity index 98% rename from bitwarden_license/test/Commercial.Core.Test/Services/ProviderServiceTests.cs rename to bitwarden_license/test/Commercial.Core.Test/AdminConsole/Services/ProviderServiceTests.cs index 2a6e68bfb4..01538003c6 100644 --- a/bitwarden_license/test/Commercial.Core.Test/Services/ProviderServiceTests.cs +++ b/bitwarden_license/test/Commercial.Core.Test/AdminConsole/Services/ProviderServiceTests.cs @@ -1,13 +1,14 @@ -using Bit.Commercial.Core.Services; -using Bit.Commercial.Core.Test.AutoFixture; +using Bit.Commercial.Core.AdminConsole.Services; +using Bit.Commercial.Core.Test.AdminConsole.AutoFixture; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Models.Business.Provider; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Context; using Bit.Core.Entities; -using Bit.Core.Entities.Provider; using Bit.Core.Enums; -using Bit.Core.Enums.Provider; using Bit.Core.Exceptions; using Bit.Core.Models.Business; -using Bit.Core.Models.Business.Provider; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Utilities; @@ -17,10 +18,10 @@ using Microsoft.AspNetCore.DataProtection; using NSubstitute; using NSubstitute.ReturnsExtensions; using Xunit; -using Provider = Bit.Core.Entities.Provider.Provider; -using ProviderUser = Bit.Core.Entities.Provider.ProviderUser; +using Provider = Bit.Core.AdminConsole.Entities.Provider.Provider; +using ProviderUser = Bit.Core.AdminConsole.Entities.Provider.ProviderUser; -namespace Bit.Commercial.Core.Test.Services; +namespace Bit.Commercial.Core.Test.AdminConsole.Services; [SutProviderCustomize] public class ProviderServiceTests diff --git a/src/Admin/Controllers/ProvidersController.cs b/src/Admin/Controllers/ProvidersController.cs index 3dbf1ca53b..8fa02e9b32 100644 --- a/src/Admin/Controllers/ProvidersController.cs +++ b/src/Admin/Controllers/ProvidersController.cs @@ -1,9 +1,11 @@ using Bit.Admin.Enums; using Bit.Admin.Models; using Bit.Admin.Utilities; -using Bit.Core.Entities.Provider; -using Bit.Core.Enums.Provider; -using Bit.Core.Providers.Interfaces; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Providers.Interfaces; +using Bit.Core.AdminConsole.Repositories; +using Bit.Core.AdminConsole.Services; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings; diff --git a/src/Admin/Models/CreateProviderModel.cs b/src/Admin/Models/CreateProviderModel.cs index 9dcd218fa6..8eddd014cd 100644 --- a/src/Admin/Models/CreateProviderModel.cs +++ b/src/Admin/Models/CreateProviderModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -using Bit.Core.Entities.Provider; -using Bit.Core.Enums.Provider; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; using Bit.SharedWeb.Utilities; namespace Bit.Admin.Models; diff --git a/src/Admin/Models/OrganizationEditModel.cs b/src/Admin/Models/OrganizationEditModel.cs index f8bfa453da..234d8bb157 100644 --- a/src/Admin/Models/OrganizationEditModel.cs +++ b/src/Admin/Models/OrganizationEditModel.cs @@ -1,9 +1,9 @@ using System.ComponentModel.DataAnnotations; using Bit.Core.AdminConsole.Entities; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; using Bit.Core.Entities; -using Bit.Core.Entities.Provider; using Bit.Core.Enums; -using Bit.Core.Enums.Provider; using Bit.Core.Models.Business; using Bit.Core.Models.Data.Organizations.OrganizationUsers; using Bit.Core.Settings; diff --git a/src/Admin/Models/OrganizationViewModel.cs b/src/Admin/Models/OrganizationViewModel.cs index 541f7a2fc1..0bad3650fd 100644 --- a/src/Admin/Models/OrganizationViewModel.cs +++ b/src/Admin/Models/OrganizationViewModel.cs @@ -1,6 +1,6 @@ using Bit.Core.AdminConsole.Entities; +using Bit.Core.AdminConsole.Entities.Provider; using Bit.Core.Entities; -using Bit.Core.Entities.Provider; using Bit.Core.Enums; using Bit.Core.Models.Data.Organizations.OrganizationUsers; using Bit.Core.Vault.Entities; diff --git a/src/Admin/Models/ProviderEditModel.cs b/src/Admin/Models/ProviderEditModel.cs index 38fdb742a8..b5219d8ed9 100644 --- a/src/Admin/Models/ProviderEditModel.cs +++ b/src/Admin/Models/ProviderEditModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -using Bit.Core.Entities.Provider; -using Bit.Core.Models.Data; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; namespace Bit.Admin.Models; diff --git a/src/Admin/Models/ProviderViewModel.cs b/src/Admin/Models/ProviderViewModel.cs index 766101e884..38e7eac4a2 100644 --- a/src/Admin/Models/ProviderViewModel.cs +++ b/src/Admin/Models/ProviderViewModel.cs @@ -1,6 +1,6 @@ -using Bit.Core.Entities.Provider; -using Bit.Core.Enums.Provider; -using Bit.Core.Models.Data; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; namespace Bit.Admin.Models; diff --git a/src/Admin/Models/ProvidersModel.cs b/src/Admin/Models/ProvidersModel.cs index dccf4a4d76..5fb8e8dfab 100644 --- a/src/Admin/Models/ProvidersModel.cs +++ b/src/Admin/Models/ProvidersModel.cs @@ -1,4 +1,4 @@ -using Bit.Core.Entities.Provider; +using Bit.Core.AdminConsole.Entities.Provider; namespace Bit.Admin.Models; diff --git a/src/Admin/Views/Organizations/_ProviderInformation.cshtml b/src/Admin/Views/Organizations/_ProviderInformation.cshtml index 217f9951b0..4bd2118ea0 100644 --- a/src/Admin/Views/Organizations/_ProviderInformation.cshtml +++ b/src/Admin/Views/Organizations/_ProviderInformation.cshtml @@ -1,5 +1,5 @@ @using Bit.SharedWeb.Utilities -@model Bit.Core.Entities.Provider.Provider +@model Bit.Core.AdminConsole.Entities.Provider.Provider
Provider Name
@Model.Name
diff --git a/src/Admin/Views/Providers/Admins.cshtml b/src/Admin/Views/Providers/Admins.cshtml index 533cb3034e..4d110aca5b 100644 --- a/src/Admin/Views/Providers/Admins.cshtml +++ b/src/Admin/Views/Providers/Admins.cshtml @@ -1,4 +1,5 @@ @using Bit.Admin.Enums; +@using Bit.Core.AdminConsole.Enums.Provider @inject Bit.Admin.Services.IAccessControlService AccessControlService @model ProviderViewModel diff --git a/src/Admin/Views/Providers/Create.cshtml b/src/Admin/Views/Providers/Create.cshtml index 107e93150b..2e69da3ad7 100644 --- a/src/Admin/Views/Providers/Create.cshtml +++ b/src/Admin/Views/Providers/Create.cshtml @@ -1,4 +1,5 @@ @using Bit.SharedWeb.Utilities +@using Bit.Core.AdminConsole.Enums.Provider @model CreateProviderModel @{ ViewData["Title"] = "Create Provider"; diff --git a/src/Admin/Views/Providers/Organizations.cshtml b/src/Admin/Views/Providers/Organizations.cshtml index 06fc490bcc..b9c751480d 100644 --- a/src/Admin/Views/Providers/Organizations.cshtml +++ b/src/Admin/Views/Providers/Organizations.cshtml @@ -1,3 +1,4 @@ +@using Bit.Core.AdminConsole.Enums.Provider @model ProviderViewModel @await Html.PartialAsync("_ProviderScripts") diff --git a/src/Admin/Views/Providers/_ViewInformation.cshtml b/src/Admin/Views/Providers/_ViewInformation.cshtml index ff4a2e8106..b01502e6d6 100644 --- a/src/Admin/Views/Providers/_ViewInformation.cshtml +++ b/src/Admin/Views/Providers/_ViewInformation.cshtml @@ -1,4 +1,5 @@ @using Bit.SharedWeb.Utilities +@using Bit.Core.AdminConsole.Enums.Provider @model ProviderViewModel
Id
diff --git a/src/Admin/Views/Shared/_OrganizationForm.cshtml b/src/Admin/Views/Shared/_OrganizationForm.cshtml index 697d3ef943..d0530849ac 100644 --- a/src/Admin/Views/Shared/_OrganizationForm.cshtml +++ b/src/Admin/Views/Shared/_OrganizationForm.cshtml @@ -1,5 +1,6 @@ @using Bit.SharedWeb.Utilities @using Bit.Admin.Enums; +@using Bit.Core.AdminConsole.Enums.Provider @inject Bit.Admin.Services.IAccessControlService AccessControlService; @model OrganizationEditModel diff --git a/src/Admin/Views/_ViewImports.cshtml b/src/Admin/Views/_ViewImports.cshtml index b3dac997e2..073a922f5e 100644 --- a/src/Admin/Views/_ViewImports.cshtml +++ b/src/Admin/Views/_ViewImports.cshtml @@ -1,7 +1,6 @@ @using Microsoft.AspNetCore.Identity @using Bit.Admin @using Bit.Admin.Models -@using Bit.Core.Enums.Provider @using Bit.Core.Enums @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper "*, Admin" diff --git a/src/Api/AdminConsole/Controllers/OrganizationsController.cs b/src/Api/AdminConsole/Controllers/OrganizationsController.cs index 948355afad..eb3a95ebc2 100644 --- a/src/Api/AdminConsole/Controllers/OrganizationsController.cs +++ b/src/Api/AdminConsole/Controllers/OrganizationsController.cs @@ -11,6 +11,7 @@ using Bit.Api.Models.Request.Accounts; using Bit.Api.Models.Request.Organizations; using Bit.Api.Models.Response; using Bit.Core; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Auth.Enums; using Bit.Core.Auth.Repositories; using Bit.Core.Auth.Services; diff --git a/src/Api/AdminConsole/Controllers/ProviderOrganizationsController.cs b/src/Api/AdminConsole/Controllers/ProviderOrganizationsController.cs index 1420311d4b..4d734e7cad 100644 --- a/src/Api/AdminConsole/Controllers/ProviderOrganizationsController.cs +++ b/src/Api/AdminConsole/Controllers/ProviderOrganizationsController.cs @@ -1,9 +1,10 @@ using Bit.Api.AdminConsole.Models.Request.Providers; using Bit.Api.AdminConsole.Models.Response.Providers; using Bit.Api.Models.Response; +using Bit.Core.AdminConsole.Repositories; +using Bit.Core.AdminConsole.Services; using Bit.Core.Context; using Bit.Core.Exceptions; -using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Utilities; using Microsoft.AspNetCore.Authorization; diff --git a/src/Api/AdminConsole/Controllers/ProviderUsersController.cs b/src/Api/AdminConsole/Controllers/ProviderUsersController.cs index c955e062fa..73639bb1a4 100644 --- a/src/Api/AdminConsole/Controllers/ProviderUsersController.cs +++ b/src/Api/AdminConsole/Controllers/ProviderUsersController.cs @@ -1,10 +1,11 @@ using Bit.Api.AdminConsole.Models.Request.Providers; using Bit.Api.AdminConsole.Models.Response.Providers; using Bit.Api.Models.Response; +using Bit.Core.AdminConsole.Models.Business.Provider; +using Bit.Core.AdminConsole.Repositories; +using Bit.Core.AdminConsole.Services; using Bit.Core.Context; using Bit.Core.Exceptions; -using Bit.Core.Models.Business.Provider; -using Bit.Core.Repositories; using Bit.Core.Services; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/src/Api/AdminConsole/Controllers/ProvidersController.cs b/src/Api/AdminConsole/Controllers/ProvidersController.cs index b61a6d4198..cd39a90a84 100644 --- a/src/Api/AdminConsole/Controllers/ProvidersController.cs +++ b/src/Api/AdminConsole/Controllers/ProvidersController.cs @@ -1,8 +1,9 @@ using Bit.Api.AdminConsole.Models.Request.Providers; using Bit.Api.AdminConsole.Models.Response.Providers; +using Bit.Core.AdminConsole.Repositories; +using Bit.Core.AdminConsole.Services; using Bit.Core.Context; using Bit.Core.Exceptions; -using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings; using Microsoft.AspNetCore.Authorization; diff --git a/src/Api/AdminConsole/Models/Request/Providers/ProviderSetupRequestModel.cs b/src/Api/AdminConsole/Models/Request/Providers/ProviderSetupRequestModel.cs index 2c5e4c65bb..e091a55632 100644 --- a/src/Api/AdminConsole/Models/Request/Providers/ProviderSetupRequestModel.cs +++ b/src/Api/AdminConsole/Models/Request/Providers/ProviderSetupRequestModel.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using Bit.Core.Entities.Provider; +using Bit.Core.AdminConsole.Entities.Provider; namespace Bit.Api.AdminConsole.Models.Request.Providers; diff --git a/src/Api/AdminConsole/Models/Request/Providers/ProviderUpdateRequestModel.cs b/src/Api/AdminConsole/Models/Request/Providers/ProviderUpdateRequestModel.cs index 58b4fc0f51..90bdb1e048 100644 --- a/src/Api/AdminConsole/Models/Request/Providers/ProviderUpdateRequestModel.cs +++ b/src/Api/AdminConsole/Models/Request/Providers/ProviderUpdateRequestModel.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using Bit.Core.Entities.Provider; +using Bit.Core.AdminConsole.Entities.Provider; using Bit.Core.Settings; namespace Bit.Api.AdminConsole.Models.Request.Providers; diff --git a/src/Api/AdminConsole/Models/Request/Providers/ProviderUserRequestModels.cs b/src/Api/AdminConsole/Models/Request/Providers/ProviderUserRequestModels.cs index ec112edc4a..dd22530916 100644 --- a/src/Api/AdminConsole/Models/Request/Providers/ProviderUserRequestModels.cs +++ b/src/Api/AdminConsole/Models/Request/Providers/ProviderUserRequestModels.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -using Bit.Core.Entities.Provider; -using Bit.Core.Enums.Provider; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; using Bit.Core.Utilities; namespace Bit.Api.AdminConsole.Models.Request.Providers; diff --git a/src/Api/AdminConsole/Models/Response/ProfileOrganizationResponseModel.cs b/src/Api/AdminConsole/Models/Response/ProfileOrganizationResponseModel.cs index 04b3f76021..d0ce18290f 100644 --- a/src/Api/AdminConsole/Models/Response/ProfileOrganizationResponseModel.cs +++ b/src/Api/AdminConsole/Models/Response/ProfileOrganizationResponseModel.cs @@ -1,7 +1,7 @@ -using Bit.Core.Auth.Enums; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.Auth.Enums; using Bit.Core.Auth.Models.Data; using Bit.Core.Enums; -using Bit.Core.Enums.Provider; using Bit.Core.Models.Api; using Bit.Core.Models.Data; using Bit.Core.Models.Data.Organizations.OrganizationUsers; diff --git a/src/Api/AdminConsole/Models/Response/ProfileProviderOrganizationResponseModel.cs b/src/Api/AdminConsole/Models/Response/ProfileProviderOrganizationResponseModel.cs index b79a325601..7ff9805b58 100644 --- a/src/Api/AdminConsole/Models/Response/ProfileProviderOrganizationResponseModel.cs +++ b/src/Api/AdminConsole/Models/Response/ProfileProviderOrganizationResponseModel.cs @@ -1,4 +1,5 @@ -using Bit.Core.Enums; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.Enums; using Bit.Core.Models.Data; using Bit.Core.Utilities; diff --git a/src/Api/AdminConsole/Models/Response/Providers/ProfileProviderResponseModel.cs b/src/Api/AdminConsole/Models/Response/Providers/ProfileProviderResponseModel.cs index ac725618b5..66e0acae0c 100644 --- a/src/Api/AdminConsole/Models/Response/Providers/ProfileProviderResponseModel.cs +++ b/src/Api/AdminConsole/Models/Response/Providers/ProfileProviderResponseModel.cs @@ -1,4 +1,5 @@ -using Bit.Core.Enums.Provider; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; using Bit.Core.Models.Api; using Bit.Core.Models.Data; using Bit.Core.Utilities; diff --git a/src/Api/AdminConsole/Models/Response/Providers/ProviderOrganizationResponseModel.cs b/src/Api/AdminConsole/Models/Response/Providers/ProviderOrganizationResponseModel.cs index a2e9d9f4a2..da56d49ce8 100644 --- a/src/Api/AdminConsole/Models/Response/Providers/ProviderOrganizationResponseModel.cs +++ b/src/Api/AdminConsole/Models/Response/Providers/ProviderOrganizationResponseModel.cs @@ -1,6 +1,6 @@ -using Bit.Core.Entities.Provider; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; using Bit.Core.Models.Api; -using Bit.Core.Models.Data; namespace Bit.Api.AdminConsole.Models.Response.Providers; diff --git a/src/Api/AdminConsole/Models/Response/Providers/ProviderResponseModel.cs b/src/Api/AdminConsole/Models/Response/Providers/ProviderResponseModel.cs index 5e26d1d4be..bc55093a03 100644 --- a/src/Api/AdminConsole/Models/Response/Providers/ProviderResponseModel.cs +++ b/src/Api/AdminConsole/Models/Response/Providers/ProviderResponseModel.cs @@ -1,4 +1,4 @@ -using Bit.Core.Entities.Provider; +using Bit.Core.AdminConsole.Entities.Provider; using Bit.Core.Models.Api; namespace Bit.Api.AdminConsole.Models.Response.Providers; diff --git a/src/Api/AdminConsole/Models/Response/Providers/ProviderUserResponseModel.cs b/src/Api/AdminConsole/Models/Response/Providers/ProviderUserResponseModel.cs index 1008022885..1eaeb8e0bd 100644 --- a/src/Api/AdminConsole/Models/Response/Providers/ProviderUserResponseModel.cs +++ b/src/Api/AdminConsole/Models/Response/Providers/ProviderUserResponseModel.cs @@ -1,5 +1,6 @@ -using Bit.Core.Entities.Provider; -using Bit.Core.Enums.Provider; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; using Bit.Core.Models.Api; using Bit.Core.Models.Data; using Bit.Core.Utilities; diff --git a/src/Api/Controllers/AccountsController.cs b/src/Api/Controllers/AccountsController.cs index 7c36838461..804aeb6518 100644 --- a/src/Api/Controllers/AccountsController.cs +++ b/src/Api/Controllers/AccountsController.cs @@ -5,12 +5,13 @@ using Bit.Api.Models.Request.Accounts; using Bit.Api.Models.Response; using Bit.Api.Utilities; using Bit.Core; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Repositories; 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.Enums; -using Bit.Core.Enums.Provider; using Bit.Core.Exceptions; using Bit.Core.Models.Api.Response; using Bit.Core.Models.Business; diff --git a/src/Api/Controllers/EventsController.cs b/src/Api/Controllers/EventsController.cs index 4cf3b83dc5..921ee84400 100644 --- a/src/Api/Controllers/EventsController.cs +++ b/src/Api/Controllers/EventsController.cs @@ -1,5 +1,6 @@ using Bit.Api.Models.Response; using Bit.Api.Utilities; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Context; using Bit.Core.Exceptions; using Bit.Core.Models.Data; diff --git a/src/Api/Models/Response/ProfileResponseModel.cs b/src/Api/Models/Response/ProfileResponseModel.cs index 312e7ed7e5..b5a32fa326 100644 --- a/src/Api/Models/Response/ProfileResponseModel.cs +++ b/src/Api/Models/Response/ProfileResponseModel.cs @@ -1,8 +1,8 @@ using Bit.Api.AdminConsole.Models.Response; using Bit.Api.AdminConsole.Models.Response.Providers; +using Bit.Core.AdminConsole.Models.Data.Provider; using Bit.Core.Entities; using Bit.Core.Models.Api; -using Bit.Core.Models.Data; using Bit.Core.Models.Data.Organizations.OrganizationUsers; namespace Bit.Api.Models.Response; diff --git a/src/Api/Tools/Controllers/ImportCiphersController.cs b/src/Api/Tools/Controllers/ImportCiphersController.cs index d3ed7444f3..b480e9c5cb 100644 --- a/src/Api/Tools/Controllers/ImportCiphersController.cs +++ b/src/Api/Tools/Controllers/ImportCiphersController.cs @@ -5,7 +5,6 @@ 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; @@ -26,7 +25,6 @@ public class ImportCiphersController : Controller ICollectionCipherRepository collectionCipherRepository, ICipherService cipherService, IUserService userService, - IProviderService providerService, ICurrentContext currentContext, ILogger logger, GlobalSettings globalSettings) diff --git a/src/Api/Vault/Controllers/CiphersController.cs b/src/Api/Vault/Controllers/CiphersController.cs index 6a7de61f9d..ad0db8f6b3 100644 --- a/src/Api/Vault/Controllers/CiphersController.cs +++ b/src/Api/Vault/Controllers/CiphersController.cs @@ -6,6 +6,7 @@ using Bit.Api.Utilities; using Bit.Api.Vault.Models.Request; using Bit.Api.Vault.Models.Response; using Bit.Core; +using Bit.Core.AdminConsole.Services; using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Exceptions; diff --git a/src/Api/Vault/Controllers/SyncController.cs b/src/Api/Vault/Controllers/SyncController.cs index ec9ab4f96d..01a1fbb554 100644 --- a/src/Api/Vault/Controllers/SyncController.cs +++ b/src/Api/Vault/Controllers/SyncController.cs @@ -1,7 +1,8 @@ using Bit.Api.Vault.Models.Response; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.Enums.Provider; using Bit.Core.Exceptions; using Bit.Core.Models.Data; using Bit.Core.Repositories; diff --git a/src/Api/Vault/Models/Response/SyncResponseModel.cs b/src/Api/Vault/Models/Response/SyncResponseModel.cs index 386b7445be..817f233e11 100644 --- a/src/Api/Vault/Models/Response/SyncResponseModel.cs +++ b/src/Api/Vault/Models/Response/SyncResponseModel.cs @@ -1,5 +1,6 @@ using Bit.Api.Models.Response; using Bit.Api.Tools.Models.Response; +using Bit.Core.AdminConsole.Models.Data.Provider; using Bit.Core.Entities; using Bit.Core.Models.Api; using Bit.Core.Models.Api.Response; diff --git a/src/Core/Context/CurrentContextProvider.cs b/src/Core/AdminConsole/Context/CurrentContextProvider.cs similarity index 79% rename from src/Core/Context/CurrentContextProvider.cs rename to src/Core/AdminConsole/Context/CurrentContextProvider.cs index 57792840cc..78a5565e80 100644 --- a/src/Core/Context/CurrentContextProvider.cs +++ b/src/Core/AdminConsole/Context/CurrentContextProvider.cs @@ -1,9 +1,9 @@ -using Bit.Core.Entities.Provider; -using Bit.Core.Enums.Provider; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; using Bit.Core.Models.Data; using Bit.Core.Utilities; -namespace Bit.Core.Context; +namespace Bit.Core.AdminConsole.Context; public class CurrentContextProvider { diff --git a/src/Core/Entities/Provider/Provider.cs b/src/Core/AdminConsole/Entities/Provider/Provider.cs similarity index 88% rename from src/Core/Entities/Provider/Provider.cs rename to src/Core/AdminConsole/Entities/Provider/Provider.cs index 82b1f727e4..7aeb422cf3 100644 --- a/src/Core/Entities/Provider/Provider.cs +++ b/src/Core/AdminConsole/Entities/Provider/Provider.cs @@ -1,7 +1,8 @@ -using Bit.Core.Enums.Provider; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.Entities; using Bit.Core.Utilities; -namespace Bit.Core.Entities.Provider; +namespace Bit.Core.AdminConsole.Entities.Provider; public class Provider : ITableObject { diff --git a/src/Core/Entities/Provider/ProviderOrganization.cs b/src/Core/AdminConsole/Entities/Provider/ProviderOrganization.cs similarity index 83% rename from src/Core/Entities/Provider/ProviderOrganization.cs rename to src/Core/AdminConsole/Entities/Provider/ProviderOrganization.cs index 6cafef67b7..8396846ad4 100644 --- a/src/Core/Entities/Provider/ProviderOrganization.cs +++ b/src/Core/AdminConsole/Entities/Provider/ProviderOrganization.cs @@ -1,6 +1,7 @@ -using Bit.Core.Utilities; +using Bit.Core.Entities; +using Bit.Core.Utilities; -namespace Bit.Core.Entities.Provider; +namespace Bit.Core.AdminConsole.Entities.Provider; public class ProviderOrganization : ITableObject { diff --git a/src/Core/Entities/Provider/ProviderUser.cs b/src/Core/AdminConsole/Entities/Provider/ProviderUser.cs similarity index 84% rename from src/Core/Entities/Provider/ProviderUser.cs rename to src/Core/AdminConsole/Entities/Provider/ProviderUser.cs index 9b86d591c9..6e5b12934b 100644 --- a/src/Core/Entities/Provider/ProviderUser.cs +++ b/src/Core/AdminConsole/Entities/Provider/ProviderUser.cs @@ -1,7 +1,8 @@ -using Bit.Core.Enums.Provider; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.Entities; using Bit.Core.Utilities; -namespace Bit.Core.Entities.Provider; +namespace Bit.Core.AdminConsole.Entities.Provider; public class ProviderUser : ITableObject { diff --git a/src/Core/Enums/Provider/ProviderStatusType.cs b/src/Core/AdminConsole/Enums/Provider/ProviderStatusType.cs similarity index 60% rename from src/Core/Enums/Provider/ProviderStatusType.cs rename to src/Core/AdminConsole/Enums/Provider/ProviderStatusType.cs index bcb1f8cd2d..794bd36bf5 100644 --- a/src/Core/Enums/Provider/ProviderStatusType.cs +++ b/src/Core/AdminConsole/Enums/Provider/ProviderStatusType.cs @@ -1,4 +1,4 @@ -namespace Bit.Core.Enums.Provider; +namespace Bit.Core.AdminConsole.Enums.Provider; public enum ProviderStatusType : byte { diff --git a/src/Core/Enums/Provider/ProviderType.cs b/src/Core/AdminConsole/Enums/Provider/ProviderType.cs similarity index 87% rename from src/Core/Enums/Provider/ProviderType.cs rename to src/Core/AdminConsole/Enums/Provider/ProviderType.cs index 020f39eba1..a159fe2b6b 100644 --- a/src/Core/Enums/Provider/ProviderType.cs +++ b/src/Core/AdminConsole/Enums/Provider/ProviderType.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Bit.Core.Enums.Provider; +namespace Bit.Core.AdminConsole.Enums.Provider; public enum ProviderType : byte { diff --git a/src/Core/Enums/Provider/ProviderUserStatusType.cs b/src/Core/AdminConsole/Enums/Provider/ProviderUserStatusType.cs similarity index 66% rename from src/Core/Enums/Provider/ProviderUserStatusType.cs rename to src/Core/AdminConsole/Enums/Provider/ProviderUserStatusType.cs index 60571386d7..bb7b1022f7 100644 --- a/src/Core/Enums/Provider/ProviderUserStatusType.cs +++ b/src/Core/AdminConsole/Enums/Provider/ProviderUserStatusType.cs @@ -1,4 +1,4 @@ -namespace Bit.Core.Enums.Provider; +namespace Bit.Core.AdminConsole.Enums.Provider; public enum ProviderUserStatusType : byte { diff --git a/src/Core/Enums/Provider/ProviderUserType.cs b/src/Core/AdminConsole/Enums/Provider/ProviderUserType.cs similarity index 62% rename from src/Core/Enums/Provider/ProviderUserType.cs rename to src/Core/AdminConsole/Enums/Provider/ProviderUserType.cs index d13591290d..a903d28a21 100644 --- a/src/Core/Enums/Provider/ProviderUserType.cs +++ b/src/Core/AdminConsole/Enums/Provider/ProviderUserType.cs @@ -1,4 +1,4 @@ -namespace Bit.Core.Enums.Provider; +namespace Bit.Core.AdminConsole.Enums.Provider; public enum ProviderUserType : byte { diff --git a/src/Core/Models/Business/Provider/ProviderUserInvite.cs b/src/Core/AdminConsole/Models/Business/Provider/ProviderUserInvite.cs similarity index 90% rename from src/Core/Models/Business/Provider/ProviderUserInvite.cs rename to src/Core/AdminConsole/Models/Business/Provider/ProviderUserInvite.cs index 0fbe3d87c2..53cdefb3f9 100644 --- a/src/Core/Models/Business/Provider/ProviderUserInvite.cs +++ b/src/Core/AdminConsole/Models/Business/Provider/ProviderUserInvite.cs @@ -1,6 +1,6 @@ -using Bit.Core.Enums.Provider; +using Bit.Core.AdminConsole.Enums.Provider; -namespace Bit.Core.Models.Business.Provider; +namespace Bit.Core.AdminConsole.Models.Business.Provider; public class ProviderUserInvite { diff --git a/src/Core/Models/Data/Provider/ProviderAbility.cs b/src/Core/AdminConsole/Models/Data/Provider/ProviderAbility.cs similarity index 70% rename from src/Core/Models/Data/Provider/ProviderAbility.cs rename to src/Core/AdminConsole/Models/Data/Provider/ProviderAbility.cs index b7e45eaed4..459981681b 100644 --- a/src/Core/Models/Data/Provider/ProviderAbility.cs +++ b/src/Core/AdminConsole/Models/Data/Provider/ProviderAbility.cs @@ -1,12 +1,10 @@ -using Bit.Core.Entities.Provider; - -namespace Bit.Core.Models.Data; +namespace Bit.Core.AdminConsole.Models.Data.Provider; public class ProviderAbility { public ProviderAbility() { } - public ProviderAbility(Provider provider) + public ProviderAbility(Entities.Provider.Provider provider) { Id = provider.Id; UseEvents = provider.UseEvents; diff --git a/src/Core/Models/Data/Provider/ProviderOrganizationOrganizationDetails.cs b/src/Core/AdminConsole/Models/Data/Provider/ProviderOrganizationOrganizationDetails.cs similarity index 91% rename from src/Core/Models/Data/Provider/ProviderOrganizationOrganizationDetails.cs rename to src/Core/AdminConsole/Models/Data/Provider/ProviderOrganizationOrganizationDetails.cs index cf4f11b001..dc6d80b880 100644 --- a/src/Core/Models/Data/Provider/ProviderOrganizationOrganizationDetails.cs +++ b/src/Core/AdminConsole/Models/Data/Provider/ProviderOrganizationOrganizationDetails.cs @@ -1,6 +1,6 @@ using Bit.Core.Enums; -namespace Bit.Core.Models.Data; +namespace Bit.Core.AdminConsole.Models.Data.Provider; public class ProviderOrganizationOrganizationDetails { diff --git a/src/Core/Models/Data/Provider/ProviderOrganizationProviderDetails.cs b/src/Core/AdminConsole/Models/Data/Provider/ProviderOrganizationProviderDetails.cs similarity index 72% rename from src/Core/Models/Data/Provider/ProviderOrganizationProviderDetails.cs rename to src/Core/AdminConsole/Models/Data/Provider/ProviderOrganizationProviderDetails.cs index 8ae9559c86..e0a6faabbf 100644 --- a/src/Core/Models/Data/Provider/ProviderOrganizationProviderDetails.cs +++ b/src/Core/AdminConsole/Models/Data/Provider/ProviderOrganizationProviderDetails.cs @@ -1,6 +1,6 @@ -using Bit.Core.Enums.Provider; +using Bit.Core.AdminConsole.Enums.Provider; -namespace Bit.Core.Models.Data; +namespace Bit.Core.AdminConsole.Models.Data.Provider; public class ProviderOrganizationProviderDetails { diff --git a/src/Core/Models/Data/Provider/ProviderUserOrganizationDetails.cs b/src/Core/AdminConsole/Models/Data/Provider/ProviderUserOrganizationDetails.cs similarity index 89% rename from src/Core/Models/Data/Provider/ProviderUserOrganizationDetails.cs rename to src/Core/AdminConsole/Models/Data/Provider/ProviderUserOrganizationDetails.cs index 2d06fc4296..92f420a5b5 100644 --- a/src/Core/Models/Data/Provider/ProviderUserOrganizationDetails.cs +++ b/src/Core/AdminConsole/Models/Data/Provider/ProviderUserOrganizationDetails.cs @@ -1,6 +1,6 @@ -using Bit.Core.Enums.Provider; +using Bit.Core.AdminConsole.Enums.Provider; -namespace Bit.Core.Models.Data; +namespace Bit.Core.AdminConsole.Models.Data.Provider; public class ProviderUserOrganizationDetails { @@ -34,5 +34,5 @@ public class ProviderUserOrganizationDetails public Guid? ProviderId { get; set; } public Guid? ProviderUserId { get; set; } public string ProviderName { get; set; } - public Enums.PlanType PlanType { get; set; } + public Core.Enums.PlanType PlanType { get; set; } } diff --git a/src/Core/Models/Data/Provider/ProviderUserProviderDetails.cs b/src/Core/AdminConsole/Models/Data/Provider/ProviderUserProviderDetails.cs similarity index 82% rename from src/Core/Models/Data/Provider/ProviderUserProviderDetails.cs rename to src/Core/AdminConsole/Models/Data/Provider/ProviderUserProviderDetails.cs index 16f2e1dda5..2b7d240a5c 100644 --- a/src/Core/Models/Data/Provider/ProviderUserProviderDetails.cs +++ b/src/Core/AdminConsole/Models/Data/Provider/ProviderUserProviderDetails.cs @@ -1,6 +1,6 @@ -using Bit.Core.Enums.Provider; +using Bit.Core.AdminConsole.Enums.Provider; -namespace Bit.Core.Models.Data; +namespace Bit.Core.AdminConsole.Models.Data.Provider; public class ProviderUserProviderDetails { diff --git a/src/Core/Models/Data/Provider/ProviderUserPublicKey.cs b/src/Core/AdminConsole/Models/Data/Provider/ProviderUserPublicKey.cs similarity index 72% rename from src/Core/Models/Data/Provider/ProviderUserPublicKey.cs rename to src/Core/AdminConsole/Models/Data/Provider/ProviderUserPublicKey.cs index 0b161fd860..a9b37b2050 100644 --- a/src/Core/Models/Data/Provider/ProviderUserPublicKey.cs +++ b/src/Core/AdminConsole/Models/Data/Provider/ProviderUserPublicKey.cs @@ -1,4 +1,4 @@ -namespace Bit.Core.Models.Data; +namespace Bit.Core.AdminConsole.Models.Data.Provider; public class ProviderUserPublicKey { diff --git a/src/Core/Models/Data/Provider/ProviderUserUserDetails.cs b/src/Core/AdminConsole/Models/Data/Provider/ProviderUserUserDetails.cs similarity index 78% rename from src/Core/Models/Data/Provider/ProviderUserUserDetails.cs rename to src/Core/AdminConsole/Models/Data/Provider/ProviderUserUserDetails.cs index 51df1d44ef..94aa3fa0f3 100644 --- a/src/Core/Models/Data/Provider/ProviderUserUserDetails.cs +++ b/src/Core/AdminConsole/Models/Data/Provider/ProviderUserUserDetails.cs @@ -1,6 +1,6 @@ -using Bit.Core.Enums.Provider; +using Bit.Core.AdminConsole.Enums.Provider; -namespace Bit.Core.Models.Data; +namespace Bit.Core.AdminConsole.Models.Data.Provider; public class ProviderUserUserDetails { diff --git a/src/Core/Providers/Interfaces/ICreateProviderCommand.cs b/src/Core/AdminConsole/Providers/Interfaces/ICreateProviderCommand.cs similarity index 60% rename from src/Core/Providers/Interfaces/ICreateProviderCommand.cs rename to src/Core/AdminConsole/Providers/Interfaces/ICreateProviderCommand.cs index 4121b15335..93b3e387a3 100644 --- a/src/Core/Providers/Interfaces/ICreateProviderCommand.cs +++ b/src/Core/AdminConsole/Providers/Interfaces/ICreateProviderCommand.cs @@ -1,6 +1,6 @@ -using Bit.Core.Entities.Provider; +using Bit.Core.AdminConsole.Entities.Provider; -namespace Bit.Core.Providers.Interfaces; +namespace Bit.Core.AdminConsole.Providers.Interfaces; public interface ICreateProviderCommand { diff --git a/src/Core/Repositories/IProviderOrganizationRepository.cs b/src/Core/AdminConsole/Repositories/IProviderOrganizationRepository.cs similarity index 76% rename from src/Core/Repositories/IProviderOrganizationRepository.cs rename to src/Core/AdminConsole/Repositories/IProviderOrganizationRepository.cs index 8550a3d7bc..6f267295ef 100644 --- a/src/Core/Repositories/IProviderOrganizationRepository.cs +++ b/src/Core/AdminConsole/Repositories/IProviderOrganizationRepository.cs @@ -1,7 +1,8 @@ -using Bit.Core.Entities.Provider; -using Bit.Core.Models.Data; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.Repositories; -namespace Bit.Core.Repositories; +namespace Bit.Core.AdminConsole.Repositories; public interface IProviderOrganizationRepository : IRepository { diff --git a/src/Core/Repositories/IProviderRepository.cs b/src/Core/AdminConsole/Repositories/IProviderRepository.cs similarity index 63% rename from src/Core/Repositories/IProviderRepository.cs rename to src/Core/AdminConsole/Repositories/IProviderRepository.cs index 8939bba966..c9da0b2faa 100644 --- a/src/Core/Repositories/IProviderRepository.cs +++ b/src/Core/AdminConsole/Repositories/IProviderRepository.cs @@ -1,7 +1,8 @@ -using Bit.Core.Entities.Provider; -using Bit.Core.Models.Data; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.Repositories; -namespace Bit.Core.Repositories; +namespace Bit.Core.AdminConsole.Repositories; public interface IProviderRepository : IRepository { diff --git a/src/Core/Repositories/IProviderUserRepository.cs b/src/Core/AdminConsole/Repositories/IProviderUserRepository.cs similarity index 85% rename from src/Core/Repositories/IProviderUserRepository.cs rename to src/Core/AdminConsole/Repositories/IProviderUserRepository.cs index 9f0374fee3..34443f7d5f 100644 --- a/src/Core/Repositories/IProviderUserRepository.cs +++ b/src/Core/AdminConsole/Repositories/IProviderUserRepository.cs @@ -1,8 +1,9 @@ -using Bit.Core.Entities.Provider; -using Bit.Core.Enums.Provider; -using Bit.Core.Models.Data; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.Repositories; -namespace Bit.Core.Repositories; +namespace Bit.Core.AdminConsole.Repositories; public interface IProviderUserRepository : IRepository { diff --git a/src/Core/Services/IProviderService.cs b/src/Core/AdminConsole/Services/IProviderService.cs similarity index 89% rename from src/Core/Services/IProviderService.cs rename to src/Core/AdminConsole/Services/IProviderService.cs index c1ac8b5a33..f71403e80c 100644 --- a/src/Core/Services/IProviderService.cs +++ b/src/Core/AdminConsole/Services/IProviderService.cs @@ -1,9 +1,9 @@ -using Bit.Core.Entities; -using Bit.Core.Entities.Provider; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Models.Business.Provider; +using Bit.Core.Entities; using Bit.Core.Models.Business; -using Bit.Core.Models.Business.Provider; -namespace Bit.Core.Services; +namespace Bit.Core.AdminConsole.Services; public interface IProviderService { diff --git a/src/Core/Services/NoopImplementations/NoopProviderService.cs b/src/Core/AdminConsole/Services/NoopImplementations/NoopProviderService.cs similarity index 92% rename from src/Core/Services/NoopImplementations/NoopProviderService.cs rename to src/Core/AdminConsole/Services/NoopImplementations/NoopProviderService.cs index 596ec91718..b573764b3f 100644 --- a/src/Core/Services/NoopImplementations/NoopProviderService.cs +++ b/src/Core/AdminConsole/Services/NoopImplementations/NoopProviderService.cs @@ -1,9 +1,9 @@ -using Bit.Core.Entities; -using Bit.Core.Entities.Provider; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Models.Business.Provider; +using Bit.Core.Entities; using Bit.Core.Models.Business; -using Bit.Core.Models.Business.Provider; -namespace Bit.Core.Services; +namespace Bit.Core.AdminConsole.Services.NoopImplementations; public class NoopProviderService : IProviderService { diff --git a/src/Core/Context/CurrentContext.cs b/src/Core/Context/CurrentContext.cs index 4751beb797..870d5f0480 100644 --- a/src/Core/Context/CurrentContext.cs +++ b/src/Core/Context/CurrentContext.cs @@ -1,7 +1,10 @@ using System.Security.Claims; +using Bit.Core.AdminConsole.Context; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.Enums.Provider; using Bit.Core.Identity; using Bit.Core.Models.Data; using Bit.Core.Repositories; diff --git a/src/Core/Context/ICurrentContext.cs b/src/Core/Context/ICurrentContext.cs index c2e362d435..ee37081421 100644 --- a/src/Core/Context/ICurrentContext.cs +++ b/src/Core/Context/ICurrentContext.cs @@ -1,4 +1,6 @@ using System.Security.Claims; +using Bit.Core.AdminConsole.Context; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Identity; diff --git a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs index 0470d5ebc3..4beb15885c 100644 --- a/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs +++ b/src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs @@ -1,4 +1,4 @@ -using Bit.Core.Enums.Provider; +using Bit.Core.AdminConsole.Enums.Provider; namespace Bit.Core.Models.Data.Organizations.OrganizationUsers; diff --git a/src/Core/OrganizationFeatures/OrganizationSubscriptions/AddSecretsManagerSubscriptionCommand.cs b/src/Core/OrganizationFeatures/OrganizationSubscriptions/AddSecretsManagerSubscriptionCommand.cs index bd33f336e4..951246bd25 100644 --- a/src/Core/OrganizationFeatures/OrganizationSubscriptions/AddSecretsManagerSubscriptionCommand.cs +++ b/src/Core/OrganizationFeatures/OrganizationSubscriptions/AddSecretsManagerSubscriptionCommand.cs @@ -1,10 +1,10 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Repositories; +using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.Enums.Provider; using Bit.Core.Exceptions; using Bit.Core.Models.Business; using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface; -using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Utilities; diff --git a/src/Core/Services/IApplicationCacheService.cs b/src/Core/Services/IApplicationCacheService.cs index 7c21fac76f..0537251af2 100644 --- a/src/Core/Services/IApplicationCacheService.cs +++ b/src/Core/Services/IApplicationCacheService.cs @@ -1,6 +1,6 @@ -using Bit.Core.Entities; -using Bit.Core.Entities.Provider; -using Bit.Core.Models.Data; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.Entities; using Bit.Core.Models.Data.Organizations; namespace Bit.Core.Services; diff --git a/src/Core/Services/IEventService.cs b/src/Core/Services/IEventService.cs index 91a1a0782e..38d147b50b 100644 --- a/src/Core/Services/IEventService.cs +++ b/src/Core/Services/IEventService.cs @@ -1,6 +1,6 @@ using Bit.Core.AdminConsole.Entities; +using Bit.Core.AdminConsole.Entities.Provider; using Bit.Core.Entities; -using Bit.Core.Entities.Provider; using Bit.Core.Enums; using Bit.Core.SecretsManager.Entities; using Bit.Core.Vault.Entities; diff --git a/src/Core/Services/IMailService.cs b/src/Core/Services/IMailService.cs index 6350a0e461..1b673c9fae 100644 --- a/src/Core/Services/IMailService.cs +++ b/src/Core/Services/IMailService.cs @@ -1,7 +1,7 @@ -using Bit.Core.Auth.Entities; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.Auth.Entities; using Bit.Core.Auth.Models.Business; using Bit.Core.Entities; -using Bit.Core.Entities.Provider; using Bit.Core.Models.Mail; namespace Bit.Core.Services; diff --git a/src/Core/Services/Implementations/EventService.cs b/src/Core/Services/Implementations/EventService.cs index e2545ba6e5..a11354c517 100644 --- a/src/Core/Services/Implementations/EventService.cs +++ b/src/Core/Services/Implementations/EventService.cs @@ -1,7 +1,9 @@ using Bit.Core.AdminConsole.Entities; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Context; using Bit.Core.Entities; -using Bit.Core.Entities.Provider; using Bit.Core.Enums; using Bit.Core.Models.Data; using Bit.Core.Models.Data.Organizations; diff --git a/src/Core/Services/Implementations/HandlebarsMailService.cs b/src/Core/Services/Implementations/HandlebarsMailService.cs index 24974f7ff0..0e55407da7 100644 --- a/src/Core/Services/Implementations/HandlebarsMailService.cs +++ b/src/Core/Services/Implementations/HandlebarsMailService.cs @@ -1,10 +1,10 @@ using System.Net; using System.Reflection; +using Bit.Core.AdminConsole.Entities.Provider; using Bit.Core.Auth.Entities; using Bit.Core.Auth.Models.Business; using Bit.Core.Auth.Models.Mail; using Bit.Core.Entities; -using Bit.Core.Entities.Provider; using Bit.Core.Models.Mail; using Bit.Core.Models.Mail.FamiliesForEnterprise; using Bit.Core.Models.Mail.Provider; diff --git a/src/Core/Services/Implementations/InMemoryApplicationCacheService.cs b/src/Core/Services/Implementations/InMemoryApplicationCacheService.cs index dc23fcdb82..140392ba2b 100644 --- a/src/Core/Services/Implementations/InMemoryApplicationCacheService.cs +++ b/src/Core/Services/Implementations/InMemoryApplicationCacheService.cs @@ -1,6 +1,7 @@ -using Bit.Core.Entities; -using Bit.Core.Entities.Provider; -using Bit.Core.Models.Data; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.AdminConsole.Repositories; +using Bit.Core.Entities; using Bit.Core.Models.Data.Organizations; using Bit.Core.Repositories; diff --git a/src/Core/Services/Implementations/InMemoryServiceBusApplicationCacheService.cs b/src/Core/Services/Implementations/InMemoryServiceBusApplicationCacheService.cs index 7067efd82c..e4ae033169 100644 --- a/src/Core/Services/Implementations/InMemoryServiceBusApplicationCacheService.cs +++ b/src/Core/Services/Implementations/InMemoryServiceBusApplicationCacheService.cs @@ -1,4 +1,5 @@ using Azure.Messaging.ServiceBus; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Repositories; diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs index 45614387b7..8063bc0c56 100644 --- a/src/Core/Services/Implementations/OrganizationService.cs +++ b/src/Core/Services/Implementations/OrganizationService.cs @@ -1,6 +1,7 @@ using System.Security.Claims; using System.Text.Json; using Bit.Core.AdminConsole.Entities; +using Bit.Core.AdminConsole.Enums.Provider; using Bit.Core.AdminConsole.Models.Business; using Bit.Core.AdminConsole.Repositories; using Bit.Core.Auth.Enums; @@ -9,7 +10,6 @@ using Bit.Core.Auth.Repositories; using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.Enums.Provider; using Bit.Core.Exceptions; using Bit.Core.Models.Business; using Bit.Core.Models.Data; diff --git a/src/Core/Services/Implementations/UserService.cs b/src/Core/Services/Implementations/UserService.cs index 643e1bf18e..a439ca26c4 100644 --- a/src/Core/Services/Implementations/UserService.cs +++ b/src/Core/Services/Implementations/UserService.cs @@ -1,5 +1,6 @@ using System.Security.Claims; using System.Text.Json; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Auth.Enums; using Bit.Core.Auth.Models; using Bit.Core.Context; diff --git a/src/Core/Services/NoopImplementations/NoopEventService.cs b/src/Core/Services/NoopImplementations/NoopEventService.cs index 5d5dba16fb..9a9d831c4e 100644 --- a/src/Core/Services/NoopImplementations/NoopEventService.cs +++ b/src/Core/Services/NoopImplementations/NoopEventService.cs @@ -1,6 +1,6 @@ using Bit.Core.AdminConsole.Entities; +using Bit.Core.AdminConsole.Entities.Provider; using Bit.Core.Entities; -using Bit.Core.Entities.Provider; using Bit.Core.Enums; using Bit.Core.SecretsManager.Entities; using Bit.Core.Vault.Entities; diff --git a/src/Core/Services/NoopImplementations/NoopMailService.cs b/src/Core/Services/NoopImplementations/NoopMailService.cs index 089ae18f18..e098d7051e 100644 --- a/src/Core/Services/NoopImplementations/NoopMailService.cs +++ b/src/Core/Services/NoopImplementations/NoopMailService.cs @@ -1,7 +1,7 @@ -using Bit.Core.Auth.Entities; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.Auth.Entities; using Bit.Core.Auth.Models.Business; using Bit.Core.Entities; -using Bit.Core.Entities.Provider; using Bit.Core.Models.Mail; namespace Bit.Core.Services; diff --git a/src/Core/Utilities/CoreHelpers.cs b/src/Core/Utilities/CoreHelpers.cs index c128fa8e46..b125fba49e 100644 --- a/src/Core/Utilities/CoreHelpers.cs +++ b/src/Core/Utilities/CoreHelpers.cs @@ -10,11 +10,12 @@ using Azure; using Azure.Storage.Blobs; using Azure.Storage.Blobs.Models; using Azure.Storage.Queues.Models; +using Bit.Core.AdminConsole.Context; +using Bit.Core.AdminConsole.Enums.Provider; using Bit.Core.Auth.Enums; using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.Enums.Provider; using Bit.Core.Identity; using Bit.Core.Settings; using IdentityModel; diff --git a/src/Identity/IdentityServer/ClientStore.cs b/src/Identity/IdentityServer/ClientStore.cs index f857e72259..259898f209 100644 --- a/src/Identity/IdentityServer/ClientStore.cs +++ b/src/Identity/IdentityServer/ClientStore.cs @@ -1,5 +1,6 @@ using System.Collections.ObjectModel; using System.Security.Claims; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Context; using Bit.Core.Enums; using Bit.Core.Identity; diff --git a/src/Identity/IdentityServer/ProfileService.cs b/src/Identity/IdentityServer/ProfileService.cs index e8cad3c01d..bbec6739ba 100644 --- a/src/Identity/IdentityServer/ProfileService.cs +++ b/src/Identity/IdentityServer/ProfileService.cs @@ -1,4 +1,5 @@ using System.Security.Claims; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Context; using Bit.Core.Identity; using Bit.Core.Repositories; diff --git a/src/Infrastructure.Dapper/Repositories/ProviderOrganizationRepository.cs b/src/Infrastructure.Dapper/AdminConsole/Repositories/ProviderOrganizationRepository.cs similarity index 96% rename from src/Infrastructure.Dapper/Repositories/ProviderOrganizationRepository.cs rename to src/Infrastructure.Dapper/AdminConsole/Repositories/ProviderOrganizationRepository.cs index 604d81a6e2..66b4ad8560 100644 --- a/src/Infrastructure.Dapper/Repositories/ProviderOrganizationRepository.cs +++ b/src/Infrastructure.Dapper/AdminConsole/Repositories/ProviderOrganizationRepository.cs @@ -1,12 +1,13 @@ using System.Data; -using Bit.Core.Entities.Provider; -using Bit.Core.Models.Data; -using Bit.Core.Repositories; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Settings; +using Bit.Infrastructure.Dapper.Repositories; using Dapper; using Microsoft.Data.SqlClient; -namespace Bit.Infrastructure.Dapper.Repositories; +namespace Bit.Infrastructure.Dapper.AdminConsole.Repositories; public class ProviderOrganizationRepository : Repository, IProviderOrganizationRepository { diff --git a/src/Infrastructure.Dapper/Repositories/ProviderRepository.cs b/src/Infrastructure.Dapper/AdminConsole/Repositories/ProviderRepository.cs similarity index 88% rename from src/Infrastructure.Dapper/Repositories/ProviderRepository.cs rename to src/Infrastructure.Dapper/AdminConsole/Repositories/ProviderRepository.cs index 39bc029312..812ed30ff1 100644 --- a/src/Infrastructure.Dapper/Repositories/ProviderRepository.cs +++ b/src/Infrastructure.Dapper/AdminConsole/Repositories/ProviderRepository.cs @@ -1,12 +1,13 @@ using System.Data; -using Bit.Core.Entities.Provider; -using Bit.Core.Models.Data; -using Bit.Core.Repositories; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Settings; +using Bit.Infrastructure.Dapper.Repositories; using Dapper; using Microsoft.Data.SqlClient; -namespace Bit.Infrastructure.Dapper.Repositories; +namespace Bit.Infrastructure.Dapper.AdminConsole.Repositories; public class ProviderRepository : Repository, IProviderRepository { diff --git a/src/Infrastructure.Dapper/Repositories/ProviderUserRepository.cs b/src/Infrastructure.Dapper/AdminConsole/Repositories/ProviderUserRepository.cs similarity index 95% rename from src/Infrastructure.Dapper/Repositories/ProviderUserRepository.cs rename to src/Infrastructure.Dapper/AdminConsole/Repositories/ProviderUserRepository.cs index 114ed53f54..dafa78a07f 100644 --- a/src/Infrastructure.Dapper/Repositories/ProviderUserRepository.cs +++ b/src/Infrastructure.Dapper/AdminConsole/Repositories/ProviderUserRepository.cs @@ -1,13 +1,14 @@ using System.Data; -using Bit.Core.Entities.Provider; -using Bit.Core.Enums.Provider; -using Bit.Core.Models.Data; -using Bit.Core.Repositories; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Settings; +using Bit.Infrastructure.Dapper.Repositories; using Dapper; using Microsoft.Data.SqlClient; -namespace Bit.Infrastructure.Dapper.Repositories; +namespace Bit.Infrastructure.Dapper.AdminConsole.Repositories; public class ProviderUserRepository : Repository, IProviderUserRepository { diff --git a/src/Infrastructure.EntityFramework/AdminConsole/Models/Provider/Provider.cs b/src/Infrastructure.EntityFramework/AdminConsole/Models/Provider/Provider.cs new file mode 100644 index 0000000000..3801c9ee69 --- /dev/null +++ b/src/Infrastructure.EntityFramework/AdminConsole/Models/Provider/Provider.cs @@ -0,0 +1,15 @@ +using AutoMapper; + +namespace Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider; + +public class Provider : Core.AdminConsole.Entities.Provider.Provider +{ +} + +public class ProviderMapperProfile : Profile +{ + public ProviderMapperProfile() + { + CreateMap().ReverseMap(); + } +} diff --git a/src/Infrastructure.EntityFramework/AdminConsole/Models/Provider/ProviderOrganization.cs b/src/Infrastructure.EntityFramework/AdminConsole/Models/Provider/ProviderOrganization.cs new file mode 100644 index 0000000000..82bc26c5d5 --- /dev/null +++ b/src/Infrastructure.EntityFramework/AdminConsole/Models/Provider/ProviderOrganization.cs @@ -0,0 +1,18 @@ +using AutoMapper; +using Bit.Infrastructure.EntityFramework.Models; + +namespace Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider; + +public class ProviderOrganization : Core.AdminConsole.Entities.Provider.ProviderOrganization +{ + public virtual Provider Provider { get; set; } + public virtual Organization Organization { get; set; } +} + +public class ProviderOrganizationMapperProfile : Profile +{ + public ProviderOrganizationMapperProfile() + { + CreateMap().ReverseMap(); + } +} diff --git a/src/Infrastructure.EntityFramework/AdminConsole/Models/Provider/ProviderUser.cs b/src/Infrastructure.EntityFramework/AdminConsole/Models/Provider/ProviderUser.cs new file mode 100644 index 0000000000..1b6de00960 --- /dev/null +++ b/src/Infrastructure.EntityFramework/AdminConsole/Models/Provider/ProviderUser.cs @@ -0,0 +1,18 @@ +using AutoMapper; +using Bit.Infrastructure.EntityFramework.Models; + +namespace Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider; + +public class ProviderUser : Core.AdminConsole.Entities.Provider.ProviderUser +{ + public virtual User User { get; set; } + public virtual Provider Provider { get; set; } +} + +public class ProviderUserMapperProfile : Profile +{ + public ProviderUserMapperProfile() + { + CreateMap().ReverseMap(); + } +} diff --git a/src/Infrastructure.EntityFramework/Repositories/ProviderOrganizationRepository.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/ProviderOrganizationRepository.cs similarity index 84% rename from src/Infrastructure.EntityFramework/Repositories/ProviderOrganizationRepository.cs rename to src/Infrastructure.EntityFramework/AdminConsole/Repositories/ProviderOrganizationRepository.cs index c5a6d34e27..77f5f8edc1 100644 --- a/src/Infrastructure.EntityFramework/Repositories/ProviderOrganizationRepository.cs +++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/ProviderOrganizationRepository.cs @@ -1,15 +1,16 @@ using AutoMapper; -using Bit.Core.Entities.Provider; -using Bit.Core.Models.Data; -using Bit.Core.Repositories; -using Bit.Infrastructure.EntityFramework.Repositories.Queries; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.AdminConsole.Repositories; +using Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries; +using Bit.Infrastructure.EntityFramework.Repositories; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; -namespace Bit.Infrastructure.EntityFramework.Repositories; +namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories; public class ProviderOrganizationRepository : - Repository, IProviderOrganizationRepository + Repository, IProviderOrganizationRepository { public ProviderOrganizationRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper) : base(serviceScopeFactory, mapper, context => context.ProviderOrganizations) diff --git a/src/Infrastructure.EntityFramework/Repositories/ProviderRepository.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/ProviderRepository.cs similarity index 90% rename from src/Infrastructure.EntityFramework/Repositories/ProviderRepository.cs rename to src/Infrastructure.EntityFramework/AdminConsole/Repositories/ProviderRepository.cs index 8f66100738..3c2ac73b83 100644 --- a/src/Infrastructure.EntityFramework/Repositories/ProviderRepository.cs +++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/ProviderRepository.cs @@ -1,13 +1,14 @@ using AutoMapper; -using Bit.Core.Entities.Provider; -using Bit.Core.Models.Data; -using Bit.Core.Repositories; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.AdminConsole.Repositories; +using Bit.Infrastructure.EntityFramework.Repositories; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; -namespace Bit.Infrastructure.EntityFramework.Repositories; +namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories; -public class ProviderRepository : Repository, IProviderRepository +public class ProviderRepository : Repository, IProviderRepository { public ProviderRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper) diff --git a/src/Infrastructure.EntityFramework/Repositories/ProviderUserRepository.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/ProviderUserRepository.cs similarity index 94% rename from src/Infrastructure.EntityFramework/Repositories/ProviderUserRepository.cs rename to src/Infrastructure.EntityFramework/AdminConsole/Repositories/ProviderUserRepository.cs index e858347fe2..ad4422da63 100644 --- a/src/Infrastructure.EntityFramework/Repositories/ProviderUserRepository.cs +++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/ProviderUserRepository.cs @@ -1,16 +1,18 @@ using AutoMapper; -using Bit.Core.Entities.Provider; -using Bit.Core.Enums.Provider; -using Bit.Core.Models.Data; -using Bit.Core.Repositories; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.AdminConsole.Repositories; +using Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries; +using Bit.Infrastructure.EntityFramework.Repositories; using Bit.Infrastructure.EntityFramework.Repositories.Queries; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; -namespace Bit.Infrastructure.EntityFramework.Repositories; +namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories; public class ProviderUserRepository : - Repository, IProviderUserRepository + Repository, IProviderUserRepository { public ProviderUserRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper) : base(serviceScopeFactory, mapper, (DatabaseContext context) => context.ProviderUsers) diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderOrganizationCountByOrganizationIdsQuery.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderOrganizationCountByOrganizationIdsQuery.cs similarity index 70% rename from src/Infrastructure.EntityFramework/Repositories/Queries/ProviderOrganizationCountByOrganizationIdsQuery.cs rename to src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderOrganizationCountByOrganizationIdsQuery.cs index 4d9357f2f7..3f39f2fc52 100644 --- a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderOrganizationCountByOrganizationIdsQuery.cs +++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderOrganizationCountByOrganizationIdsQuery.cs @@ -1,6 +1,8 @@ -using Bit.Core.Entities.Provider; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Infrastructure.EntityFramework.Repositories; +using Bit.Infrastructure.EntityFramework.Repositories.Queries; -namespace Bit.Infrastructure.EntityFramework.Repositories.Queries; +namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries; public class ProviderOrganizationCountByOrganizationIdsQuery : IQuery { diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderOrganizationOrganizationDetailsReadByProviderIdQuery.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderOrganizationOrganizationDetailsReadByProviderIdQuery.cs similarity index 85% rename from src/Infrastructure.EntityFramework/Repositories/Queries/ProviderOrganizationOrganizationDetailsReadByProviderIdQuery.cs rename to src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderOrganizationOrganizationDetailsReadByProviderIdQuery.cs index 04d690a743..af42114ad8 100644 --- a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderOrganizationOrganizationDetailsReadByProviderIdQuery.cs +++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderOrganizationOrganizationDetailsReadByProviderIdQuery.cs @@ -1,6 +1,8 @@ -using Bit.Core.Models.Data; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Infrastructure.EntityFramework.Repositories; +using Bit.Infrastructure.EntityFramework.Repositories.Queries; -namespace Bit.Infrastructure.EntityFramework.Repositories.Queries; +namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries; public class ProviderOrganizationOrganizationDetailsReadByProviderIdQuery : IQuery { diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderOrganizationReadByUserIdQuery.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderOrganizationReadByUserIdQuery.cs similarity index 80% rename from src/Infrastructure.EntityFramework/Repositories/Queries/ProviderOrganizationReadByUserIdQuery.cs rename to src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderOrganizationReadByUserIdQuery.cs index d28e178ab0..896be67a05 100644 --- a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderOrganizationReadByUserIdQuery.cs +++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderOrganizationReadByUserIdQuery.cs @@ -1,6 +1,8 @@ -using Bit.Core.Models.Data; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Infrastructure.EntityFramework.Repositories; +using Bit.Infrastructure.EntityFramework.Repositories.Queries; -namespace Bit.Infrastructure.EntityFramework.Repositories.Queries; +namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries; public class ProviderOrganizationReadByUserIdQuery : IQuery { diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserOrganizationDetailsViewQuery.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderUserOrganizationDetailsViewQuery.cs similarity index 87% rename from src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserOrganizationDetailsViewQuery.cs rename to src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderUserOrganizationDetailsViewQuery.cs index d578012f42..95a83968bc 100644 --- a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserOrganizationDetailsViewQuery.cs +++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderUserOrganizationDetailsViewQuery.cs @@ -1,6 +1,8 @@ -using Bit.Core.Models.Data; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Infrastructure.EntityFramework.Repositories; +using Bit.Infrastructure.EntityFramework.Repositories.Queries; -namespace Bit.Infrastructure.EntityFramework.Repositories.Queries; +namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries; public class ProviderUserOrganizationDetailsViewQuery : IQuery { diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserProviderDetailsReadByUserIdStatusQuery.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderUserProviderDetailsReadByUserIdStatusQuery.cs similarity index 81% rename from src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserProviderDetailsReadByUserIdStatusQuery.cs rename to src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderUserProviderDetailsReadByUserIdStatusQuery.cs index 1cae8437ac..6469ffc9ce 100644 --- a/src/Infrastructure.EntityFramework/Repositories/Queries/ProviderUserProviderDetailsReadByUserIdStatusQuery.cs +++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/ProviderUserProviderDetailsReadByUserIdStatusQuery.cs @@ -1,7 +1,9 @@ -using Bit.Core.Enums.Provider; -using Bit.Core.Models.Data; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Infrastructure.EntityFramework.Repositories; +using Bit.Infrastructure.EntityFramework.Repositories.Queries; -namespace Bit.Infrastructure.EntityFramework.Repositories.Queries; +namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries; public class ProviderUserProviderDetailsReadByUserIdStatusQuery : IQuery { diff --git a/src/Infrastructure.EntityFramework/Models/Provider/Provider.cs b/src/Infrastructure.EntityFramework/Models/Provider/Provider.cs deleted file mode 100644 index d639d6d01d..0000000000 --- a/src/Infrastructure.EntityFramework/Models/Provider/Provider.cs +++ /dev/null @@ -1,15 +0,0 @@ -using AutoMapper; - -namespace Bit.Infrastructure.EntityFramework.Models; - -public class Provider : Core.Entities.Provider.Provider -{ -} - -public class ProviderMapperProfile : Profile -{ - public ProviderMapperProfile() - { - CreateMap().ReverseMap(); - } -} diff --git a/src/Infrastructure.EntityFramework/Models/Provider/ProviderOrganization.cs b/src/Infrastructure.EntityFramework/Models/Provider/ProviderOrganization.cs deleted file mode 100644 index af23ba978c..0000000000 --- a/src/Infrastructure.EntityFramework/Models/Provider/ProviderOrganization.cs +++ /dev/null @@ -1,17 +0,0 @@ -using AutoMapper; - -namespace Bit.Infrastructure.EntityFramework.Models; - -public class ProviderOrganization : Core.Entities.Provider.ProviderOrganization -{ - public virtual Provider Provider { get; set; } - public virtual Organization Organization { get; set; } -} - -public class ProviderOrganizationMapperProfile : Profile -{ - public ProviderOrganizationMapperProfile() - { - CreateMap().ReverseMap(); - } -} diff --git a/src/Infrastructure.EntityFramework/Models/Provider/ProviderUser.cs b/src/Infrastructure.EntityFramework/Models/Provider/ProviderUser.cs deleted file mode 100644 index 5c53c4d979..0000000000 --- a/src/Infrastructure.EntityFramework/Models/Provider/ProviderUser.cs +++ /dev/null @@ -1,17 +0,0 @@ -using AutoMapper; - -namespace Bit.Infrastructure.EntityFramework.Models; - -public class ProviderUser : Core.Entities.Provider.ProviderUser -{ - public virtual User User { get; set; } - public virtual Provider Provider { get; set; } -} - -public class ProviderUserMapperProfile : Profile -{ - public ProviderUserMapperProfile() - { - CreateMap().ReverseMap(); - } -} diff --git a/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs b/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs index 128acb33ec..ab23970cc0 100644 --- a/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs +++ b/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs @@ -1,4 +1,5 @@ using Bit.Core; +using Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider; using Bit.Infrastructure.EntityFramework.Auth.Models; using Bit.Infrastructure.EntityFramework.Converters; using Bit.Infrastructure.EntityFramework.Models; diff --git a/src/Infrastructure.EntityFramework/Repositories/DatabaseContextExtensions.cs b/src/Infrastructure.EntityFramework/Repositories/DatabaseContextExtensions.cs index 480855d61c..7280642596 100644 --- a/src/Infrastructure.EntityFramework/Repositories/DatabaseContextExtensions.cs +++ b/src/Infrastructure.EntityFramework/Repositories/DatabaseContextExtensions.cs @@ -1,6 +1,6 @@ -using Bit.Core.Auth.Enums; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.Auth.Enums; using Bit.Core.Enums; -using Bit.Core.Enums.Provider; using Bit.Infrastructure.EntityFramework.Repositories.Queries; using Microsoft.EntityFrameworkCore; diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/UserReadPublicKeysByProviderUserIdsQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/UserReadPublicKeysByProviderUserIdsQuery.cs index db347b99b4..bb54520f4b 100644 --- a/src/Infrastructure.EntityFramework/Repositories/Queries/UserReadPublicKeysByProviderUserIdsQuery.cs +++ b/src/Infrastructure.EntityFramework/Repositories/Queries/UserReadPublicKeysByProviderUserIdsQuery.cs @@ -1,5 +1,5 @@ -using Bit.Core.Enums.Provider; -using Bit.Core.Models.Data; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; namespace Bit.Infrastructure.EntityFramework.Repositories.Queries; diff --git a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs index 20b8d31c8f..0143c9296e 100644 --- a/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs +++ b/src/SharedWeb/Utilities/ServiceCollectionExtensions.cs @@ -5,6 +5,7 @@ using System.Security.Cryptography.X509Certificates; using AspNetCoreRateLimit; using Bit.Core.AdminConsole.Services; using Bit.Core.AdminConsole.Services.Implementations; +using Bit.Core.AdminConsole.Services.NoopImplementations; using Bit.Core.Auth.Enums; using Bit.Core.Auth.Identity; using Bit.Core.Auth.IdentityServer; diff --git a/test/Api.Test/AdminConsole/Controllers/OrganizationsControllerTests.cs b/test/Api.Test/AdminConsole/Controllers/OrganizationsControllerTests.cs index 2568ba518a..1ba9ed60d9 100644 --- a/test/Api.Test/AdminConsole/Controllers/OrganizationsControllerTests.cs +++ b/test/Api.Test/AdminConsole/Controllers/OrganizationsControllerTests.cs @@ -1,6 +1,7 @@ using System.Security.Claims; using AutoFixture.Xunit2; using Bit.Api.AdminConsole.Controllers; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Auth.Entities; using Bit.Core.Auth.Enums; using Bit.Core.Auth.Models.Data; diff --git a/test/Api.Test/Controllers/AccountsControllerTests.cs b/test/Api.Test/Controllers/AccountsControllerTests.cs index 0dff6db93d..0bd368790e 100644 --- a/test/Api.Test/Controllers/AccountsControllerTests.cs +++ b/test/Api.Test/Controllers/AccountsControllerTests.cs @@ -1,6 +1,7 @@ using System.Security.Claims; using Bit.Api.Auth.Models.Request.Accounts; using Bit.Api.Controllers; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Auth.Models.Api.Request.Accounts; using Bit.Core.Auth.Services; using Bit.Core.Entities; diff --git a/test/Api.Test/Vault/Controllers/SyncControllerTests.cs b/test/Api.Test/Vault/Controllers/SyncControllerTests.cs index 0034120b19..e1a9c15629 100644 --- a/test/Api.Test/Vault/Controllers/SyncControllerTests.cs +++ b/test/Api.Test/Vault/Controllers/SyncControllerTests.cs @@ -3,9 +3,11 @@ using System.Text.Json; using AutoFixture; using Bit.Api.Vault.Controllers; using Bit.Api.Vault.Models.Response; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.Enums.Provider; using Bit.Core.Exceptions; using Bit.Core.Models.Data; using Bit.Core.Models.Data.Organizations.OrganizationUsers; diff --git a/test/Core.Test/OrganizationFeatures/OrganizationSubscriptionUpdate/AddSecretsManagerSubscriptionCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationSubscriptionUpdate/AddSecretsManagerSubscriptionCommandTests.cs index 810561c4b5..e3b9487197 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationSubscriptionUpdate/AddSecretsManagerSubscriptionCommandTests.cs +++ b/test/Core.Test/OrganizationFeatures/OrganizationSubscriptionUpdate/AddSecretsManagerSubscriptionCommandTests.cs @@ -1,12 +1,12 @@ -using Bit.Core.Entities; -using Bit.Core.Entities.Provider; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Repositories; +using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.Enums.Provider; using Bit.Core.Exceptions; using Bit.Core.Models.Business; using Bit.Core.Models.StaticStore; using Bit.Core.OrganizationFeatures.OrganizationSubscriptions; -using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Utilities; using Bit.Test.Common.AutoFixture; diff --git a/test/Core.Test/Services/EventServiceTests.cs b/test/Core.Test/Services/EventServiceTests.cs index ad73541d14..18f5371b49 100644 --- a/test/Core.Test/Services/EventServiceTests.cs +++ b/test/Core.Test/Services/EventServiceTests.cs @@ -1,7 +1,8 @@ using Bit.Core.AdminConsole.Entities; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Models.Data.Provider; using Bit.Core.Context; using Bit.Core.Entities; -using Bit.Core.Entities.Provider; using Bit.Core.Enums; using Bit.Core.Models.Data; using Bit.Core.Models.Data.Organizations; diff --git a/test/Core.Test/Services/HandlebarsMailServiceTests.cs b/test/Core.Test/Services/HandlebarsMailServiceTests.cs index a29e884367..266fbc0159 100644 --- a/test/Core.Test/Services/HandlebarsMailServiceTests.cs +++ b/test/Core.Test/Services/HandlebarsMailServiceTests.cs @@ -1,8 +1,8 @@ using System.Reflection; +using Bit.Core.AdminConsole.Entities.Provider; using Bit.Core.Auth.Entities; using Bit.Core.Auth.Models.Business; using Bit.Core.Entities; -using Bit.Core.Entities.Provider; using Bit.Core.Services; using Bit.Core.Settings; using Microsoft.Extensions.Logging; diff --git a/test/Core.Test/Services/InMemoryApplicationCacheServiceTests.cs b/test/Core.Test/Services/InMemoryApplicationCacheServiceTests.cs index ff8e734b32..37e91c001c 100644 --- a/test/Core.Test/Services/InMemoryApplicationCacheServiceTests.cs +++ b/test/Core.Test/Services/InMemoryApplicationCacheServiceTests.cs @@ -1,4 +1,5 @@ -using Bit.Core.Repositories; +using Bit.Core.AdminConsole.Repositories; +using Bit.Core.Repositories; using Bit.Core.Services; using NSubstitute; using Xunit; diff --git a/test/Core.Test/Services/InMemoryServiceBusApplicationCacheServiceTests.cs b/test/Core.Test/Services/InMemoryServiceBusApplicationCacheServiceTests.cs index f74aa6f505..fcc6a63e50 100644 --- a/test/Core.Test/Services/InMemoryServiceBusApplicationCacheServiceTests.cs +++ b/test/Core.Test/Services/InMemoryServiceBusApplicationCacheServiceTests.cs @@ -1,4 +1,5 @@ -using Bit.Core.Repositories; +using Bit.Core.AdminConsole.Repositories; +using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings; using NSubstitute; diff --git a/test/Core.Test/Services/OrganizationServiceTests.cs b/test/Core.Test/Services/OrganizationServiceTests.cs index 2354d16bf9..c3c5219cdd 100644 --- a/test/Core.Test/Services/OrganizationServiceTests.cs +++ b/test/Core.Test/Services/OrganizationServiceTests.cs @@ -1,4 +1,7 @@ using System.Text.Json; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Auth.Entities; using Bit.Core.Auth.Enums; using Bit.Core.Auth.Models.Business; @@ -6,9 +9,7 @@ using Bit.Core.Auth.Models.Data; using Bit.Core.Auth.Repositories; using Bit.Core.Context; using Bit.Core.Entities; -using Bit.Core.Entities.Provider; using Bit.Core.Enums; -using Bit.Core.Enums.Provider; using Bit.Core.Exceptions; using Bit.Core.Models.Business; using Bit.Core.Models.Data; diff --git a/test/Core.Test/Services/UserServiceTests.cs b/test/Core.Test/Services/UserServiceTests.cs index 92de67a4e6..252ec65f59 100644 --- a/test/Core.Test/Services/UserServiceTests.cs +++ b/test/Core.Test/Services/UserServiceTests.cs @@ -1,4 +1,5 @@ using System.Text.Json; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Auth.Enums; using Bit.Core.Auth.Models; using Bit.Core.Context; diff --git a/test/Core.Test/Utilities/CoreHelpersTests.cs b/test/Core.Test/Utilities/CoreHelpersTests.cs index 4def694042..6534feef55 100644 --- a/test/Core.Test/Utilities/CoreHelpersTests.cs +++ b/test/Core.Test/Utilities/CoreHelpersTests.cs @@ -1,9 +1,10 @@ using System.Text; using AutoFixture; +using Bit.Core.AdminConsole.Context; +using Bit.Core.AdminConsole.Enums.Provider; using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.Enums.Provider; using Bit.Core.Test.AutoFixture.UserFixtures; using Bit.Core.Utilities; using Bit.Test.Common.AutoFixture; diff --git a/test/Infrastructure.EFIntegration.Test/AutoFixture/EntityFrameworkRepositoryFixtures.cs b/test/Infrastructure.EFIntegration.Test/AutoFixture/EntityFrameworkRepositoryFixtures.cs index fd14cde65b..b610f51da2 100644 --- a/test/Infrastructure.EFIntegration.Test/AutoFixture/EntityFrameworkRepositoryFixtures.cs +++ b/test/Infrastructure.EFIntegration.Test/AutoFixture/EntityFrameworkRepositoryFixtures.cs @@ -4,6 +4,7 @@ using AutoFixture.Kernel; using AutoMapper; using Bit.Core.Settings; using Bit.Infrastructure.EFIntegration.Test.Helpers; +using Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider; using Bit.Infrastructure.EntityFramework.Auth.Models; using Bit.Infrastructure.EntityFramework.Models; using Bit.Infrastructure.EntityFramework.Repositories; diff --git a/test/Infrastructure.EFIntegration.Test/AutoFixture/PolicyFixtures.cs b/test/Infrastructure.EFIntegration.Test/AutoFixture/PolicyFixtures.cs index 70cea3e011..5ecd31f9c6 100644 --- a/test/Infrastructure.EFIntegration.Test/AutoFixture/PolicyFixtures.cs +++ b/test/Infrastructure.EFIntegration.Test/AutoFixture/PolicyFixtures.cs @@ -1,6 +1,7 @@ using AutoFixture; using AutoFixture.Kernel; using Bit.Core.Entities; +using Bit.Infrastructure.EntityFramework.AdminConsole.Repositories; using Bit.Infrastructure.EntityFramework.Repositories; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; diff --git a/test/Infrastructure.EFIntegration.Test/Repositories/OrganizationUserRepositoryTests.cs b/test/Infrastructure.EFIntegration.Test/Repositories/OrganizationUserRepositoryTests.cs index 4f3b912b6e..67b199b35a 100644 --- a/test/Infrastructure.EFIntegration.Test/Repositories/OrganizationUserRepositoryTests.cs +++ b/test/Infrastructure.EFIntegration.Test/Repositories/OrganizationUserRepositoryTests.cs @@ -1,6 +1,7 @@ using System.Text.Json; +using Bit.Core.AdminConsole.Entities.Provider; +using Bit.Core.AdminConsole.Repositories; using Bit.Core.Entities; -using Bit.Core.Entities.Provider; using Bit.Core.Enums; using Bit.Core.Models.Data; using Bit.Core.Models.Data.Organizations.OrganizationUsers; @@ -9,6 +10,7 @@ using Bit.Core.Test.AutoFixture.Attributes; using Bit.Infrastructure.EFIntegration.Test.AutoFixture; using Bit.Infrastructure.EFIntegration.Test.Repositories.EqualityComparers; using Xunit; +using EfAdminConsoleRepo = Bit.Infrastructure.EntityFramework.AdminConsole.Repositories; using EfRepo = Bit.Infrastructure.EntityFramework.Repositories; using OrganizationUser = Bit.Core.Entities.OrganizationUser; using SqlRepo = Bit.Infrastructure.Dapper.Repositories; @@ -184,18 +186,18 @@ public class OrganizationUserRepositoryTests List efUserRepository, List efOrganizationRepository, List suts, - List efProviderRepository, - List efProviderOrganizationRepository, - List efProviderUserRepository, + List efProviderRepository, + List efProviderOrganizationRepository, + List efProviderUserRepository, // Auto data - SQL repos SqlRepo.PolicyRepository sqlPolicyRepo, SqlRepo.UserRepository sqlUserRepo, SqlRepo.OrganizationRepository sqlOrganizationRepo, - SqlRepo.ProviderRepository sqlProviderRepo, + EfAdminConsoleRepo.ProviderRepository sqlProviderRepo, SqlRepo.OrganizationUserRepository sqlOrganizationUserRepo, - SqlRepo.ProviderOrganizationRepository sqlProviderOrganizationRepo, - SqlRepo.ProviderUserRepository sqlProviderUserRepo + EfAdminConsoleRepo.ProviderOrganizationRepository sqlProviderOrganizationRepo, + EfAdminConsoleRepo.ProviderUserRepository sqlProviderUserRepo ) { // Combine EF and SQL repos into one list per type