Merge remote-tracking branch 'origin/master' into feature/flexible-collections

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
 {

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<Guid>
 {

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<Guid>
 {

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<Guid>
 {

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
 {

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
 {

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
 {

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
 {

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<T>
 {

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;

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
 {

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
 {

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; }
 }

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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;

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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<ProviderOrganization, Guid>
 {

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<Provider, Guid>
 {

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<ProviderUser, Guid>
 {

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
 {

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
 {

src/Core/Constants.cs

@@ -45,6 +45,7 @@ public static class FeatureFlagKeys
     public const string BrowserFilelessImport = "browser-fileless-import";
     public const string FlexibleCollections = "flexible-collections";
     public const string BulkCollectionAccess = "bulk-collection-access";
+    public const string AutofillOverlay = "autofill-overlay";
 
     public static List<string> GetAllKeys()
     {

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;

src/Core/Context/ICurrentContext.cs

@@ -1,6 +1,8 @@
 #nullable enable
 
 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;

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;
 

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;

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;
 

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;

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;

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;

src/Core/Services/Implementations/CollectionService.cs

@@ -103,7 +103,13 @@ public class CollectionService : ICollectionService
 
     public async Task<IEnumerable<Collection>> GetOrganizationCollectionsAsync(Guid organizationId)
     {
-        if (!await _currentContext.ViewAssignedCollections(organizationId) && !await _currentContext.ManageUsers(organizationId) && !await _currentContext.ManageGroups(organizationId) && !await _currentContext.AccessImportExport(organizationId))
+        if (
+            !await _currentContext.ViewAssignedCollections(organizationId) &&
+            !await _currentContext.ViewAllCollections(organizationId) &&
+            !await _currentContext.ManageUsers(organizationId) &&
+            !await _currentContext.ManageGroups(organizationId) &&
+            !await _currentContext.AccessImportExport(organizationId)
+        )
         {
             throw new NotFoundException();
         }

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;

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;

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;
 

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;

src/Core/Services/Implementations/OrganizationService.cs

@@ -1,7 +1,9 @@
 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.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Business;
@@ -9,13 +11,11 @@ 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;
 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;

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;

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;

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;

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;