From ad230fb6a546bd1f64f5b7590b56f1e1fd9be087 Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Fri, 27 Oct 2023 07:47:44 +1000 Subject: [PATCH] [AC-1200] Admin Console code ownership - move OrganizationFeatures (#3369) --- .../src/Scim/Controllers/v2/UsersController.cs | 4 ++-- .../OrganizationAuthRequestsController.cs | 2 +- .../OrganizationConnectionsController.cs | 8 ++++---- .../Controllers/OrganizationDomainController.cs | 10 +++++----- .../Controllers/OrganizationUsersController.cs | 2 +- .../Controllers/OrganizationsController.cs | 2 +- .../Request/OrganizationDomainRequestModel.cs | 2 +- .../OrganizationConnectionRequestModel.cs | 2 +- .../OrganizationDomainSsoDetailsRequestModel.cs | 2 +- .../OrganizationConnectionResponseModel.cs | 2 +- .../OrganizationDomainResponseModel.cs | 2 +- .../OrganizationDomainSsoDetailsResponseModel.cs | 2 +- .../Public/Controllers/MembersController.cs | 2 +- src/Api/Controllers/LicensesController.cs | 4 ++-- .../OrganizationSponsorshipsController.cs | 2 +- .../CreateOrganizationApiKeyCommand.cs | 6 +++--- .../GetOrganizationApiKeyQuery.cs | 6 +++--- .../ICreateOrganizationApiKeyCommand.cs | 2 +- .../Interfaces/IGetOrganizationApiKeyQuery.cs | 2 +- .../IRotateOrganizationApiKeyCommand.cs | 2 +- .../RotateOrganizationApiKeyCommand.cs | 6 +++--- .../CreateOrganizationConnectionCommand.cs | 6 +++--- .../DeleteOrganizationConnectionCommand.cs | 6 +++--- .../ICreateOrganizationConnectionCommand.cs | 2 +- .../IDeleteOrganizationConnectionCommand.cs | 2 +- .../IUpdateOrganizationConnectionCommand.cs | 2 +- .../Interfaces/IValidateBillingSyncKeyCommand.cs | 2 +- .../UpdateOrganizationConnectionCommand.cs | 6 +++--- .../ValidateBillingSyncKeyCommand.cs | 8 ++++---- .../CreateOrganizationDomainCommand.cs | 6 +++--- .../DeleteOrganizationDomainCommand.cs | 6 +++--- ...tOrganizationDomainByIdOrganizationIdQuery.cs | 6 +++--- ...GetOrganizationDomainByOrganizationIdQuery.cs | 6 +++--- .../ICreateOrganizationDomainCommand.cs | 2 +- .../IDeleteOrganizationDomainCommand.cs | 2 +- ...tOrganizationDomainByIdOrganizationIdQuery.cs | 2 +- ...GetOrganizationDomainByOrganizationIdQuery.cs | 2 +- .../IVerifyOrganizationDomainCommand.cs | 2 +- .../VerifyOrganizationDomainCommand.cs | 6 +++--- .../CountNewSmSeatsRequiredQuery.cs | 6 +++--- .../DeleteOrganizationUserCommand.cs | 6 +++--- .../Interfaces/ICountNewSmSeatsRequiredQuery.cs | 2 +- .../Interfaces/IDeleteOrganizationUserCommand.cs | 2 +- .../IUpdateOrganizationUserGroupsCommand.cs | 2 +- .../UpdateOrganizationUserGroupsCommand.cs | 6 +++--- .../OrganizationServiceCollectionExtensions.cs | 16 ++++++++-------- .../Implementations/OrganizationService.cs | 2 +- .../OrganizationConnectionsControllerTests.cs | 10 +++++----- .../OrganizationDomainControllerTests.cs | 12 ++++++------ .../Controllers/OrganizationsControllerTests.cs | 2 +- .../CreateOrganizationApiKeyCommandTest.cs | 7 +++---- .../GetOrganizationApiKeyQueryTests.cs | 6 +++--- .../RotateOrganizationApiKeyCommandTests.cs | 6 +++--- .../CreateOrganizationConnectionCommandTests.cs | 6 +++--- .../DeleteOrganizationConnectionCommandTests.cs | 6 +++--- .../UpdateOrganizationConnectionCommandTests.cs | 6 +++--- .../ValidateBillingSyncKeyCommandTests.cs | 6 +++--- .../CreateOrganizationDomainCommandTests.cs | 6 +++--- .../DeleteOrganizationDomainCommandTests.cs | 6 +++--- ...nizationDomainByIdOrganizationIdQueryTests.cs | 6 +++--- ...ganizationDomainByOrganizationIdQueryTests.cs | 4 ++-- .../VerifyOrganizationDomainCommandTests.cs | 6 +++--- .../CountNewSmSeatsRequiredQueryTests.cs | 6 +++--- .../DeleteOrganizationUserCommandTests.cs | 6 +++--- .../UpdateOrganizationUserGroupsCommandTests.cs | 6 +++--- .../Services/OrganizationServiceTests.cs | 2 +- 66 files changed, 151 insertions(+), 152 deletions(-) rename src/Api/{ => AdminConsole}/Controllers/OrganizationAuthRequestsController.cs (98%) rename src/Api/{ => AdminConsole}/Controllers/OrganizationConnectionsController.cs (97%) rename src/Api/{ => AdminConsole}/Controllers/OrganizationDomainController.cs (95%) rename src/Api/{ => AdminConsole}/Models/Request/OrganizationDomainRequestModel.cs (81%) rename src/Api/{ => AdminConsole}/Models/Request/Organizations/OrganizationConnectionRequestModel.cs (95%) rename src/Api/{ => AdminConsole}/Models/Request/Organizations/OrganizationDomainSsoDetailsRequestModel.cs (74%) rename src/Api/{ => AdminConsole}/Models/Response/Organizations/OrganizationConnectionResponseModel.cs (92%) rename src/Api/{ => AdminConsole}/Models/Response/Organizations/OrganizationDomainResponseModel.cs (95%) rename src/Api/{ => AdminConsole}/Models/Response/Organizations/OrganizationDomainSsoDetailsResponseModel.cs (93%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommand.cs (83%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQuery.cs (84%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationApiKeys/Interfaces/ICreateOrganizationApiKeyCommand.cs (71%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationApiKeys/Interfaces/IGetOrganizationApiKeyQuery.cs (72%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationApiKeys/Interfaces/IRotateOrganizationApiKeyCommand.cs (66%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommand.cs (80%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommand.cs (80%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommand.cs (75%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationConnections/Interfaces/ICreateOrganizationConnectionCommand.cs (78%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationConnections/Interfaces/IDeleteOrganizationConnectionCommand.cs (61%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationConnections/Interfaces/IUpdateOrganizationConnectionCommand.cs (78%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationConnections/Interfaces/IValidateBillingSyncKeyCommand.cs (66%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommand.cs (86%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommand.cs (75%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommand.cs (94%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommand.cs (82%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQuery.cs (77%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQuery.cs (76%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationDomains/Interfaces/ICreateOrganizationDomainCommand.cs (66%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationDomains/Interfaces/IDeleteOrganizationDomainCommand.cs (63%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByIdOrganizationIdQuery.cs (70%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByOrganizationIdQuery.cs (68%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationDomains/Interfaces/IVerifyOrganizationDomainCommand.cs (68%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommand.cs (92%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQuery.cs (89%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommand.cs (89%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationUsers/Interfaces/ICountNewSmSeatsRequiredQuery.cs (61%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationUsers/Interfaces/IDeleteOrganizationUserCommand.cs (77%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationUsers/Interfaces/IUpdateOrganizationUserGroupsCommand.cs (71%) rename src/Core/{ => AdminConsole}/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommand.cs (88%) rename test/Api.Test/{ => AdminConsole}/Controllers/OrganizationConnectionsControllerTests.cs (98%) rename test/Api.Test/{ => AdminConsole}/Controllers/OrganizationDomainControllerTests.cs (97%) rename test/Core.Test/{ => AdminConsole}/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommandTest.cs (80%) rename test/Core.Test/{ => AdminConsole}/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQueryTests.cs (94%) rename test/Core.Test/{ => AdminConsole}/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommandTests.cs (79%) rename test/Core.Test/{ => AdminConsole}/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommandTests.cs (76%) rename test/Core.Test/{ => AdminConsole}/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommandTests.cs (76%) rename test/Core.Test/{ => AdminConsole}/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommandTests.cs (91%) rename test/Core.Test/{ => AdminConsole}/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommandTests.cs (91%) rename test/Core.Test/{ => AdminConsole}/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommandTests.cs (97%) rename test/Core.Test/{ => AdminConsole}/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommandTests.cs (84%) rename test/Core.Test/{ => AdminConsole}/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQueryTests.cs (95%) rename test/Core.Test/{ => AdminConsole}/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQueryTests.cs (81%) rename test/Core.Test/{ => AdminConsole}/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommandTests.cs (96%) rename test/Core.Test/{ => AdminConsole}/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQueryTests.cs (95%) rename test/Core.Test/{ => AdminConsole}/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommandTests.cs (93%) rename test/Core.Test/{ => AdminConsole}/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommandTests.cs (92%) diff --git a/bitwarden_license/src/Scim/Controllers/v2/UsersController.cs b/bitwarden_license/src/Scim/Controllers/v2/UsersController.cs index 22b8a22c8..e76081305 100644 --- a/bitwarden_license/src/Scim/Controllers/v2/UsersController.cs +++ b/bitwarden_license/src/Scim/Controllers/v2/UsersController.cs @@ -1,6 +1,6 @@ -using Bit.Core.Enums; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces; +using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Scim.Models; diff --git a/src/Api/Controllers/OrganizationAuthRequestsController.cs b/src/Api/AdminConsole/Controllers/OrganizationAuthRequestsController.cs similarity index 98% rename from src/Api/Controllers/OrganizationAuthRequestsController.cs rename to src/Api/AdminConsole/Controllers/OrganizationAuthRequestsController.cs index 5435b44d9..ac041fca2 100644 --- a/src/Api/Controllers/OrganizationAuthRequestsController.cs +++ b/src/Api/AdminConsole/Controllers/OrganizationAuthRequestsController.cs @@ -12,7 +12,7 @@ using Bit.Core.Utilities; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace Bit.Api.Controllers; +namespace Bit.Api.AdminConsole.Controllers; [Route("organizations/{orgId}/auth-requests")] [Authorize("Application")] diff --git a/src/Api/Controllers/OrganizationConnectionsController.cs b/src/Api/AdminConsole/Controllers/OrganizationConnectionsController.cs similarity index 97% rename from src/Api/Controllers/OrganizationConnectionsController.cs rename to src/Api/AdminConsole/Controllers/OrganizationConnectionsController.cs index e9ea31c8f..8e54bfca9 100644 --- a/src/Api/Controllers/OrganizationConnectionsController.cs +++ b/src/Api/AdminConsole/Controllers/OrganizationConnectionsController.cs @@ -1,19 +1,19 @@ -using Bit.Api.Models.Request.Organizations; -using Bit.Api.Models.Response.Organizations; +using Bit.Api.AdminConsole.Models.Request.Organizations; +using Bit.Api.AdminConsole.Models.Response.Organizations; using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces; using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Exceptions; using Bit.Core.Models.OrganizationConnectionConfigs; -using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace Bit.Api.Controllers; +namespace Bit.Api.AdminConsole.Controllers; [Authorize("Application")] [Route("organizations/connections")] diff --git a/src/Api/Controllers/OrganizationDomainController.cs b/src/Api/AdminConsole/Controllers/OrganizationDomainController.cs similarity index 95% rename from src/Api/Controllers/OrganizationDomainController.cs rename to src/Api/AdminConsole/Controllers/OrganizationDomainController.cs index 60abdad7d..92feb9a44 100644 --- a/src/Api/Controllers/OrganizationDomainController.cs +++ b/src/Api/AdminConsole/Controllers/OrganizationDomainController.cs @@ -1,16 +1,16 @@ -using Bit.Api.Models.Request; -using Bit.Api.Models.Request.Organizations; +using Bit.Api.AdminConsole.Models.Request; +using Bit.Api.AdminConsole.Models.Request.Organizations; +using Bit.Api.AdminConsole.Models.Response.Organizations; using Bit.Api.Models.Response; -using Bit.Api.Models.Response.Organizations; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces; using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Exceptions; -using Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces; using Bit.Core.Repositories; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace Bit.Api.Controllers; +namespace Bit.Api.AdminConsole.Controllers; [Route("organizations")] [Authorize("Application")] diff --git a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs index 85436b41b..6354df669 100644 --- a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs +++ b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs @@ -2,6 +2,7 @@ using Bit.Api.AdminConsole.Models.Response.Organizations; using Bit.Api.Models.Request.Organizations; using Bit.Api.Models.Response; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces; using Bit.Core.AdminConsole.Repositories; using Bit.Core.Context; using Bit.Core.Enums; @@ -10,7 +11,6 @@ using Bit.Core.Models.Business; using Bit.Core.Models.Data.Organizations.OrganizationUsers; using Bit.Core.Models.Data.Organizations.Policies; using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface; -using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; using Microsoft.AspNetCore.Authorization; diff --git a/src/Api/AdminConsole/Controllers/OrganizationsController.cs b/src/Api/AdminConsole/Controllers/OrganizationsController.cs index eb3a95ebc..b28f310c4 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.OrganizationFeatures.OrganizationApiKeys.Interfaces; using Bit.Core.AdminConsole.Repositories; using Bit.Core.Auth.Enums; using Bit.Core.Auth.Repositories; @@ -20,7 +21,6 @@ using Bit.Core.Enums; using Bit.Core.Exceptions; using Bit.Core.Models.Business; using Bit.Core.Models.Data.Organizations.Policies; -using Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces; using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces; using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface; using Bit.Core.Repositories; diff --git a/src/Api/Models/Request/OrganizationDomainRequestModel.cs b/src/Api/AdminConsole/Models/Request/OrganizationDomainRequestModel.cs similarity index 81% rename from src/Api/Models/Request/OrganizationDomainRequestModel.cs rename to src/Api/AdminConsole/Models/Request/OrganizationDomainRequestModel.cs index 28786bf58..c34c01783 100644 --- a/src/Api/Models/Request/OrganizationDomainRequestModel.cs +++ b/src/Api/AdminConsole/Models/Request/OrganizationDomainRequestModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Models.Request; +namespace Bit.Api.AdminConsole.Models.Request; public class OrganizationDomainRequestModel { diff --git a/src/Api/Models/Request/Organizations/OrganizationConnectionRequestModel.cs b/src/Api/AdminConsole/Models/Request/Organizations/OrganizationConnectionRequestModel.cs similarity index 95% rename from src/Api/Models/Request/Organizations/OrganizationConnectionRequestModel.cs rename to src/Api/AdminConsole/Models/Request/Organizations/OrganizationConnectionRequestModel.cs index 96a444c27..1883d34af 100644 --- a/src/Api/Models/Request/Organizations/OrganizationConnectionRequestModel.cs +++ b/src/Api/AdminConsole/Models/Request/Organizations/OrganizationConnectionRequestModel.cs @@ -5,7 +5,7 @@ using Bit.Core.Models.Data.Organizations.OrganizationConnections; using Bit.Core.Models.OrganizationConnectionConfigs; using Bit.Core.Utilities; -namespace Bit.Api.Models.Request.Organizations; +namespace Bit.Api.AdminConsole.Models.Request.Organizations; public class OrganizationConnectionRequestModel { diff --git a/src/Api/Models/Request/Organizations/OrganizationDomainSsoDetailsRequestModel.cs b/src/Api/AdminConsole/Models/Request/Organizations/OrganizationDomainSsoDetailsRequestModel.cs similarity index 74% rename from src/Api/Models/Request/Organizations/OrganizationDomainSsoDetailsRequestModel.cs rename to src/Api/AdminConsole/Models/Request/Organizations/OrganizationDomainSsoDetailsRequestModel.cs index 9f9db5b34..c5129c6ec 100644 --- a/src/Api/Models/Request/Organizations/OrganizationDomainSsoDetailsRequestModel.cs +++ b/src/Api/AdminConsole/Models/Request/Organizations/OrganizationDomainSsoDetailsRequestModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Models.Request.Organizations; +namespace Bit.Api.AdminConsole.Models.Request.Organizations; public class OrganizationDomainSsoDetailsRequestModel { diff --git a/src/Api/Models/Response/Organizations/OrganizationConnectionResponseModel.cs b/src/Api/AdminConsole/Models/Response/Organizations/OrganizationConnectionResponseModel.cs similarity index 92% rename from src/Api/Models/Response/Organizations/OrganizationConnectionResponseModel.cs rename to src/Api/AdminConsole/Models/Response/Organizations/OrganizationConnectionResponseModel.cs index f199ce56c..fa6bdc1f3 100644 --- a/src/Api/Models/Response/Organizations/OrganizationConnectionResponseModel.cs +++ b/src/Api/AdminConsole/Models/Response/Organizations/OrganizationConnectionResponseModel.cs @@ -2,7 +2,7 @@ using Bit.Core.Entities; using Bit.Core.Enums; -namespace Bit.Api.Models.Response.Organizations; +namespace Bit.Api.AdminConsole.Models.Response.Organizations; public class OrganizationConnectionResponseModel { diff --git a/src/Api/Models/Response/Organizations/OrganizationDomainResponseModel.cs b/src/Api/AdminConsole/Models/Response/Organizations/OrganizationDomainResponseModel.cs similarity index 95% rename from src/Api/Models/Response/Organizations/OrganizationDomainResponseModel.cs rename to src/Api/AdminConsole/Models/Response/Organizations/OrganizationDomainResponseModel.cs index 636f6d32d..efba3a457 100644 --- a/src/Api/Models/Response/Organizations/OrganizationDomainResponseModel.cs +++ b/src/Api/AdminConsole/Models/Response/Organizations/OrganizationDomainResponseModel.cs @@ -1,7 +1,7 @@ using Bit.Core.Entities; using Bit.Core.Models.Api; -namespace Bit.Api.Models.Response.Organizations; +namespace Bit.Api.AdminConsole.Models.Response.Organizations; public class OrganizationDomainResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/Organizations/OrganizationDomainSsoDetailsResponseModel.cs b/src/Api/AdminConsole/Models/Response/Organizations/OrganizationDomainSsoDetailsResponseModel.cs similarity index 93% rename from src/Api/Models/Response/Organizations/OrganizationDomainSsoDetailsResponseModel.cs rename to src/Api/AdminConsole/Models/Response/Organizations/OrganizationDomainSsoDetailsResponseModel.cs index d995cc5f8..0b232010a 100644 --- a/src/Api/Models/Response/Organizations/OrganizationDomainSsoDetailsResponseModel.cs +++ b/src/Api/AdminConsole/Models/Response/Organizations/OrganizationDomainSsoDetailsResponseModel.cs @@ -1,7 +1,7 @@ using Bit.Core.Models.Api; using Bit.Core.Models.Data.Organizations; -namespace Bit.Api.Models.Response.Organizations; +namespace Bit.Api.AdminConsole.Models.Response.Organizations; public class OrganizationDomainSsoDetailsResponseModel : ResponseModel { diff --git a/src/Api/AdminConsole/Public/Controllers/MembersController.cs b/src/Api/AdminConsole/Public/Controllers/MembersController.cs index 52cf952f7..9c862f520 100644 --- a/src/Api/AdminConsole/Public/Controllers/MembersController.cs +++ b/src/Api/AdminConsole/Public/Controllers/MembersController.cs @@ -2,10 +2,10 @@ using Bit.Api.AdminConsole.Public.Models.Request; using Bit.Api.AdminConsole.Public.Models.Response; using Bit.Api.Models.Public.Response; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces; using Bit.Core.AdminConsole.Repositories; using Bit.Core.Context; using Bit.Core.Models.Business; -using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; using Microsoft.AspNetCore.Authorization; diff --git a/src/Api/Controllers/LicensesController.cs b/src/Api/Controllers/LicensesController.cs index f5391fddc..1c0058920 100644 --- a/src/Api/Controllers/LicensesController.cs +++ b/src/Api/Controllers/LicensesController.cs @@ -1,8 +1,8 @@ -using Bit.Core.Context; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces; +using Bit.Core.Context; using Bit.Core.Exceptions; using Bit.Core.Models.Api.OrganizationLicenses; using Bit.Core.Models.Business; -using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces; using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; diff --git a/src/Api/Controllers/OrganizationSponsorshipsController.cs b/src/Api/Controllers/OrganizationSponsorshipsController.cs index d9715d07c..c24c98101 100644 --- a/src/Api/Controllers/OrganizationSponsorshipsController.cs +++ b/src/Api/Controllers/OrganizationSponsorshipsController.cs @@ -1,11 +1,11 @@ using Bit.Api.Models.Request.Organizations; using Bit.Api.Models.Response.Organizations; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces; using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Exceptions; using Bit.Core.Models.Api.Request.OrganizationSponsorships; using Bit.Core.Models.Api.Response.OrganizationSponsorships; -using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces; using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; diff --git a/src/Core/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommand.cs similarity index 83% rename from src/Core/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommand.cs index d76725c70..fedcecd4c 100644 --- a/src/Core/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommand.cs @@ -1,10 +1,10 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys.Interfaces; +using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces; using Bit.Core.Repositories; using Bit.Core.Utilities; -namespace Bit.Core.OrganizationFeatures.OrganizationApiKeys; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys; public class CreateOrganizationApiKeyCommand : ICreateOrganizationApiKeyCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQuery.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQuery.cs similarity index 84% rename from src/Core/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQuery.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQuery.cs index 6e4a9f5d5..b91e57a67 100644 --- a/src/Core/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQuery.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQuery.cs @@ -1,9 +1,9 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys.Interfaces; +using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces; using Bit.Core.Repositories; -namespace Bit.Core.OrganizationFeatures.OrganizationApiKeys; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys; public class GetOrganizationApiKeyQuery : IGetOrganizationApiKeyQuery { diff --git a/src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/ICreateOrganizationApiKeyCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/Interfaces/ICreateOrganizationApiKeyCommand.cs similarity index 71% rename from src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/ICreateOrganizationApiKeyCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/Interfaces/ICreateOrganizationApiKeyCommand.cs index a2ce7326d..d9646fdcf 100644 --- a/src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/ICreateOrganizationApiKeyCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/Interfaces/ICreateOrganizationApiKeyCommand.cs @@ -1,7 +1,7 @@ using Bit.Core.Entities; using Bit.Core.Enums; -namespace Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys.Interfaces; public interface ICreateOrganizationApiKeyCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/IGetOrganizationApiKeyQuery.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/Interfaces/IGetOrganizationApiKeyQuery.cs similarity index 72% rename from src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/IGetOrganizationApiKeyQuery.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/Interfaces/IGetOrganizationApiKeyQuery.cs index 699b13adb..2504df762 100644 --- a/src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/IGetOrganizationApiKeyQuery.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/Interfaces/IGetOrganizationApiKeyQuery.cs @@ -1,7 +1,7 @@ using Bit.Core.Entities; using Bit.Core.Enums; -namespace Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys.Interfaces; public interface IGetOrganizationApiKeyQuery { diff --git a/src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/IRotateOrganizationApiKeyCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/Interfaces/IRotateOrganizationApiKeyCommand.cs similarity index 66% rename from src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/IRotateOrganizationApiKeyCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/Interfaces/IRotateOrganizationApiKeyCommand.cs index a5cf51c3f..8114714c5 100644 --- a/src/Core/OrganizationFeatures/OrganizationApiKeys/Interfaces/IRotateOrganizationApiKeyCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/Interfaces/IRotateOrganizationApiKeyCommand.cs @@ -1,6 +1,6 @@ using Bit.Core.Entities; -namespace Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys.Interfaces; public interface IRotateOrganizationApiKeyCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommand.cs similarity index 80% rename from src/Core/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommand.cs index f43aaa5f3..0d55231e2 100644 --- a/src/Core/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommand.cs @@ -1,9 +1,9 @@ -using Bit.Core.Entities; -using Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys.Interfaces; +using Bit.Core.Entities; using Bit.Core.Repositories; using Bit.Core.Utilities; -namespace Bit.Core.OrganizationFeatures.OrganizationApiKeys; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys; public class RotateOrganizationApiKeyCommand : IRotateOrganizationApiKeyCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommand.cs similarity index 80% rename from src/Core/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommand.cs index 6c019001c..1ea73bf08 100644 --- a/src/Core/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommand.cs @@ -1,10 +1,10 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces; +using Bit.Core.Entities; using Bit.Core.Models.Data.Organizations.OrganizationConnections; using Bit.Core.Models.OrganizationConnectionConfigs; -using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces; using Bit.Core.Repositories; -namespace Bit.Core.OrganizationFeatures.OrganizationConnections; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections; public class CreateOrganizationConnectionCommand : ICreateOrganizationConnectionCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommand.cs similarity index 75% rename from src/Core/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommand.cs index 7166059db..3b094be05 100644 --- a/src/Core/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommand.cs @@ -1,8 +1,8 @@ -using Bit.Core.Entities; -using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces; +using Bit.Core.Entities; using Bit.Core.Repositories; -namespace Bit.Core.OrganizationFeatures.OrganizationConnections; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections; public class DeleteOrganizationConnectionCommand : IDeleteOrganizationConnectionCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/ICreateOrganizationConnectionCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/ICreateOrganizationConnectionCommand.cs similarity index 78% rename from src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/ICreateOrganizationConnectionCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/ICreateOrganizationConnectionCommand.cs index a97be09c3..d3a7d65d8 100644 --- a/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/ICreateOrganizationConnectionCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/ICreateOrganizationConnectionCommand.cs @@ -2,7 +2,7 @@ using Bit.Core.Models.Data.Organizations.OrganizationConnections; using Bit.Core.Models.OrganizationConnectionConfigs; -namespace Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces; public interface ICreateOrganizationConnectionCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IDeleteOrganizationConnectionCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/IDeleteOrganizationConnectionCommand.cs similarity index 61% rename from src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IDeleteOrganizationConnectionCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/IDeleteOrganizationConnectionCommand.cs index 818609aef..8a6e866cc 100644 --- a/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IDeleteOrganizationConnectionCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/IDeleteOrganizationConnectionCommand.cs @@ -1,6 +1,6 @@ using Bit.Core.Entities; -namespace Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces; public interface IDeleteOrganizationConnectionCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IUpdateOrganizationConnectionCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/IUpdateOrganizationConnectionCommand.cs similarity index 78% rename from src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IUpdateOrganizationConnectionCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/IUpdateOrganizationConnectionCommand.cs index b245b8969..979460a3b 100644 --- a/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IUpdateOrganizationConnectionCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/IUpdateOrganizationConnectionCommand.cs @@ -2,7 +2,7 @@ using Bit.Core.Models.Data.Organizations.OrganizationConnections; using Bit.Core.Models.OrganizationConnectionConfigs; -namespace Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces; public interface IUpdateOrganizationConnectionCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IValidateBillingSyncKeyCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/IValidateBillingSyncKeyCommand.cs similarity index 66% rename from src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IValidateBillingSyncKeyCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/IValidateBillingSyncKeyCommand.cs index 9fb979548..78a28d3ec 100644 --- a/src/Core/OrganizationFeatures/OrganizationConnections/Interfaces/IValidateBillingSyncKeyCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/Interfaces/IValidateBillingSyncKeyCommand.cs @@ -1,6 +1,6 @@ using Bit.Core.Entities; -namespace Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces; public interface IValidateBillingSyncKeyCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommand.cs similarity index 86% rename from src/Core/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommand.cs index 3e64fd47a..428cc25ae 100644 --- a/src/Core/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommand.cs @@ -1,11 +1,11 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces; +using Bit.Core.Entities; using Bit.Core.Exceptions; using Bit.Core.Models.Data.Organizations.OrganizationConnections; using Bit.Core.Models.OrganizationConnectionConfigs; -using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces; using Bit.Core.Repositories; -namespace Bit.Core.OrganizationFeatures.OrganizationConnections; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections; public class UpdateOrganizationConnectionCommand : IUpdateOrganizationConnectionCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommand.cs similarity index 75% rename from src/Core/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommand.cs index a764bbcf2..11360f2fa 100644 --- a/src/Core/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommand.cs @@ -1,9 +1,9 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces; +using Bit.Core.Entities; using Bit.Core.Exceptions; -using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces; using Bit.Core.Repositories; -namespace Bit.Core.OrganizationFeatures.OrganizationConnections; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections; public class ValidateBillingSyncKeyCommand : IValidateBillingSyncKeyCommand { @@ -26,7 +26,7 @@ public class ValidateBillingSyncKeyCommand : IValidateBillingSyncKeyCommand return false; } - var orgApiKey = (await _apiKeyRepository.GetManyByOrganizationIdTypeAsync(organization.Id, Enums.OrganizationApiKeyType.BillingSync)).FirstOrDefault(); + var orgApiKey = (await _apiKeyRepository.GetManyByOrganizationIdTypeAsync(organization.Id, Core.Enums.OrganizationApiKeyType.BillingSync)).FirstOrDefault(); if (string.Equals(orgApiKey.ApiKey, billingSyncKey)) { return true; diff --git a/src/Core/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommand.cs similarity index 94% rename from src/Core/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommand.cs index e5aa4a09a..ea02a65a3 100644 --- a/src/Core/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommand.cs @@ -1,13 +1,13 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces; +using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings; using Microsoft.Extensions.Logging; -namespace Bit.Core.OrganizationFeatures.OrganizationDomains; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains; public class CreateOrganizationDomainCommand : ICreateOrganizationDomainCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommand.cs similarity index 82% rename from src/Core/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommand.cs index f0162f7a5..e966b0149 100644 --- a/src/Core/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommand.cs @@ -1,10 +1,10 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces; +using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; -namespace Bit.Core.OrganizationFeatures.OrganizationDomains; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains; public class DeleteOrganizationDomainCommand : IDeleteOrganizationDomainCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQuery.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQuery.cs similarity index 77% rename from src/Core/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQuery.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQuery.cs index 1ed220768..12616a142 100644 --- a/src/Core/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQuery.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQuery.cs @@ -1,8 +1,8 @@ -using Bit.Core.Entities; -using Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces; +using Bit.Core.Entities; using Bit.Core.Repositories; -namespace Bit.Core.OrganizationFeatures.OrganizationDomains; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains; public class GetOrganizationDomainByIdOrganizationIdQuery : IGetOrganizationDomainByIdOrganizationIdQuery { diff --git a/src/Core/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQuery.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQuery.cs similarity index 76% rename from src/Core/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQuery.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQuery.cs index c1fef0508..2ad1525cd 100644 --- a/src/Core/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQuery.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQuery.cs @@ -1,8 +1,8 @@ -using Bit.Core.Entities; -using Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces; +using Bit.Core.Entities; using Bit.Core.Repositories; -namespace Bit.Core.OrganizationFeatures.OrganizationDomains; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains; public class GetOrganizationDomainByOrganizationIdQuery : IGetOrganizationDomainByOrganizationIdQuery { diff --git a/src/Core/OrganizationFeatures/OrganizationDomains/Interfaces/ICreateOrganizationDomainCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/ICreateOrganizationDomainCommand.cs similarity index 66% rename from src/Core/OrganizationFeatures/OrganizationDomains/Interfaces/ICreateOrganizationDomainCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/ICreateOrganizationDomainCommand.cs index 79df45396..8878e27f3 100644 --- a/src/Core/OrganizationFeatures/OrganizationDomains/Interfaces/ICreateOrganizationDomainCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/ICreateOrganizationDomainCommand.cs @@ -1,6 +1,6 @@ using Bit.Core.Entities; -namespace Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces; public interface ICreateOrganizationDomainCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationDomains/Interfaces/IDeleteOrganizationDomainCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IDeleteOrganizationDomainCommand.cs similarity index 63% rename from src/Core/OrganizationFeatures/OrganizationDomains/Interfaces/IDeleteOrganizationDomainCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IDeleteOrganizationDomainCommand.cs index 8b11bc61e..17f508f8a 100644 --- a/src/Core/OrganizationFeatures/OrganizationDomains/Interfaces/IDeleteOrganizationDomainCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IDeleteOrganizationDomainCommand.cs @@ -1,6 +1,6 @@ using Bit.Core.Entities; -namespace Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces; public interface IDeleteOrganizationDomainCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByIdOrganizationIdQuery.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByIdOrganizationIdQuery.cs similarity index 70% rename from src/Core/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByIdOrganizationIdQuery.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByIdOrganizationIdQuery.cs index 12fe643a6..aa8122a76 100644 --- a/src/Core/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByIdOrganizationIdQuery.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByIdOrganizationIdQuery.cs @@ -1,6 +1,6 @@ using Bit.Core.Entities; -namespace Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces; public interface IGetOrganizationDomainByIdOrganizationIdQuery { diff --git a/src/Core/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByOrganizationIdQuery.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByOrganizationIdQuery.cs similarity index 68% rename from src/Core/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByOrganizationIdQuery.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByOrganizationIdQuery.cs index d1fb642a5..062971b41 100644 --- a/src/Core/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByOrganizationIdQuery.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IGetOrganizationDomainByOrganizationIdQuery.cs @@ -1,6 +1,6 @@ using Bit.Core.Entities; -namespace Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces; public interface IGetOrganizationDomainByOrganizationIdQuery { diff --git a/src/Core/OrganizationFeatures/OrganizationDomains/Interfaces/IVerifyOrganizationDomainCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IVerifyOrganizationDomainCommand.cs similarity index 68% rename from src/Core/OrganizationFeatures/OrganizationDomains/Interfaces/IVerifyOrganizationDomainCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IVerifyOrganizationDomainCommand.cs index fe4c38aa8..b62a9f932 100644 --- a/src/Core/OrganizationFeatures/OrganizationDomains/Interfaces/IVerifyOrganizationDomainCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/Interfaces/IVerifyOrganizationDomainCommand.cs @@ -1,6 +1,6 @@ using Bit.Core.Entities; -namespace Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces; public interface IVerifyOrganizationDomainCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommand.cs similarity index 92% rename from src/Core/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommand.cs index 508a085f6..5f9476db8 100644 --- a/src/Core/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommand.cs @@ -1,12 +1,12 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces; +using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; using Microsoft.Extensions.Logging; -namespace Bit.Core.OrganizationFeatures.OrganizationDomains; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains; public class VerifyOrganizationDomainCommand : IVerifyOrganizationDomainCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQuery.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQuery.cs similarity index 89% rename from src/Core/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQuery.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQuery.cs index 24bef3dc7..1beb25e17 100644 --- a/src/Core/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQuery.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQuery.cs @@ -1,8 +1,8 @@ -using Bit.Core.Exceptions; -using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces; +using Bit.Core.Exceptions; using Bit.Core.Repositories; -namespace Bit.Core.OrganizationFeatures.OrganizationUsers; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers; public class CountNewSmSeatsRequiredQuery : ICountNewSmSeatsRequiredQuery { diff --git a/src/Core/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommand.cs similarity index 89% rename from src/Core/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommand.cs index 69310b954..b0b5cc00c 100644 --- a/src/Core/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommand.cs @@ -1,10 +1,10 @@ -using Bit.Core.Enums; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces; +using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; -namespace Bit.Core.OrganizationFeatures.OrganizationUsers; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers; public class DeleteOrganizationUserCommand : IDeleteOrganizationUserCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationUsers/Interfaces/ICountNewSmSeatsRequiredQuery.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/ICountNewSmSeatsRequiredQuery.cs similarity index 61% rename from src/Core/OrganizationFeatures/OrganizationUsers/Interfaces/ICountNewSmSeatsRequiredQuery.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/ICountNewSmSeatsRequiredQuery.cs index 851aef73a..2b38f9721 100644 --- a/src/Core/OrganizationFeatures/OrganizationUsers/Interfaces/ICountNewSmSeatsRequiredQuery.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/ICountNewSmSeatsRequiredQuery.cs @@ -1,4 +1,4 @@ -namespace Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces; public interface ICountNewSmSeatsRequiredQuery { diff --git a/src/Core/OrganizationFeatures/OrganizationUsers/Interfaces/IDeleteOrganizationUserCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/IDeleteOrganizationUserCommand.cs similarity index 77% rename from src/Core/OrganizationFeatures/OrganizationUsers/Interfaces/IDeleteOrganizationUserCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/IDeleteOrganizationUserCommand.cs index b7ca904a1..32c19077a 100644 --- a/src/Core/OrganizationFeatures/OrganizationUsers/Interfaces/IDeleteOrganizationUserCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/IDeleteOrganizationUserCommand.cs @@ -1,6 +1,6 @@ using Bit.Core.Enums; -namespace Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces; public interface IDeleteOrganizationUserCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationUsers/Interfaces/IUpdateOrganizationUserGroupsCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/IUpdateOrganizationUserGroupsCommand.cs similarity index 71% rename from src/Core/OrganizationFeatures/OrganizationUsers/Interfaces/IUpdateOrganizationUserGroupsCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/IUpdateOrganizationUserGroupsCommand.cs index 9dae93233..530b3839e 100644 --- a/src/Core/OrganizationFeatures/OrganizationUsers/Interfaces/IUpdateOrganizationUserGroupsCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/IUpdateOrganizationUserGroupsCommand.cs @@ -1,6 +1,6 @@ using Bit.Core.Entities; -namespace Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces; public interface IUpdateOrganizationUserGroupsCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommand.cs similarity index 88% rename from src/Core/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommand.cs rename to src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommand.cs index 7bb5814d6..0331f2ed5 100644 --- a/src/Core/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommand.cs @@ -1,10 +1,10 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces; +using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; -namespace Bit.Core.OrganizationFeatures.OrganizationUsers; +namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers; public class UpdateOrganizationUserGroupsCommand : IUpdateOrganizationUserGroupsCommand { diff --git a/src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs b/src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs index b7bd08db8..23a46d742 100644 --- a/src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs +++ b/src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs @@ -2,15 +2,17 @@ using Bit.Core.AdminConsole.OrganizationAuth.Interfaces; using Bit.Core.AdminConsole.OrganizationFeatures.Groups; using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys.Interfaces; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces; using Bit.Core.Models.Business.Tokenables; -using Bit.Core.OrganizationFeatures.OrganizationApiKeys; -using Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces; using Bit.Core.OrganizationFeatures.OrganizationCollections; using Bit.Core.OrganizationFeatures.OrganizationCollections.Interfaces; -using Bit.Core.OrganizationFeatures.OrganizationConnections; -using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces; -using Bit.Core.OrganizationFeatures.OrganizationDomains; -using Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces; using Bit.Core.OrganizationFeatures.OrganizationLicenses; using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces; using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise; @@ -19,8 +21,6 @@ using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterpri using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.SelfHosted; using Bit.Core.OrganizationFeatures.OrganizationSubscriptions; using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface; -using Bit.Core.OrganizationFeatures.OrganizationUsers; -using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces; using Bit.Core.Services; using Bit.Core.Settings; using Bit.Core.Tokens; diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs index 8063bc0c5..b18e3954c 100644 --- a/src/Core/Services/Implementations/OrganizationService.cs +++ b/src/Core/Services/Implementations/OrganizationService.cs @@ -3,6 +3,7 @@ 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.OrganizationFeatures.OrganizationUsers.Interfaces; using Bit.Core.AdminConsole.Repositories; using Bit.Core.Auth.Enums; using Bit.Core.Auth.Models.Business; @@ -15,7 +16,6 @@ using Bit.Core.Models.Business; using Bit.Core.Models.Data; using Bit.Core.Models.Data.Organizations.Policies; using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface; -using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces; using Bit.Core.Repositories; using Bit.Core.Settings; using Bit.Core.Tools.Enums; diff --git a/test/Api.Test/Controllers/OrganizationConnectionsControllerTests.cs b/test/Api.Test/AdminConsole/Controllers/OrganizationConnectionsControllerTests.cs similarity index 98% rename from test/Api.Test/Controllers/OrganizationConnectionsControllerTests.cs rename to test/Api.Test/AdminConsole/Controllers/OrganizationConnectionsControllerTests.cs index bbeb50b18..dff61aa2b 100644 --- a/test/Api.Test/Controllers/OrganizationConnectionsControllerTests.cs +++ b/test/Api.Test/AdminConsole/Controllers/OrganizationConnectionsControllerTests.cs @@ -1,15 +1,15 @@ using System.Text.Json; -using Bit.Api.Controllers; -using Bit.Api.Models.Request.Organizations; -using Bit.Api.Models.Response.Organizations; +using Bit.Api.AdminConsole.Controllers; +using Bit.Api.AdminConsole.Models.Request.Organizations; +using Bit.Api.AdminConsole.Models.Response.Organizations; using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces; using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Exceptions; using Bit.Core.Models.Business; using Bit.Core.Models.OrganizationConnectionConfigs; -using Bit.Core.OrganizationFeatures.OrganizationConnections.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings; @@ -19,7 +19,7 @@ using Bit.Test.Common.Helpers; using NSubstitute; using Xunit; -namespace Bit.Api.Test.Controllers; +namespace Bit.Api.Test.AdminConsole.Controllers; [ControllerCustomize(typeof(OrganizationConnectionsController))] [SutProviderCustomize] diff --git a/test/Api.Test/Controllers/OrganizationDomainControllerTests.cs b/test/Api.Test/AdminConsole/Controllers/OrganizationDomainControllerTests.cs similarity index 97% rename from test/Api.Test/Controllers/OrganizationDomainControllerTests.cs rename to test/Api.Test/AdminConsole/Controllers/OrganizationDomainControllerTests.cs index 019dbdcba..90a977157 100644 --- a/test/Api.Test/Controllers/OrganizationDomainControllerTests.cs +++ b/test/Api.Test/AdminConsole/Controllers/OrganizationDomainControllerTests.cs @@ -1,13 +1,13 @@ -using Bit.Api.Controllers; -using Bit.Api.Models.Request; -using Bit.Api.Models.Request.Organizations; +using Bit.Api.AdminConsole.Controllers; +using Bit.Api.AdminConsole.Models.Request; +using Bit.Api.AdminConsole.Models.Request.Organizations; +using Bit.Api.AdminConsole.Models.Response.Organizations; using Bit.Api.Models.Response; -using Bit.Api.Models.Response.Organizations; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces; using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Exceptions; using Bit.Core.Models.Data.Organizations; -using Bit.Core.OrganizationFeatures.OrganizationDomains.Interfaces; using Bit.Core.Repositories; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; @@ -15,7 +15,7 @@ using NSubstitute; using NSubstitute.ReturnsExtensions; using Xunit; -namespace Bit.Api.Test.Controllers; +namespace Bit.Api.Test.AdminConsole.Controllers; [ControllerCustomize(typeof(OrganizationDomainController))] [SutProviderCustomize] diff --git a/test/Api.Test/AdminConsole/Controllers/OrganizationsControllerTests.cs b/test/Api.Test/AdminConsole/Controllers/OrganizationsControllerTests.cs index 1ba9ed60d..0edc80080 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.OrganizationFeatures.OrganizationApiKeys.Interfaces; using Bit.Core.AdminConsole.Repositories; using Bit.Core.Auth.Entities; using Bit.Core.Auth.Enums; @@ -10,7 +11,6 @@ using Bit.Core.Auth.Services; using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Exceptions; -using Bit.Core.OrganizationFeatures.OrganizationApiKeys.Interfaces; using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces; using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface; using Bit.Core.Repositories; diff --git a/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommandTest.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommandTest.cs similarity index 80% rename from test/Core.Test/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommandTest.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommandTest.cs index 6b7fb3151..9280b9049 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommandTest.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationApiKeys/CreateOrganizationApiKeyCommandTest.cs @@ -1,14 +1,13 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys; +using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.OrganizationFeatures.OrganizationApiKeys; using Bit.Core.Repositories; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; using NSubstitute; -using NSubstitute.ReceivedExtensions; using Xunit; -namespace Bit.Core.Test.OrganizationFeatures.OrganizationApiKeys; +namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationApiKeys; [SutProviderCustomize] public class CreateOrganizationApiKeyCommandTest diff --git a/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQueryTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQueryTests.cs similarity index 94% rename from test/Core.Test/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQueryTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQueryTests.cs index d374bf806..adaa2a42b 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQueryTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationApiKeys/GetOrganizationApiKeyQueryTests.cs @@ -1,13 +1,13 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys; +using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.OrganizationFeatures.OrganizationApiKeys; using Bit.Core.Repositories; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; using NSubstitute; using Xunit; -namespace Bit.Core.Test.OrganizationFeatures.OrganizationApiKeys; +namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationApiKeys; [SutProviderCustomize] public class GetOrganizationApiKeyQueryTests diff --git a/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommandTests.cs similarity index 79% rename from test/Core.Test/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommandTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommandTests.cs index dc2ec10c2..e801d89a6 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommandTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationApiKeys/RotateOrganizationApiKeyCommandTests.cs @@ -1,11 +1,11 @@ -using Bit.Core.Entities; -using Bit.Core.OrganizationFeatures.OrganizationApiKeys; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys; +using Bit.Core.Entities; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; using Bit.Test.Common.Helpers; using Xunit; -namespace Bit.Core.Test.OrganizationFeatures.OrganizationApiKeys; +namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationApiKeys; [SutProviderCustomize] public class RotateOrganizationApiKeyCommandTests diff --git a/test/Core.Test/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommandTests.cs similarity index 76% rename from test/Core.Test/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommandTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommandTests.cs index bfcb532d8..7081a222f 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommandTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationConnections/CreateOrganizationConnectionCommandTests.cs @@ -1,6 +1,6 @@ -using Bit.Core.Models.Data.Organizations.OrganizationConnections; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections; +using Bit.Core.Models.Data.Organizations.OrganizationConnections; using Bit.Core.Models.OrganizationConnectionConfigs; -using Bit.Core.OrganizationFeatures.OrganizationConnections; using Bit.Core.Repositories; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; @@ -8,7 +8,7 @@ using Bit.Test.Common.Helpers; using NSubstitute; using Xunit; -namespace Bit.Core.Test.OrganizationFeatures.OrganizationConnections; +namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationConnections; [SutProviderCustomize] public class CreateOrganizationConnectionCommandTests diff --git a/test/Core.Test/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommandTests.cs similarity index 76% rename from test/Core.Test/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommandTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommandTests.cs index 9432968f5..db71971c6 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommandTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationConnections/DeleteOrganizationConnectionCommandTests.cs @@ -1,12 +1,12 @@ -using Bit.Core.Entities; -using Bit.Core.OrganizationFeatures.OrganizationConnections; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections; +using Bit.Core.Entities; using Bit.Core.Repositories; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; using NSubstitute; using Xunit; -namespace Bit.Core.Test.OrganizationFeatures.OrganizationConnections; +namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationConnections; [SutProviderCustomize] public class DeleteOrganizationConnectionCommandTests diff --git a/test/Core.Test/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommandTests.cs similarity index 91% rename from test/Core.Test/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommandTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommandTests.cs index f46d799d1..b0b146881 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommandTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationConnections/UpdateOrganizationConnectionCommandTests.cs @@ -1,8 +1,8 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections; +using Bit.Core.Entities; using Bit.Core.Exceptions; using Bit.Core.Models.Data.Organizations.OrganizationConnections; using Bit.Core.Models.OrganizationConnectionConfigs; -using Bit.Core.OrganizationFeatures.OrganizationConnections; using Bit.Core.Repositories; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; @@ -10,7 +10,7 @@ using Bit.Test.Common.Helpers; using NSubstitute; using Xunit; -namespace Bit.Core.Test.OrganizationFeatures.OrganizationConnections; +namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationConnections; [SutProviderCustomize] public class UpdateOrganizationConnectionCommandTests diff --git a/test/Core.Test/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommandTests.cs similarity index 91% rename from test/Core.Test/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommandTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommandTests.cs index 349f0316d..e3be8ef20 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommandTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationConnections/ValidateBillingSyncKeyCommandTests.cs @@ -1,14 +1,14 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections; +using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.OrganizationFeatures.OrganizationConnections; using Bit.Core.Repositories; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; using NSubstitute; using Xunit; -namespace Bit.Core.Test.OrganizationFeatures.OrganizationConnections; +namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationConnections; [SutProviderCustomize] public class ValidateBillingSyncKeyCommandTests diff --git a/test/Core.Test/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommandTests.cs similarity index 97% rename from test/Core.Test/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommandTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommandTests.cs index 70773d38e..a63aadd06 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommandTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/CreateOrganizationDomainCommandTests.cs @@ -1,7 +1,7 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains; +using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.OrganizationFeatures.OrganizationDomains; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Test.Common.AutoFixture; @@ -11,7 +11,7 @@ using NSubstitute.ExceptionExtensions; using NSubstitute.ReturnsExtensions; using Xunit; -namespace Bit.Core.Test.OrganizationFeatures.OrganizationDomains; +namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationDomains; [SutProviderCustomize] public class CreateOrganizationDomainCommandTests diff --git a/test/Core.Test/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommandTests.cs similarity index 84% rename from test/Core.Test/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommandTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommandTests.cs index 3a559d5c3..94c149c25 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommandTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/DeleteOrganizationDomainCommandTests.cs @@ -1,6 +1,6 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains; +using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.OrganizationFeatures.OrganizationDomains; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Test.Common.AutoFixture; @@ -8,7 +8,7 @@ using Bit.Test.Common.AutoFixture.Attributes; using NSubstitute; using Xunit; -namespace Bit.Core.Test.OrganizationFeatures.OrganizationDomains; +namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationDomains; [SutProviderCustomize] public class DeleteOrganizationDomainCommandTests diff --git a/test/Core.Test/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQueryTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQueryTests.cs similarity index 95% rename from test/Core.Test/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQueryTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQueryTests.cs index 6480d8be0..ba12fde41 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQueryTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByIdOrganizationIdQueryTests.cs @@ -1,12 +1,12 @@ -using Bit.Core.Entities; -using Bit.Core.OrganizationFeatures.OrganizationDomains; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains; +using Bit.Core.Entities; using Bit.Core.Repositories; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; using NSubstitute; using Xunit; -namespace Bit.Core.Test.OrganizationFeatures.OrganizationDomains; +namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationDomains; [SutProviderCustomize] public class GetOrganizationDomainByIdOrganizationIdQueryTests diff --git a/test/Core.Test/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQueryTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQueryTests.cs similarity index 81% rename from test/Core.Test/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQueryTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQueryTests.cs index d87667600..527a530fe 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQueryTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/GetOrganizationDomainByOrganizationIdQueryTests.cs @@ -1,11 +1,11 @@ -using Bit.Core.OrganizationFeatures.OrganizationDomains; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains; using Bit.Core.Repositories; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; using NSubstitute; using Xunit; -namespace Bit.Core.Test.OrganizationFeatures.OrganizationDomains; +namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationDomains; [SutProviderCustomize] public class GetOrganizationDomainByOrganizationIdQueryTests diff --git a/test/Core.Test/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommandTests.cs similarity index 96% rename from test/Core.Test/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommandTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommandTests.cs index 07bc2b14e..416d86c5d 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommandTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommandTests.cs @@ -1,7 +1,7 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains; +using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.OrganizationFeatures.OrganizationDomains; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Test.Common.AutoFixture; @@ -9,7 +9,7 @@ using Bit.Test.Common.AutoFixture.Attributes; using NSubstitute; using Xunit; -namespace Bit.Core.Test.OrganizationFeatures.OrganizationDomains; +namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationDomains; [SutProviderCustomize] public class VerifyOrganizationDomainCommandTests diff --git a/test/Core.Test/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQueryTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQueryTests.cs similarity index 95% rename from test/Core.Test/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQueryTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQueryTests.cs index 375fcc66a..14615eb12 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQueryTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/CountNewSmSeatsRequiredQueryTests.cs @@ -1,13 +1,13 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers; +using Bit.Core.Entities; using Bit.Core.Exceptions; -using Bit.Core.OrganizationFeatures.OrganizationUsers; using Bit.Core.Repositories; using Bit.Test.Common.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; using NSubstitute; using Xunit; -namespace Bit.Core.Test.OrganizationFeatures.OrganizationUsers; +namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationUsers; [SutProviderCustomize] public class CountNewSmSeatsRequiredQueryTests diff --git a/test/Core.Test/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommandTests.cs similarity index 93% rename from test/Core.Test/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommandTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommandTests.cs index b28ea914d..73302acc2 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommandTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteOrganizationUserCommandTests.cs @@ -1,7 +1,7 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers; +using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.OrganizationFeatures.OrganizationUsers; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Test.Common.AutoFixture; @@ -9,7 +9,7 @@ using Bit.Test.Common.AutoFixture.Attributes; using NSubstitute; using Xunit; -namespace Bit.Core.Test.OrganizationFeatures.OrganizationUsers; +namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationUsers; [SutProviderCustomize] public class DeleteOrganizationUserCommandTests diff --git a/test/Core.Test/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommandTests.cs similarity index 92% rename from test/Core.Test/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommandTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommandTests.cs index 542220560..a581b463f 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommandTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/UpdateOrganizationUserGroupsCommandTests.cs @@ -1,6 +1,6 @@ -using Bit.Core.Entities; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers; +using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.OrganizationFeatures.OrganizationUsers; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Test.Common.AutoFixture; @@ -8,7 +8,7 @@ using Bit.Test.Common.AutoFixture.Attributes; using NSubstitute; using Xunit; -namespace Bit.Core.Test.OrganizationFeatures.OrganizationUsers; +namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationUsers; [SutProviderCustomize] public class UpdateOrganizationUserGroupsCommandTests diff --git a/test/Core.Test/Services/OrganizationServiceTests.cs b/test/Core.Test/Services/OrganizationServiceTests.cs index c3c5219cd..0aab3654b 100644 --- a/test/Core.Test/Services/OrganizationServiceTests.cs +++ b/test/Core.Test/Services/OrganizationServiceTests.cs @@ -1,6 +1,7 @@ using System.Text.Json; using Bit.Core.AdminConsole.Entities.Provider; using Bit.Core.AdminConsole.Enums.Provider; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces; using Bit.Core.AdminConsole.Repositories; using Bit.Core.Auth.Entities; using Bit.Core.Auth.Enums; @@ -16,7 +17,6 @@ using Bit.Core.Models.Data; using Bit.Core.Models.Data.Organizations.OrganizationUsers; using Bit.Core.Models.StaticStore; using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface; -using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings;