Split out repositories to Infrastructure.Dapper / EntityFramework (#1759)

src/Core/Context/CurrentContentOrganization.cs

@@ -1,7 +1,7 @@
 using System;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Context

src/Core/Context/CurrentContentProvider.cs

@@ -1,9 +1,8 @@
 using System;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
-using Bit.Core.Models.Table.Provider;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Context

src/Core/Context/CurrentContext.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;

src/Core/Context/ICurrentContext.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Http;

src/Core/Core.csproj

@@ -19,7 +19,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.0.1" />
     <PackageReference Include="AWSSDK.SimpleEmail" Version="3.3.101.182" />
     <PackageReference Include="AWSSDK.SQS" Version="3.3.103.15" />
     <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.2.1" />
@@ -29,25 +28,21 @@
     <PackageReference Include="Fido2.AspNet" Version="1.1.0" />
     <PackageReference Include="Handlebars.Net" Version="1.10.1" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="linq2db.EntityFrameworkCore" Version="5.2.1" />
     <PackageReference Include="MailKit" Version="2.8.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.9" />
     <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.7" />
     <PackageReference Include="Microsoft.Azure.NotificationHubs" Version="3.3.0" />
     <PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.9" />
+    <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.1.7" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="5.0.9" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.2" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0" />
     <PackageReference Include="Quartz" Version="3.1.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" />
     <PackageReference Include="Sentry.Serilog" Version="2.1.5" />
     <PackageReference Include="IdentityServer4" Version="4.0.4" />
-    <PackageReference Include="Dapper" Version="2.0.35" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Serilog.Sinks.AzureCosmosDB" Version="1.0.0" />
     <PackageReference Include="Serilog.Sinks.SyslogMessages" Version="1.0.5" />
@@ -58,7 +53,6 @@
     <PackageReference Include="U2F.Core" Version="1.0.4" />
     <PackageReference Include="Otp.NET" Version="1.2.2" />
     <PackageReference Include="YubicoDotNetClient" Version="1.2.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
   </ItemGroup>
 

src/Core/Entities/Cipher.cs

@@ -4,7 +4,7 @@ using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 using Newtonsoft.Json;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class Cipher : ITableObject<Guid>, ICloneable
     {
@@ -18,9 +18,9 @@ namespace Bit.Core.Models.Table
         public string Favorites { get; set; }
         public string Folders { get; set; }
         public string Attachments { get; set; }
-        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
-        public DateTime? DeletedDate { get; internal set; }
+        public DateTime CreationDate { get; set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
+        public DateTime? DeletedDate { get; set; }
         public Enums.CipherRepromptType? Reprompt { get; set; }
 
         public void SetNewId()

src/Core/Entities/Collection.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class Collection : ITableObject<Guid>
     {
@@ -11,8 +11,8 @@ namespace Bit.Core.Models.Table
         public string Name { get; set; }
         [MaxLength(300)]
         public string ExternalId { get; set; }
-        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime CreationDate { get; set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
 
         public void SetNewId()
         {

src/Core/Entities/CollectionCipher.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class CollectionCipher
     {

src/Core/Entities/CollectionGroup.cs

@@ -1,7 +1,6 @@
 using System;
-using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class CollectionGroup
     {

src/Core/Entities/CollectionUser.cs

@@ -1,7 +1,6 @@
 using System;
-using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class CollectionUser
     {

src/Core/Entities/Device.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class Device : ITableObject<Guid>
     {

src/Core/Entities/EmergencyAccess.cs

@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class EmergencyAccess : ITableObject<Guid>
     {
@@ -16,10 +16,10 @@ namespace Bit.Core.Models.Table
         public EmergencyAccessType Type { get; set; }
         public EmergencyAccessStatusType Status { get; set; }
         public int WaitTimeDays { get; set; }
-        public DateTime? RecoveryInitiatedDate { get; internal set; }
-        public DateTime? LastNotificationDate { get; internal set; }
-        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime? RecoveryInitiatedDate { get; set; }
+        public DateTime? LastNotificationDate { get; set; }
+        public DateTime CreationDate { get; set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
 
         public void SetNewId()
         {

src/Core/Entities/Event.cs

@@ -4,7 +4,7 @@ using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class Event : ITableObject<Guid>, IEvent
     {

src/Core/Entities/Folder.cs

@@ -1,7 +1,7 @@
 using System;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class Folder : ITableObject<Guid>
     {

src/Core/Entities/Grant.cs

@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class Grant
     {

src/Core/Entities/Group.cs

@@ -1,8 +1,9 @@
 using System;
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Models;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class Group : ITableObject<Guid>, IExternal
     {

src/Core/Entities/GroupUser.cs

@@ -1,7 +1,6 @@
 using System;
-using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class GroupUser
     {

src/Core/Entities/IReferenceable.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Bit.Core.Models
+namespace Bit.Core.Entities
 {
     public interface IReferenceable
     {

src/Core/Entities/IRevisable.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public interface IRevisable
     {

src/Core/Entities/IStorable.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public interface IStorable
     {

src/Core/Entities/IStorableSubscriber.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public interface IStorableSubscriber : IStorable, ISubscriber
     { }

src/Core/Entities/ISubscriber.cs

@@ -1,8 +1,7 @@
 using System;
 using Bit.Core.Enums;
-using Bit.Core.Services;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public interface ISubscriber
     {

src/Core/Entities/ITableObject.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public interface ITableObject<T> where T : IEquatable<T>
     {

src/Core/Entities/Installation.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class Installation : ITableObject<Guid>
     {

src/Core/Entities/Organization.cs

@@ -3,10 +3,11 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Bit.Core.Enums;
+using Bit.Core.Models;
 using Bit.Core.Utilities;
 using Newtonsoft.Json;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class Organization : ITableObject<Guid>, ISubscriber, IStorable, IStorableSubscriber, IRevisable, IReferenceable
     {
@@ -65,8 +66,8 @@ namespace Bit.Core.Models.Table
         public string PrivateKey { get; set; }
         public string TwoFactorProviders { get; set; }
         public DateTime? ExpirationDate { get; set; }
-        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime CreationDate { get; set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
         public int? MaxAutoscaleSeats { get; set; } = null;
         public DateTime? OwnersNotifiedOfAutoscaling { get; set; } = null;
 

src/Core/Entities/OrganizationSponsorship.cs

@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class OrganizationSponsorship : ITableObject<Guid>
     {

src/Core/Entities/OrganizationUser.cs

@@ -1,9 +1,10 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
+using Bit.Core.Models;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class OrganizationUser : ITableObject<Guid>, IExternal
     {

src/Core/Entities/Policy.cs

@@ -2,7 +2,7 @@
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class Policy : ITableObject<Guid>
     {

src/Core/Entities/Provider/Provider.cs

@@ -2,7 +2,7 @@
 using Bit.Core.Enums.Provider;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table.Provider
+namespace Bit.Core.Entities.Provider
 {
     public class Provider : ITableObject<Guid>
     {

src/Core/Entities/Provider/ProviderOrganization.cs

@@ -1,7 +1,7 @@
 using System;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table.Provider
+namespace Bit.Core.Entities.Provider
 {
     public class ProviderOrganization : ITableObject<Guid>
     {

src/Core/Entities/Provider/ProviderUser.cs

@@ -2,7 +2,7 @@
 using Bit.Core.Enums.Provider;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table.Provider
+namespace Bit.Core.Entities.Provider
 {
     public class ProviderUser : ITableObject<Guid>
     {

src/Core/Entities/Role.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     /// <summary>
     /// This class is not used. It is implemented to make the Identity provider happy.

src/Core/Entities/Send.cs

@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class Send : ITableObject<Guid>
     {

src/Core/Entities/SsoConfig.cs

@@ -1,7 +1,7 @@
 using System;
 using Bit.Core.Models.Data;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class SsoConfig : ITableObject<long>
     {

src/Core/Entities/SsoUser.cs

@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class SsoUser : ITableObject<long>
     {

src/Core/Entities/TaxRate.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class TaxRate : ITableObject<string>
     {

src/Core/Entities/Transaction.cs

@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class Transaction : ITableObject<Guid>
     {

src/Core/Entities/U2f.cs

@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class U2f : ITableObject<int>
     {

src/Core/Entities/User.cs

@@ -2,11 +2,12 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
+using Bit.Core.Models;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Identity;
 using Newtonsoft.Json;
 
-namespace Bit.Core.Models.Table
+namespace Bit.Core.Entities
 {
     public class User : ITableObject<Guid>, ISubscriber, IStorable, IStorableSubscriber, IRevisable, ITwoFactorProvidersUser, IReferenceable
     {
@@ -33,7 +34,7 @@ namespace Bit.Core.Models.Table
         public string TwoFactorRecoveryCode { get; set; }
         public string EquivalentDomains { get; set; }
         public string ExcludedGlobalEquivalentDomains { get; set; }
-        public DateTime AccountRevisionDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime AccountRevisionDate { get; set; } = DateTime.UtcNow;
         public string Key { get; set; }
         public string PublicKey { get; set; }
         public string PrivateKey { get; set; }
@@ -55,8 +56,8 @@ namespace Bit.Core.Models.Table
         public string ApiKey { get; set; }
         public KdfType Kdf { get; set; } = KdfType.PBKDF2_SHA256;
         public int KdfIterations { get; set; } = 5000;
-        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime CreationDate { get; set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
         public bool ForcePasswordReset { get; set; }
         public bool UsesKeyConnector { get; set; }
 

src/Core/Identity/AuthenticatorTokenProvider.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Table;
 using Bit.Core.Services;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;

src/Core/Identity/DuoWebTokenProvider.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Threading.Tasks;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
-using Bit.Core.Models.Table;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Bit.Core.Utilities.Duo;

src/Core/Identity/EmailTokenProvider.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Threading.Tasks;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
-using Bit.Core.Models.Table;
 using Bit.Core.Services;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;

src/Core/Identity/IOrganizationTwoFactorTokenProvider.cs

@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Identity
 {

src/Core/Identity/OrganizationDuoWebTokenProvider.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
-using Bit.Core.Models.Table;
 using Bit.Core.Settings;
 using Bit.Core.Utilities.Duo;
 

src/Core/Identity/RoleStore.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 using Microsoft.AspNetCore.Identity;
 
 namespace Bit.Core.Identity

src/Core/Identity/TwoFactorRememberTokenProvider.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;

src/Core/Identity/U2fTokenProvider.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Core/Identity/UserStore.cs

@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Bit.Core.Context;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Core/Identity/WebAuthnTokenProvider.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
-using Bit.Core.Models.Table;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;

src/Core/Identity/YubicoOtpTokenProvider.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Table;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Identity;

src/Core/IdentityServer/BaseRequestValidator.cs

@@ -7,12 +7,12 @@ using System.Security.Claims;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Bit.Core.Context;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Identity;
 using Bit.Core.Models;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Core/IdentityServer/CustomTokenRequestValidator.cs

@@ -5,9 +5,9 @@ using System.Security.Claims;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Bit.Core.Context;
+using Bit.Core.Entities;
 using Bit.Core.Identity;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Core/IdentityServer/PersistedGrantStore.cs

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Bit.Core.Repositories;
 using IdentityServer4.Models;
 using IdentityServer4.Stores;
+using Grant = Bit.Core.Entities.Grant;
 
 namespace Bit.Core.IdentityServer
 {
@@ -53,9 +54,9 @@ namespace Bit.Core.IdentityServer
             await _grantRepository.SaveAsync(grant);
         }
 
-        private Models.Table.Grant ToGrant(PersistedGrant pGrant)
+        private Grant ToGrant(PersistedGrant pGrant)
         {
-            return new Models.Table.Grant
+            return new Grant
             {
                 Key = pGrant.Key,
                 Type = pGrant.Type,
@@ -70,7 +71,7 @@ namespace Bit.Core.IdentityServer
             };
         }
 
-        private PersistedGrant ToPersistedGrant(Models.Table.Grant grant)
+        private PersistedGrant ToPersistedGrant(Grant grant)
         {
             return new PersistedGrant
             {

src/Core/IdentityServer/ResourceOwnerPasswordValidator.cs

@@ -2,8 +2,8 @@
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Bit.Core.Context;
+using Bit.Core.Entities;
 using Bit.Core.Identity;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Core/Models/Business/AppleReceiptStatus.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Table;
 using Bit.Core.Utilities;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;

src/Core/Models/Business/BillingInfo.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Table;
 using Stripe;
 
 namespace Bit.Core.Models.Business

src/Core/Models/Business/ImportedGroup.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Models.Business
 {

src/Core/Models/Business/OrganizationLicense.cs

@@ -4,8 +4,8 @@ using System.Reflection;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Table;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Newtonsoft.Json;

src/Core/Models/Business/OrganizationSignup.cs

@@ -1,5 +1,5 @@
-using Bit.Core.Enums;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Models.Business
 {

src/Core/Models/Business/ReferenceEvent.cs

@@ -1,4 +1,5 @@
 using System;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;

src/Core/Models/Business/SubscriptionCreateOptions.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 using Stripe;
 
 namespace Bit.Core.Models.Business

src/Core/Models/Business/SubscriptionUpdate.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 using Stripe;
 
 namespace Bit.Core.Models.Business

src/Core/Models/Business/Tokenables/EmergencyAccessInviteTokenable.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Text.Json.Serialization;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Models.Business.Tokenables
 {

src/Core/Models/Business/Tokenables/HCaptchaTokenable.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Text.Json.Serialization;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 using Bit.Core.Tokens;
 
 namespace Bit.Core.Models.Business.Tokenables

src/Core/Models/Business/UserLicense.cs

@@ -4,7 +4,7 @@ using System.Reflection;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 using Bit.Core.Services;
 using Newtonsoft.Json;
 

src/Core/Models/Data/AttachmentResponseData.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Models.Data
 {

src/Core/Models/Data/CipherOrganizationDetails.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 
 namespace Core.Models.Data
 {

src/Core/Models/Data/CollectionDetails.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Models.Data
 {

src/Core/Models/Data/EmergencyAccessDetails.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Models.Data
 {

src/Core/Models/Data/EmergencyAccessNotify.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Table;
 using Newtonsoft.Json;
 
 namespace Bit.Core.Models.Data

src/Core/Models/Data/EmergencyAccessViewData.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 using Core.Models.Data;
 
 namespace Bit.Core.Models.Data

src/Core/Models/Data/GroupWithCollections.cs

@@ -1,5 +1,5 @@
 using System.Data;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Models.Data
 {

src/Core/Models/Data/OrganizationAbility.cs

@@ -1,5 +1,5 @@
 using System;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Models.Data
 {

src/Core/Models/Data/OrganizationUserResetPasswordDetails.cs

@@ -1,6 +1,6 @@
 using System;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Table;
 
 namespace Bit.Core.Models.Data
 {

src/Core/Models/Data/OrganizationUserWithCollections.cs

@@ -1,5 +1,5 @@
 using System.Data;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 
 namespace Bit.Core.Models.Data
 {

src/Core/Models/Data/Provider/ProviderAbility.cs

@@ -1,6 +1,5 @@
 using System;
-using Bit.Core.Models.Table;
-using Bit.Core.Models.Table.Provider;
+using Bit.Core.Entities.Provider;
 
 namespace Bit.Core.Models.Data
 {

src/Core/Models/EntityFramework/Cipher.cs

@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class Cipher : Table.Cipher
-    {
-        public virtual User User { get; set; }
-        public virtual Organization Organization { get; set; }
-        public virtual ICollection<CollectionCipher> CollectionCiphers { get; set; }
-    }
-
-    public class CipherMapperProfile : Profile
-    {
-        public CipherMapperProfile()
-        {
-            CreateMap<Table.Cipher, Cipher>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/Collection.cs

@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class Collection : Table.Collection
-    {
-        public virtual Organization Organization { get; set; }
-        public virtual ICollection<CollectionUser> CollectionUsers { get; set; }
-        public virtual ICollection<CollectionCipher> CollectionCiphers { get; set; }
-        public virtual ICollection<CollectionGroup> CollectionGroups { get; set; }
-    }
-
-    public class CollectionMapperProfile : Profile
-    {
-        public CollectionMapperProfile()
-        {
-            CreateMap<Table.Collection, Collection>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/CollectionCipher.cs

@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class CollectionCipher : Table.CollectionCipher
-    {
-        public virtual Cipher Cipher { get; set; }
-        public virtual Collection Collection { get; set; }
-    }
-
-    public class CollectionCipherMapperProfile : Profile
-    {
-        public CollectionCipherMapperProfile()
-        {
-            CreateMap<Table.CollectionCipher, CollectionCipher>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/CollectionGroup.cs

@@ -1,18 +0,0 @@
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class CollectionGroup : Table.CollectionGroup
-    {
-        public virtual Collection Collection { get; set; }
-        public virtual Group Group { get; set; }
-    }
-
-    public class CollectionGroupMapperProfile : Profile
-    {
-        public CollectionGroupMapperProfile()
-        {
-            CreateMap<Table.CollectionGroup, CollectionGroup>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/CollectionUser.cs

@@ -1,18 +0,0 @@
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class CollectionUser : Table.CollectionUser
-    {
-        public virtual Collection Collection { get; set; }
-        public virtual OrganizationUser OrganizationUser { get; set; }
-    }
-
-    public class CollectionUserMapperProfile : Profile
-    {
-        public CollectionUserMapperProfile()
-        {
-            CreateMap<Table.CollectionUser, CollectionUser>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/Device.cs

@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class Device : Table.Device
-    {
-        public virtual User User { get; set; }
-    }
-
-    public class DeviceMapperProfile : Profile
-    {
-        public DeviceMapperProfile()
-        {
-            CreateMap<Table.Device, Device>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/EmergencyAccess.cs

@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class EmergencyAccess : Table.EmergencyAccess
-    {
-        public virtual User Grantee { get; set; }
-        public virtual User Grantor { get; set; }
-    }
-
-    public class EmergencyAccessMapperProfile : Profile
-    {
-        public EmergencyAccessMapperProfile()
-        {
-            CreateMap<Table.EmergencyAccess, EmergencyAccess>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/Event.cs

@@ -1,16 +0,0 @@
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class Event : Table.Event
-    {
-    }
-
-    public class EventMapperProfile : Profile
-    {
-        public EventMapperProfile()
-        {
-            CreateMap<Table.Event, Event>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/Folder.cs

@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class Folder : Table.Folder
-    {
-        public virtual User User { get; set; }
-    }
-
-    public class FolderMapperProfile : Profile
-    {
-        public FolderMapperProfile()
-        {
-            CreateMap<Table.Folder, Folder>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/Grant.cs

@@ -1,18 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class Grant : Table.Grant
-    {
-    }
-
-    public class GrantMapperProfile : Profile
-    {
-        public GrantMapperProfile()
-        {
-            CreateMap<Table.Grant, Grant>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/Group.cs

@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class Group : Table.Group
-    {
-        public virtual Organization Organization { get; set; }
-        public virtual ICollection<GroupUser> GroupUsers { get; set; }
-    }
-
-    public class GroupMapperProfile : Profile
-    {
-        public GroupMapperProfile()
-        {
-            CreateMap<Table.Group, Group>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/GroupUser.cs

@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class GroupUser : Table.GroupUser
-    {
-        public virtual Group Group { get; set; }
-        public virtual OrganizationUser OrganizationUser { get; set; }
-    }
-
-    public class GroupUserMapperProfile : Profile
-    {
-        public GroupUserMapperProfile()
-        {
-            CreateMap<Table.GroupUser, GroupUser>().ReverseMap();
-        }
-    }
-}
-

src/Core/Models/EntityFramework/Installation.cs

@@ -1,18 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class Installation : Table.Installation
-    {
-    }
-
-    public class InstallationMapperProfile : Profile
-    {
-        public InstallationMapperProfile()
-        {
-            CreateMap<Table.Installation, Installation>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/Organization.cs

@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class Organization : Table.Organization
-    {
-        public virtual ICollection<Cipher> Ciphers { get; set; }
-        public virtual ICollection<OrganizationUser> OrganizationUsers { get; set; }
-        public virtual ICollection<Group> Groups { get; set; }
-        public virtual ICollection<Policy> Policies { get; set; }
-        public virtual ICollection<SsoConfig> SsoConfigs { get; set; }
-        public virtual ICollection<SsoUser> SsoUsers { get; set; }
-        public virtual ICollection<Transaction> Transactions { get; set; }
-    }
-
-    public class OrganizationMapperProfile : Profile
-    {
-        public OrganizationMapperProfile()
-        {
-            CreateMap<Table.Organization, Organization>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/OrganizationSponsorship.cs

@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class OrganizationSponsorship : Table.OrganizationSponsorship
-    {
-        public virtual Installation Installation { get; set; }
-        public virtual Organization SponsoringOrganization { get; set; }
-        public virtual Organization SponsoredOrganization { get; set; }
-    }
-
-    public class OrganizationSponsorshipMapperProfile : Profile
-    {
-        public OrganizationSponsorshipMapperProfile()
-        {
-            CreateMap<Table.OrganizationSponsorship, OrganizationSponsorship>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/OrganizationUser.cs

@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class OrganizationUser : Table.OrganizationUser
-    {
-        public virtual Organization Organization { get; set; }
-        public virtual User User { get; set; }
-        public virtual ICollection<CollectionUser> CollectionUsers { get; set; }
-    }
-
-    public class OrganizationUserMapperProfile : Profile
-    {
-        public OrganizationUserMapperProfile()
-        {
-            CreateMap<Table.OrganizationUser, OrganizationUser>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/Policy.cs

@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class Policy : Table.Policy
-    {
-        public virtual Organization Organization { get; set; }
-    }
-
-    public class PolicyMapperProfile : Profile
-    {
-        public PolicyMapperProfile()
-        {
-            CreateMap<Table.Policy, Policy>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/Provider/Provider.cs

@@ -1,16 +0,0 @@
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework.Provider
-{
-    public class Provider : Table.Provider.Provider
-    {
-    }
-
-    public class ProviderMapperProfile : Profile
-    {
-        public ProviderMapperProfile()
-        {
-            CreateMap<Table.Provider.Provider, Provider>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/Provider/ProviderOrganization.cs

@@ -1,18 +0,0 @@
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework.Provider
-{
-    public class ProviderOrganization : Table.Provider.ProviderOrganization
-    {
-        public virtual Provider Provider { get; set; }
-        public virtual Organization Organization { get; set; }
-    }
-
-    public class ProviderOrganizationMapperProfile : Profile
-    {
-        public ProviderOrganizationMapperProfile()
-        {
-            CreateMap<Table.Provider.ProviderOrganization, ProviderOrganization>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/Provider/ProviderUser.cs

@@ -1,18 +0,0 @@
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework.Provider
-{
-    public class ProviderUser : Table.Provider.ProviderUser
-    {
-        public virtual User User { get; set; }
-        public virtual Provider Provider { get; set; }
-    }
-
-    public class ProviderUserMapperProfile : Profile
-    {
-        public ProviderUserMapperProfile()
-        {
-            CreateMap<Table.Provider.ProviderUser, ProviderUser>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/Role.cs

@@ -1,18 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class Role : Table.Role
-    {
-    }
-
-    public class RoleMapperProfile : Profile
-    {
-        public RoleMapperProfile()
-        {
-            CreateMap<Table.Role, Role>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/Send.cs

@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class Send : Table.Send
-    {
-        public virtual Organization Organization { get; set; }
-        public virtual User User { get; set; }
-    }
-
-    public class SendMapperProfile : Profile
-    {
-        public SendMapperProfile()
-        {
-            CreateMap<Table.Send, Send>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/SsoConfig.cs

@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class SsoConfig : Table.SsoConfig
-    {
-        public virtual Organization Organization { get; set; }
-    }
-
-    public class SsoConfigMapperProfile : Profile
-    {
-        public SsoConfigMapperProfile()
-        {
-            CreateMap<Table.SsoConfig, SsoConfig>().ReverseMap();
-        }
-    }
-}

src/Core/Models/EntityFramework/SsoUser.cs

@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using System.Text.Json;
-using AutoMapper;
-
-namespace Bit.Core.Models.EntityFramework
-{
-    public class SsoUser : Table.SsoUser
-    {
-        public virtual Organization Organization { get; set; }
-        public virtual User User { get; set; }
-    }
-
-    public class SsoUserMapperProfile : Profile
-    {
-        public SsoUserMapperProfile()
-        {
-            CreateMap<Table.SsoUser, SsoUser>().ReverseMap();
-        }
-    }
-}