[AC-1287] AC Team code ownership moves: Policies (1/2) (#3383)

* note: IPolicyData and EntityFramework Policy.cs are moved without any
  changes to namespace or content in order to preserve git history.

bitwarden_license/src/Sso/Controllers/AccountController.cs

@@ -1,5 +1,7 @@
 using System.Security.Claims;
 using Bit.Core;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models;

src/Api/AdminConsole/Controllers/OrganizationUsersController.cs

@@ -2,6 +2,8 @@
 using Bit.Api.AdminConsole.Models.Response.Organizations;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Context;
@@ -9,7 +11,6 @@ using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 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;

src/Api/AdminConsole/Controllers/OrganizationsController.cs

@@ -11,6 +11,8 @@ using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;
 using Bit.Core;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationApiKeys.Interfaces;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Enums;
@@ -20,7 +22,6 @@ using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
-using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces;
 using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface;
 using Bit.Core.Repositories;

src/Api/AdminConsole/Controllers/PoliciesController.cs

@@ -1,10 +1,13 @@
 using Bit.Api.AdminConsole.Models.Request;
 using Bit.Api.Models.Response;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.Api.Response;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Auth.Models.Business.Tokenables;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Api.Response;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Api/AdminConsole/Models/Request/PolicyRequestModel.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Enums;
+using Bit.Core.AdminConsole.Enums;
 
 namespace Bit.Api.AdminConsole.Models.Request;
 

src/Api/AdminConsole/Public/Controllers/PoliciesController.cs

@@ -2,9 +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.Enums;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Context;
-using Bit.Core.Enums;
-using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

src/Api/AdminConsole/Public/Models/Request/PolicyUpdateRequestModel.cs

@@ -1,5 +1,5 @@
 using System.Text.Json;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 
 namespace Bit.Api.AdminConsole.Public.Models.Request;
 

src/Api/AdminConsole/Public/Models/Response/PolicyResponseModel.cs

@@ -1,8 +1,8 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
 using Bit.Api.Models.Public.Response;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Enums;
+using Bit.Core.AdminConsole.Enums;
 
 namespace Bit.Api.AdminConsole.Public.Models.Response;
 

src/Api/Auth/Controllers/EmergencyAccessController.cs

@@ -3,10 +3,10 @@ using Bit.Api.Auth.Models.Request;
 using Bit.Api.Auth.Models.Response;
 using Bit.Api.Models.Response;
 using Bit.Api.Vault.Models.Response;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Models.Api.Response;
 using Bit.Core.Auth.Services;
-using Bit.Core.Entities;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Api.Response;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Api/Auth/Controllers/WebAuthnController.cs

@@ -3,9 +3,10 @@ using Bit.Api.Auth.Models.Request.Webauthn;
 using Bit.Api.Auth.Models.Response.WebAuthn;
 using Bit.Api.Models.Response;
 using Bit.Core;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Auth.Models.Business.Tokenables;
 using Bit.Core.Auth.Repositories;
-using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
 using Bit.Core.Tokens;

src/Api/Controllers/AccountsController.cs

@@ -7,6 +7,7 @@ using Bit.Api.Utilities;
 using Bit.Core;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Auth.Models.Api.Request.Accounts;
 using Bit.Core.Auth.Models.Api.Response.Accounts;
 using Bit.Core.Auth.Models.Data;

src/Api/Vault/Controllers/SyncController.cs

@@ -1,4 +1,5 @@
 using Bit.Api.Vault.Models.Response;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Entities;

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

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

src/Core/AdminConsole/Entities/Policy.cs

@@ -1,8 +1,9 @@
-using Bit.Core.Enums;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
+namespace Bit.Core.AdminConsole.Entities;
 
 public class Policy : ITableObject<Guid>
 {

src/Core/AdminConsole/Enums/PolicyType.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Enums;
+namespace Bit.Core.AdminConsole.Enums;
 
 public enum PolicyType : byte
 {

src/Core/AdminConsole/Models/Api/Response/PolicyResponseModel.cs

@@ -1,8 +1,9 @@
 using System.Text.Json;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Enums;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.Models.Api;
 
-namespace Bit.Core.Models.Api.Response;
+namespace Bit.Core.AdminConsole.Models.Api.Response;
 
 public class PolicyResponseModel : ResponseModel
 {

src/Core/AdminConsole/Models/Data/Organizations/Policies/MasterPasswordPolicyData.cs

@@ -1,4 +1,6 @@
-namespace Bit.Core.Models.Data.Organizations.Policies;
+using Bit.Core.Models.Data.Organizations.Policies;
+
+namespace Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
 
 public class MasterPasswordPolicyData : IPolicyDataModel
 {

src/Core/AdminConsole/Models/Data/Organizations/Policies/ResetPasswordDataModel.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Models.Data.Organizations.Policies;
 
-namespace Bit.Core.Models.Data.Organizations.Policies;
+namespace Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
 
 public class ResetPasswordDataModel : IPolicyDataModel
 {

src/Core/AdminConsole/Models/Data/Organizations/Policies/SendOptionsPolicyData.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Models.Data.Organizations.Policies;
 
-namespace Bit.Core.Models.Data.Organizations.Policies;
+namespace Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
 
 public class SendOptionsPolicyData : IPolicyDataModel
 {

src/Core/AdminConsole/Repositories/IPolicyRepository.cs

@@ -1,7 +1,8 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Enums;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.Repositories;
 
-namespace Bit.Core.Repositories;
+namespace Bit.Core.AdminConsole.Repositories;
 
 public interface IPolicyRepository : IRepository<Policy, Guid>
 {

src/Core/AdminConsole/Services/IPolicyService.cs

@@ -1,9 +1,12 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
-using Bit.Core.Models.Data.Organizations.Policies;
+using Bit.Core.Services;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.AdminConsole.Services;
 
 public interface IPolicyService
 {

src/Core/AdminConsole/Services/Implementations/PolicyService.cs

@@ -1,14 +1,18 @@
-using Bit.Core.Auth.Enums;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Repositories;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
-using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.Repositories;
+using Bit.Core.Services;
 using Bit.Core.Settings;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.AdminConsole.Services.Implementations;
 
 public class PolicyService : IPolicyService
 {
@@ -114,12 +118,12 @@ public class PolicyService : IPolicyService
                 var orgUsers = await _organizationUserRepository.GetManyDetailsByOrganizationAsync(
                     policy.OrganizationId);
                 var removableOrgUsers = orgUsers.Where(ou =>
-                    ou.Status != Enums.OrganizationUserStatusType.Invited && ou.Status != Enums.OrganizationUserStatusType.Revoked &&
+                    ou.Status != OrganizationUserStatusType.Invited && ou.Status != OrganizationUserStatusType.Revoked &&
-                    ou.Type != Enums.OrganizationUserType.Owner && ou.Type != Enums.OrganizationUserType.Admin &&
+                    ou.Type != OrganizationUserType.Owner && ou.Type != OrganizationUserType.Admin &&
                     ou.UserId != savingUserId);
                 switch (policy.Type)
                 {
-                    case Enums.PolicyType.TwoFactorAuthentication:
+                    case PolicyType.TwoFactorAuthentication:
                         foreach (var orgUser in removableOrgUsers)
                         {
                             if (!await userService.TwoFactorIsEnabledAsync(orgUser))
@@ -131,7 +135,7 @@ public class PolicyService : IPolicyService
                             }
                         }
                         break;
-                    case Enums.PolicyType.SingleOrg:
+                    case PolicyType.SingleOrg:
                         var userOrgs = await _organizationUserRepository.GetManyByManyUsersAsync(
                                 removableOrgUsers.Select(ou => ou.UserId.Value));
                         foreach (var orgUser in removableOrgUsers)
@@ -154,7 +158,7 @@ public class PolicyService : IPolicyService
         }
         policy.RevisionDate = now;
         await _policyRepository.UpsertAsync(policy);
-        await _eventService.LogPolicyEventAsync(policy, Enums.EventType.Policy_Updated);
+        await _eventService.LogPolicyEventAsync(policy, EventType.Policy_Updated);
     }
 
     public async Task<MasterPasswordPolicyData> GetMasterPasswordPolicyForUserAsync(User user)

src/Core/Auth/Services/IEmergencyAccessService.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Auth.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Data;
 using Bit.Core.Entities;

src/Core/Auth/Services/Implementations/EmergencyAccessService.cs

@@ -1,4 +1,6 @@
-using Bit.Core.Auth.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models;
 using Bit.Core.Auth.Models.Business.Tokenables;

src/Core/Auth/Services/Implementations/SsoConfigService.cs

@@ -1,10 +1,14 @@
-using Bit.Core.Auth.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
+using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Repositories;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 

src/Core/Models/Api/Response/MasterPasswordPolicyResponseModel.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Models.Data.Organizations.Policies;
+using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
 
 namespace Bit.Core.Models.Api.Response;
 

src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserPolicyDetails.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Enums;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Models.Data.Organizations.OrganizationUsers;
 

src/Core/Models/Data/Organizations/SelfHostedOrganizationDetails.cs

@@ -1,4 +1,6 @@
-using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Entities;

src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs

@@ -1,4 +1,5 @@
-using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Repositories;

src/Core/OrganizationFeatures/OrganizationUsers/AcceptOrgUserCommand.cs

@@ -1,4 +1,6 @@
-using Bit.Core.Auth.Models.Business.Tokenables;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Services;
+using Bit.Core.Auth.Models.Business.Tokenables;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;

src/Core/Repositories/IOrganizationUserRepository.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;

src/Core/Services/Implementations/OrganizationService.cs

@@ -1,10 +1,13 @@
 using System.Security.Claims;
 using System.Text.Json;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.Models.Business;
+using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Business;
 using Bit.Core.Auth.Models.Business.Tokenables;
@@ -15,7 +18,6 @@ using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;

src/Core/Services/Implementations/UserService.cs

@@ -1,6 +1,8 @@
 using System.Security.Claims;
 using System.Text.Json;
+using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models;

src/Core/Tools/Services/Implementations/SendService.cs

@@ -1,9 +1,11 @@
 using System.Text.Json;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Context;
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Core/Vault/Services/Implementations/CipherService.cs

@@ -1,4 +1,6 @@
 using System.Text.Json;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Enums;

src/Identity/IdentityServer/BaseRequestValidator.cs

@@ -3,6 +3,8 @@ using System.Reflection;
 using System.Security.Claims;
 using System.Text.Json;
 using Bit.Core;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Identity;

src/Identity/IdentityServer/CustomTokenRequestValidator.cs

@@ -1,4 +1,5 @@
 using System.Security.Claims;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Auth.Identity;
 using Bit.Core.Auth.Models.Api.Response;
 using Bit.Core.Auth.Models.Business.Tokenables;

src/Identity/IdentityServer/ResourceOwnerPasswordValidator.cs

@@ -1,5 +1,6 @@
 using System.Security.Claims;
 using Bit.Core;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Auth.Identity;
 using Bit.Core.Auth.Models.Business.Tokenables;
 using Bit.Core.Auth.Repositories;

src/Identity/IdentityServer/WebAuthnGrantValidator.cs

@@ -1,6 +1,7 @@
 using System.Security.Claims;
 using System.Text.Json;
 using Bit.Core;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Identity;
 using Bit.Core.Auth.Models.Business.Tokenables;

src/Infrastructure.Dapper/AdminConsole/Repositories/PolicyRepository.cs

@@ -1,12 +1,13 @@
 using System.Data;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Enums;
+using Bit.Core.AdminConsole.Enums;
-using Bit.Core.Repositories;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Settings;
+using Bit.Infrastructure.Dapper.Repositories;
 using Dapper;
 using Microsoft.Data.SqlClient;
 
-namespace Bit.Infrastructure.Dapper.Repositories;
+namespace Bit.Infrastructure.Dapper.AdminConsole.Repositories;
 
 public class PolicyRepository : Repository<Policy, Guid>, IPolicyRepository
 {

src/Infrastructure.Dapper/Repositories/OrganizationRepository.cs

@@ -1,4 +1,5 @@
 using System.Data;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Auth.Entities;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data.Organizations;

src/Infrastructure.Dapper/Repositories/OrganizationUserRepository.cs

@@ -1,6 +1,7 @@
 using System.Data;
 using System.Text.Json;
 using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;

src/Infrastructure.EntityFramework/AdminConsole/Models/Policy.cs

@@ -2,7 +2,7 @@
 
 namespace Bit.Infrastructure.EntityFramework.Models;
 
-public class Policy : Core.Entities.Policy
+public class Policy : Core.AdminConsole.Entities.Policy
 {
     public virtual Organization Organization { get; set; }
 }
@@ -11,6 +11,6 @@ public class PolicyMapperProfile : Profile
 {
     public PolicyMapperProfile()
     {
-        CreateMap<Core.Entities.Policy, Policy>().ReverseMap();
+        CreateMap<Core.AdminConsole.Entities.Policy, Policy>().ReverseMap();
     }
 }

src/Infrastructure.EntityFramework/AdminConsole/Repositories/PolicyRepository.cs

@@ -1,31 +1,33 @@
 using AutoMapper;
-using Bit.Core.Enums;
+using Bit.Core.AdminConsole.Enums;
-using Bit.Core.Repositories;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries;
 using Bit.Infrastructure.EntityFramework.Models;
-using Bit.Infrastructure.EntityFramework.Repositories.Queries;
+using Bit.Infrastructure.EntityFramework.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
+using AdminConsoleEntities = Bit.Core.AdminConsole.Entities;
 
-namespace Bit.Infrastructure.EntityFramework.Repositories;
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories;
 
-public class PolicyRepository : Repository<Core.Entities.Policy, Policy, Guid>, IPolicyRepository
+public class PolicyRepository : Repository<AdminConsoleEntities.Policy, Policy, Guid>, IPolicyRepository
 {
     public PolicyRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper)
         : base(serviceScopeFactory, mapper, (DatabaseContext context) => context.Policies)
     { }
 
-    public async Task<Core.Entities.Policy> GetByOrganizationIdTypeAsync(Guid organizationId, PolicyType type)
+    public async Task<AdminConsoleEntities.Policy> GetByOrganizationIdTypeAsync(Guid organizationId, PolicyType type)
     {
         using (var scope = ServiceScopeFactory.CreateScope())
         {
             var dbContext = GetDatabaseContext(scope);
             var results = await dbContext.Policies
                 .FirstOrDefaultAsync(p => p.OrganizationId == organizationId && p.Type == type);
-            return Mapper.Map<Core.Entities.Policy>(results);
+            return Mapper.Map<AdminConsoleEntities.Policy>(results);
         }
     }
 
-    public async Task<ICollection<Core.Entities.Policy>> GetManyByOrganizationIdAsync(Guid organizationId)
+    public async Task<ICollection<AdminConsoleEntities.Policy>> GetManyByOrganizationIdAsync(Guid organizationId)
     {
         using (var scope = ServiceScopeFactory.CreateScope())
         {
@@ -33,11 +35,11 @@ public class PolicyRepository : Repository<Core.Entities.Policy, Policy, Guid>,
             var results = await dbContext.Policies
                 .Where(p => p.OrganizationId == organizationId)
                 .ToListAsync();
-            return Mapper.Map<List<Core.Entities.Policy>>(results);
+            return Mapper.Map<List<AdminConsoleEntities.Policy>>(results);
         }
     }
 
-    public async Task<ICollection<Core.Entities.Policy>> GetManyByUserIdAsync(Guid userId)
+    public async Task<ICollection<AdminConsoleEntities.Policy>> GetManyByUserIdAsync(Guid userId)
     {
         using (var scope = ServiceScopeFactory.CreateScope())
         {
@@ -45,7 +47,7 @@ public class PolicyRepository : Repository<Core.Entities.Policy, Policy, Guid>,
 
             var query = new PolicyReadByUserIdQuery(userId);
             var results = await query.Run(dbContext).ToListAsync();
-            return Mapper.Map<List<Core.Entities.Policy>>(results);
+            return Mapper.Map<List<AdminConsoleEntities.Policy>>(results);
         }
     }
 }

src/Infrastructure.EntityFramework/AdminConsole/Repositories/Queries/PolicyReadByUserIdQuery.cs

@@ -1,7 +1,9 @@
 using Bit.Core.Enums;
 using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.Repositories;
+using Bit.Infrastructure.EntityFramework.Repositories.Queries;
 
-namespace Bit.Infrastructure.EntityFramework.Repositories.Queries;
+namespace Bit.Infrastructure.EntityFramework.AdminConsole.Repositories.Queries;
 
 public class PolicyReadByUserIdQuery : IQuery<Policy>
 {

src/Infrastructure.EntityFramework/Repositories/OrganizationUserRepository.cs

@@ -1,4 +1,5 @@
 using AutoMapper;
+using Bit.Core.AdminConsole.Enums;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;

test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs

@@ -1,7 +1,10 @@
 using Bit.Api.AdminConsole.Controllers;
 using Bit.Api.AdminConsole.Models.Request.Organizations;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Entities;
-using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
@@ -82,7 +85,7 @@ public class OrganizationUsersControllerTests
         };
         sutProvider.GetDependency<IUserService>().GetUserByPrincipalAsync(default).ReturnsForAnyArgs(user);
         sutProvider.GetDependency<IPolicyRepository>().GetByOrganizationIdTypeAsync(orgId,
-            Core.Enums.PolicyType.ResetPassword).Returns(policy);
+            PolicyType.ResetPassword).Returns(policy);
 
         await sutProvider.Sut.Accept(orgId, orgUserId, model);
 

test/Api.Test/Auth/Controllers/WebAuthnControllerTests.cs

@@ -1,9 +1,10 @@
 using Bit.Api.Auth.Controllers;
 using Bit.Api.Auth.Models.Request.Accounts;
 using Bit.Api.Auth.Models.Request.Webauthn;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Auth.Models.Business.Tokenables;
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
 using Bit.Core.Tokens;

test/Api.Test/Controllers/AccountsControllerTests.cs

@@ -2,6 +2,7 @@
 using Bit.Api.Auth.Models.Request.Accounts;
 using Bit.Api.Controllers;
 using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Auth.Models.Api.Request.Accounts;
 using Bit.Core.Auth.Services;
 using Bit.Core.Auth.UserFeatures.UserKey;

test/Api.Test/Controllers/PoliciesControllerTests.cs

@@ -1,10 +1,12 @@
 using System.Security.Claims;
 using System.Text.Json;
 using Bit.Api.AdminConsole.Controllers;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Test.Common.AutoFixture;

test/Api.Test/Vault/Controllers/SyncControllerTests.cs

@@ -3,6 +3,7 @@ using System.Text.Json;
 using AutoFixture;
 using Bit.Api.Vault.Controllers;
 using Bit.Api.Vault.Models.Response;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.Models.Data.Provider;
 using Bit.Core.AdminConsole.Repositories;

test/Core.Test/AdminConsole/AutoFixture/PolicyFixtures.cs

@@ -1,10 +1,10 @@
 using System.Reflection;
 using AutoFixture;
 using AutoFixture.Xunit2;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Enums;
+using Bit.Core.AdminConsole.Enums;
 
-namespace Bit.Core.Test.AutoFixture.PolicyFixtures;
+namespace Bit.Core.Test.AdminConsole.AutoFixture;
 
 internal class PolicyCustomization : ICustomization
 {

test/Core.Test/AdminConsole/Services/PolicyServiceTests.cs

@@ -1,4 +1,9 @@
-using Bit.Core.Auth.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services.Implementations;
+using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Data;
 using Bit.Core.Auth.Repositories;
@@ -6,24 +11,23 @@ using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
-using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
 using NSubstitute;
 using Xunit;
+using AdminConsoleFixtures = Bit.Core.Test.AdminConsole.AutoFixture;
 using GlobalSettings = Bit.Core.Settings.GlobalSettings;
-using PolicyFixtures = Bit.Core.Test.AutoFixture.PolicyFixtures;
 
-namespace Bit.Core.Test.Services;
+namespace Bit.Core.Test.AdminConsole.Services;
 
 [SutProviderCustomize]
 public class PolicyServiceTests
 {
     [Theory, BitAutoData]
     public async Task SaveAsync_OrganizationDoesNotExist_ThrowsBadRequest(
-        [PolicyFixtures.Policy(PolicyType.DisableSend)] Policy policy, SutProvider<PolicyService> sutProvider)
+        [AdminConsoleFixtures.Policy(PolicyType.DisableSend)] Policy policy, SutProvider<PolicyService> sutProvider)
     {
         SetupOrg(sutProvider, policy.OrganizationId, null);
 
@@ -46,7 +50,7 @@ public class PolicyServiceTests
 
     [Theory, BitAutoData]
     public async Task SaveAsync_OrganizationCannotUsePolicies_ThrowsBadRequest(
-        [PolicyFixtures.Policy(PolicyType.DisableSend)] Policy policy, SutProvider<PolicyService> sutProvider)
+        [AdminConsoleFixtures.Policy(PolicyType.DisableSend)] Policy policy, SutProvider<PolicyService> sutProvider)
     {
         var orgId = Guid.NewGuid();
 
@@ -74,7 +78,7 @@ public class PolicyServiceTests
 
     [Theory, BitAutoData]
     public async Task SaveAsync_SingleOrg_RequireSsoEnabled_ThrowsBadRequest(
-        [PolicyFixtures.Policy(PolicyType.SingleOrg)] Policy policy, SutProvider<PolicyService> sutProvider)
+        [AdminConsoleFixtures.Policy(PolicyType.SingleOrg)] Policy policy, SutProvider<PolicyService> sutProvider)
     {
         policy.Enabled = false;
 
@@ -106,7 +110,7 @@ public class PolicyServiceTests
     }
 
     [Theory, BitAutoData]
-    public async Task SaveAsync_SingleOrg_VaultTimeoutEnabled_ThrowsBadRequest([PolicyFixtures.Policy(Enums.PolicyType.SingleOrg)] Policy policy, SutProvider<PolicyService> sutProvider)
+    public async Task SaveAsync_SingleOrg_VaultTimeoutEnabled_ThrowsBadRequest([AdminConsoleFixtures.Policy(PolicyType.SingleOrg)] Policy policy, SutProvider<PolicyService> sutProvider)
     {
         policy.Enabled = false;
 
@@ -117,7 +121,7 @@ public class PolicyServiceTests
         });
 
         sutProvider.GetDependency<IPolicyRepository>()
-            .GetByOrganizationIdTypeAsync(policy.OrganizationId, Enums.PolicyType.MaximumVaultTimeout)
+            .GetByOrganizationIdTypeAsync(policy.OrganizationId, PolicyType.MaximumVaultTimeout)
             .Returns(new Policy { Enabled = true });
 
         var badRequestException = await Assert.ThrowsAsync<BadRequestException>(
@@ -137,7 +141,7 @@ public class PolicyServiceTests
     [BitAutoData(PolicyType.SingleOrg)]
     [BitAutoData(PolicyType.RequireSso)]
     public async Task SaveAsync_PolicyRequiredByKeyConnector_DisablePolicy_ThrowsBadRequest(
-        Enums.PolicyType policyType,
+        PolicyType policyType,
         Policy policy,
         SutProvider<PolicyService> sutProvider)
     {
@@ -173,7 +177,7 @@ public class PolicyServiceTests
 
     [Theory, BitAutoData]
     public async Task SaveAsync_RequireSsoPolicy_NotEnabled_ThrowsBadRequestAsync(
-        [PolicyFixtures.Policy(Enums.PolicyType.RequireSso)] Policy policy, SutProvider<PolicyService> sutProvider)
+        [AdminConsoleFixtures.Policy(PolicyType.RequireSso)] Policy policy, SutProvider<PolicyService> sutProvider)
     {
         policy.Enabled = true;
 
@@ -206,7 +210,7 @@ public class PolicyServiceTests
 
     [Theory, BitAutoData]
     public async Task SaveAsync_NewPolicy_Created(
-        [PolicyFixtures.Policy(PolicyType.ResetPassword)] Policy policy, SutProvider<PolicyService> sutProvider)
+        [AdminConsoleFixtures.Policy(PolicyType.ResetPassword)] Policy policy, SutProvider<PolicyService> sutProvider)
     {
         policy.Id = default;
         policy.Data = null;
@@ -218,7 +222,7 @@ public class PolicyServiceTests
         });
 
         sutProvider.GetDependency<IPolicyRepository>()
-            .GetByOrganizationIdTypeAsync(policy.OrganizationId, Enums.PolicyType.SingleOrg)
+            .GetByOrganizationIdTypeAsync(policy.OrganizationId, PolicyType.SingleOrg)
             .Returns(Task.FromResult(new Policy { Enabled = true }));
 
         var utcNow = DateTime.UtcNow;
@@ -237,7 +241,7 @@ public class PolicyServiceTests
 
     [Theory, BitAutoData]
     public async Task SaveAsync_VaultTimeoutPolicy_NotEnabled_ThrowsBadRequestAsync(
-        [PolicyFixtures.Policy(PolicyType.MaximumVaultTimeout)] Policy policy, SutProvider<PolicyService> sutProvider)
+        [AdminConsoleFixtures.Policy(PolicyType.MaximumVaultTimeout)] Policy policy, SutProvider<PolicyService> sutProvider)
     {
         policy.Enabled = true;
 
@@ -248,7 +252,7 @@ public class PolicyServiceTests
         });
 
         sutProvider.GetDependency<IPolicyRepository>()
-            .GetByOrganizationIdTypeAsync(policy.OrganizationId, Enums.PolicyType.SingleOrg)
+            .GetByOrganizationIdTypeAsync(policy.OrganizationId, PolicyType.SingleOrg)
             .Returns(Task.FromResult(new Policy { Enabled = false }));
 
         var badRequestException = await Assert.ThrowsAsync<BadRequestException>(
@@ -270,7 +274,7 @@ public class PolicyServiceTests
 
     [Theory, BitAutoData]
     public async Task SaveAsync_ExistingPolicy_UpdateTwoFactor(
-        [PolicyFixtures.Policy(PolicyType.TwoFactorAuthentication)] Policy policy, SutProvider<PolicyService> sutProvider)
+        [AdminConsoleFixtures.Policy(PolicyType.TwoFactorAuthentication)] Policy policy, SutProvider<PolicyService> sutProvider)
     {
         // If the policy that this is updating isn't enabled then do some work now that the current one is enabled
 
@@ -340,7 +344,7 @@ public class PolicyServiceTests
 
     [Theory, BitAutoData]
     public async Task SaveAsync_ExistingPolicy_UpdateSingleOrg(
-        [PolicyFixtures.Policy(PolicyType.TwoFactorAuthentication)] Policy policy, SutProvider<PolicyService> sutProvider)
+        [AdminConsoleFixtures.Policy(PolicyType.TwoFactorAuthentication)] Policy policy, SutProvider<PolicyService> sutProvider)
     {
         // If the policy that this is updating isn't enabled then do some work now that the current one is enabled
 
@@ -409,7 +413,7 @@ public class PolicyServiceTests
     public async Task SaveAsync_ResetPasswordPolicyRequiredByTrustedDeviceEncryption_DisablePolicyOrDisableAutomaticEnrollment_ThrowsBadRequest(
         bool policyEnabled,
         bool autoEnrollEnabled,
-        [PolicyFixtures.Policy(PolicyType.ResetPassword)] Policy policy,
+        [AdminConsoleFixtures.Policy(PolicyType.ResetPassword)] Policy policy,
         SutProvider<PolicyService> sutProvider)
     {
         policy.Enabled = policyEnabled;
@@ -450,7 +454,7 @@ public class PolicyServiceTests
 
     [Theory, BitAutoData]
     public async Task SaveAsync_RequireSsoPolicyRequiredByTrustedDeviceEncryption_DisablePolicy_ThrowsBadRequest(
-        [PolicyFixtures.Policy(PolicyType.RequireSso)] Policy policy,
+        [AdminConsoleFixtures.Policy(PolicyType.RequireSso)] Policy policy,
         SutProvider<PolicyService> sutProvider)
     {
         policy.Enabled = false;
@@ -487,7 +491,7 @@ public class PolicyServiceTests
 
     [Theory, BitAutoData]
     public async Task SaveAsync_PolicyRequiredForAccountRecovery_NotEnabled_ThrowsBadRequestAsync(
-        [PolicyFixtures.Policy(Enums.PolicyType.ResetPassword)] Policy policy, SutProvider<PolicyService> sutProvider)
+        [AdminConsoleFixtures.Policy(PolicyType.ResetPassword)] Policy policy, SutProvider<PolicyService> sutProvider)
     {
         policy.Enabled = true;
         policy.SetDataModel(new ResetPasswordDataModel());
@@ -522,7 +526,7 @@ public class PolicyServiceTests
 
     [Theory, BitAutoData]
     public async Task SaveAsync_SingleOrg_AccountRecoveryEnabled_ThrowsBadRequest(
-        [PolicyFixtures.Policy(Enums.PolicyType.SingleOrg)] Policy policy, SutProvider<PolicyService> sutProvider)
+        [AdminConsoleFixtures.Policy(PolicyType.SingleOrg)] Policy policy, SutProvider<PolicyService> sutProvider)
     {
         policy.Enabled = false;
 
@@ -533,7 +537,7 @@ public class PolicyServiceTests
         });
 
         sutProvider.GetDependency<IPolicyRepository>()
-            .GetByOrganizationIdTypeAsync(policy.OrganizationId, Enums.PolicyType.ResetPassword)
+            .GetByOrganizationIdTypeAsync(policy.OrganizationId, PolicyType.ResetPassword)
             .Returns(new Policy { Enabled = true });
 
         var badRequestException = await Assert.ThrowsAsync<BadRequestException>(

test/Core.Test/Auth/Services/SsoConfigServiceTests.cs

@@ -1,4 +1,9 @@
-using Bit.Core.Auth.Entities;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
+using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Data;
 using Bit.Core.Auth.Repositories;
@@ -6,7 +11,6 @@ using Bit.Core.Auth.Services;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
-using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Test.Common.AutoFixture;
@@ -205,7 +209,7 @@ public class SsoConfigServiceTests
         };
 
         sutProvider.GetDependency<IPolicyRepository>().GetByOrganizationIdTypeAsync(
-            Arg.Any<Guid>(), Enums.PolicyType.SingleOrg).Returns(new Policy
+            Arg.Any<Guid>(), PolicyType.SingleOrg).Returns(new Policy
             {
                 Enabled = true
             });
@@ -239,7 +243,7 @@ public class SsoConfigServiceTests
         };
 
         sutProvider.GetDependency<IPolicyRepository>().GetByOrganizationIdTypeAsync(
-            Arg.Any<Guid>(), Arg.Any<Enums.PolicyType>()).Returns(new Policy
+            Arg.Any<Guid>(), Arg.Any<PolicyType>()).Returns(new Policy
             {
                 Enabled = true
             });
@@ -274,7 +278,7 @@ public class SsoConfigServiceTests
         };
 
         sutProvider.GetDependency<IPolicyRepository>().GetByOrganizationIdTypeAsync(
-            Arg.Any<Guid>(), Arg.Any<Enums.PolicyType>()).Returns(new Policy
+            Arg.Any<Guid>(), Arg.Any<PolicyType>()).Returns(new Policy
             {
                 Enabled = true,
             });
@@ -309,7 +313,7 @@ public class SsoConfigServiceTests
         };
 
         sutProvider.GetDependency<IPolicyRepository>().GetByOrganizationIdTypeAsync(
-            Arg.Any<Guid>(), Arg.Any<Enums.PolicyType>()).Returns(new Policy
+            Arg.Any<Guid>(), Arg.Any<PolicyType>()).Returns(new Policy
             {
                 Enabled = true,
             });
@@ -338,7 +342,7 @@ public class SsoConfigServiceTests
 
         await sutProvider.GetDependency<IPolicyService>().Received(1)
             .SaveAsync(
-                Arg.Is<Policy>(t => t.Type == Enums.PolicyType.SingleOrg),
+                Arg.Is<Policy>(t => t.Type == PolicyType.SingleOrg),
                 Arg.Any<IUserService>(),
                 Arg.Any<IOrganizationService>(),
                 null
@@ -346,7 +350,7 @@ public class SsoConfigServiceTests
 
         await sutProvider.GetDependency<IPolicyService>().Received(1)
             .SaveAsync(
-                Arg.Is<Policy>(t => t.Type == Enums.PolicyType.ResetPassword && t.GetDataModel<ResetPasswordDataModel>().AutoEnrollEnabled),
+                Arg.Is<Policy>(t => t.Type == PolicyType.ResetPassword && t.GetDataModel<ResetPasswordDataModel>().AutoEnrollEnabled),
                 Arg.Any<IUserService>(),
                 Arg.Any<IOrganizationService>(),
                 null

test/Core.Test/Models/Data/SelfHostedOrganizationDetailsTests.cs

@@ -1,4 +1,6 @@
-using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Data;

test/Core.Test/OrganizationFeatures/OrganizationUsers/AcceptOrgUserCommandTests.cs

@@ -1,4 +1,6 @@
-using Bit.Core.Auth.Models.Business.Tokenables;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Services;
+using Bit.Core.Auth.Models.Business.Tokenables;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;

test/Core.Test/Services/OrganizationServiceTests.cs

@@ -1,5 +1,6 @@
 using System.Text.Json;
 using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.Enums.Provider;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.AdminConsole.Repositories;
@@ -21,9 +22,9 @@ using Bit.Core.OrganizationFeatures.OrganizationSubscriptions.Interface;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
+using Bit.Core.Test.AdminConsole.AutoFixture;
 using Bit.Core.Test.AutoFixture.OrganizationFixtures;
 using Bit.Core.Test.AutoFixture.OrganizationUserFixtures;
-using Bit.Core.Test.AutoFixture.PolicyFixtures;
 using Bit.Core.Tokens;
 using Bit.Core.Tools.Enums;
 using Bit.Core.Tools.Models.Business;
@@ -38,7 +39,7 @@ using NSubstitute.ReturnsExtensions;
 using Xunit;
 using Organization = Bit.Core.Entities.Organization;
 using OrganizationUser = Bit.Core.Entities.OrganizationUser;
-using Policy = Bit.Core.Entities.Policy;
+using Policy = Bit.Core.AdminConsole.Entities.Policy;
 
 namespace Bit.Core.Test.Services;
 

test/Core.Test/Services/UserServiceTests.cs

@@ -2,6 +2,7 @@
 using System.Text.Json;
 using AutoFixture;
 using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models;

test/Core.Test/Tools/Services/SendServiceTests.cs

@@ -1,10 +1,12 @@
 using System.Text;
 using System.Text.Json;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
+using Bit.Core.AdminConsole.Services;
 using Bit.Core.Entities;
-using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
-using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Test.AutoFixture.CurrentContextFixtures;

test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs

@@ -1,4 +1,7 @@
 using System.Text.Json;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Enums;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Models.Api.Request.Accounts;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
@@ -569,7 +572,7 @@ public class IdentityServerTests : IClassFixture<IdentityApplicationFactory>
         };
         await organizationUserRepository.CreateAsync(organizationUser);
 
-        var ssoPolicy = new Bit.Core.Entities.Policy { OrganizationId = organization.Id, Type = PolicyType.RequireSso, Enabled = ssoPolicyEnabled };
+        var ssoPolicy = new Policy { OrganizationId = organization.Id, Type = PolicyType.RequireSso, Enabled = ssoPolicyEnabled };
         await policyRepository.CreateAsync(ssoPolicy);
     }
 

test/Infrastructure.EFIntegration.Test/AdminConsole/Repositories/PolicyRepositoryTests.cs

@@ -3,11 +3,13 @@ using Bit.Core.Test.AutoFixture.Attributes;
 using Bit.Infrastructure.EFIntegration.Test.AutoFixture;
 using Bit.Infrastructure.EFIntegration.Test.Repositories.EqualityComparers;
 using Xunit;
+using EfAdminConsoleRepo = Bit.Infrastructure.EntityFramework.AdminConsole.Repositories;
 using EfRepo = Bit.Infrastructure.EntityFramework.Repositories;
-using Policy = Bit.Core.Entities.Policy;
+using Policy = Bit.Core.AdminConsole.Entities.Policy;
+using SqlAdminConsoleRepo = Bit.Infrastructure.Dapper.AdminConsole.Repositories;
 using SqlRepo = Bit.Infrastructure.Dapper.Repositories;
 
-namespace Bit.Infrastructure.EFIntegration.Test.Repositories;
+namespace Bit.Infrastructure.EFIntegration.Test.AdminConsole.Repositories;
 
 public class PolicyRepositoryTests
 {
@@ -16,9 +18,9 @@ public class PolicyRepositoryTests
         Policy policy,
         Organization organization,
         PolicyCompare equalityComparer,
-        List<EfRepo.PolicyRepository> suts,
+        List<EfAdminConsoleRepo.PolicyRepository> suts,
         List<EfRepo.OrganizationRepository> efOrganizationRepos,
-        SqlRepo.PolicyRepository sqlPolicyRepo,
+        SqlAdminConsoleRepo.PolicyRepository sqlPolicyRepo,
         SqlRepo.OrganizationRepository sqlOrganizationRepo
         )
     {

test/Infrastructure.EFIntegration.Test/AutoFixture/PolicyFixtures.cs

@@ -1,6 +1,6 @@
 using AutoFixture;
 using AutoFixture.Kernel;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Infrastructure.EntityFramework.AdminConsole.Repositories;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Bit.Test.Common.AutoFixture;

test/Infrastructure.EFIntegration.Test/Repositories/EqualityComparers/PolicyCompare.cs

@@ -1,5 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using Bit.Core.Entities;
+using Bit.Core.AdminConsole.Entities;
 
 namespace Bit.Infrastructure.EFIntegration.Test.Repositories.EqualityComparers;
 

test/Infrastructure.EFIntegration.Test/Repositories/OrganizationUserRepositoryTests.cs

@@ -1,5 +1,7 @@
 using System.Text.Json;
+using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Entities.Provider;
+using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
@@ -13,6 +15,7 @@ using Xunit;
 using EfAdminConsoleRepo = Bit.Infrastructure.EntityFramework.AdminConsole.Repositories;
 using EfRepo = Bit.Infrastructure.EntityFramework.Repositories;
 using OrganizationUser = Bit.Core.Entities.OrganizationUser;
+using SqlAdminConsoleRepo = Bit.Infrastructure.Dapper.AdminConsole.Repositories;
 using SqlRepo = Bit.Infrastructure.Dapper.Repositories;
 
 namespace Bit.Infrastructure.EFIntegration.Test.Repositories;
@@ -182,7 +185,7 @@ public class OrganizationUserRepositoryTests
         OrganizationUserPolicyDetailsCompare equalityComparer,
 
         // Auto data - EF repos
-        List<EfRepo.PolicyRepository> efPolicyRepository,
+        List<EfAdminConsoleRepo.PolicyRepository> efPolicyRepository,
         List<EfRepo.UserRepository> efUserRepository,
         List<EfRepo.OrganizationRepository> efOrganizationRepository,
         List<EfRepo.OrganizationUserRepository> suts,
@@ -191,7 +194,7 @@ public class OrganizationUserRepositoryTests
         List<EfAdminConsoleRepo.ProviderUserRepository> efProviderUserRepository,
 
         // Auto data - SQL repos
-        SqlRepo.PolicyRepository sqlPolicyRepo,
+        SqlAdminConsoleRepo.PolicyRepository sqlPolicyRepo,
         SqlRepo.UserRepository sqlUserRepo,
         SqlRepo.OrganizationRepository sqlOrganizationRepo,
         EfAdminConsoleRepo.ProviderRepository sqlProviderRepo,