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

bitwarden-server.sln

@@ -76,6 +76,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostgresMigrations", "util\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "test\Common\Common.csproj", "{17DA09D7-0212-4009-879E-6B9CFDE5FA60}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Infrastructure.Dapper", "src\Infrastructure.Dapper\Infrastructure.Dapper.csproj", "{AD933445-27CE-4D30-A6ED-9065309464AD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedWeb", "src\SharedWeb\SharedWeb.csproj", "{713D44C0-1BC1-4024-96A3-A98A49F33908}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Infrastructure.EntityFramework", "src\Infrastructure.EntityFramework\Infrastructure.EntityFramework.csproj", "{ED880735-0250-43C7-9662-FDC7C7416E7F}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Billing.Test", "test\Billing.Test\Billing.Test.csproj", "{B8639B10-2157-44BC-8CE1-D9EB4B50971F}"
 EndProject
 Global
@@ -174,6 +179,18 @@ Global
 		{17DA09D7-0212-4009-879E-6B9CFDE5FA60}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{17DA09D7-0212-4009-879E-6B9CFDE5FA60}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{17DA09D7-0212-4009-879E-6B9CFDE5FA60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD933445-27CE-4D30-A6ED-9065309464AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD933445-27CE-4D30-A6ED-9065309464AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD933445-27CE-4D30-A6ED-9065309464AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD933445-27CE-4D30-A6ED-9065309464AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{713D44C0-1BC1-4024-96A3-A98A49F33908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{713D44C0-1BC1-4024-96A3-A98A49F33908}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{713D44C0-1BC1-4024-96A3-A98A49F33908}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{713D44C0-1BC1-4024-96A3-A98A49F33908}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED880735-0250-43C7-9662-FDC7C7416E7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED880735-0250-43C7-9662-FDC7C7416E7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED880735-0250-43C7-9662-FDC7C7416E7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED880735-0250-43C7-9662-FDC7C7416E7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B8639B10-2157-44BC-8CE1-D9EB4B50971F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B8639B10-2157-44BC-8CE1-D9EB4B50971F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B8639B10-2157-44BC-8CE1-D9EB4B50971F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -205,6 +222,9 @@ Global
 		{EDC0D688-D58C-4CE1-AA07-3606AC6874B8} = {4FDB6543-F68B-4202-9EA6-7FEA984D2D0A}
 		{0E99A21B-684B-4C59-9831-90F775CAB6F7} = {287CFF34-BBDB-4BC4-AF88-1E19A5A4679B}
 		{17DA09D7-0212-4009-879E-6B9CFDE5FA60} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84F}
+		{AD933445-27CE-4D30-A6ED-9065309464AD} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}
+		{713D44C0-1BC1-4024-96A3-A98A49F33908} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}
+		{ED880735-0250-43C7-9662-FDC7C7416E7F} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}
 		{B8639B10-2157-44BC-8CE1-D9EB4B50971F} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

bitwarden_license/src/CommCore/Services/ProviderService.cs

@@ -3,14 +3,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Bit.Core.Context;
+using Bit.Core.Entities;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Business.Provider;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
-using Bit.Core.Models.Table.Provider;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

bitwarden_license/src/Sso/Controllers/AccountController.cs

@@ -4,11 +4,11 @@ using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Bit.Core;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 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;

bitwarden_license/src/Sso/Sso.csproj

@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Core\Core.csproj" />
+    <ProjectReference Include="..\..\..\src\SharedWeb\SharedWeb.csproj" />
   </ItemGroup>
 
 </Project>

bitwarden_license/src/Sso/Startup.cs

@@ -3,6 +3,7 @@ using Bit.Core;
 using Bit.Core.Context;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
+using Bit.SharedWeb.Utilities;
 using Bit.Sso.Utilities;
 using IdentityServer4.Extensions;
 using Microsoft.AspNetCore.Builder;

bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs

@@ -5,9 +5,9 @@ using System.Security.Cryptography.X509Certificates;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;

bitwarden_license/src/Sso/Utilities/ServiceCollectionExtensions.cs

@@ -4,6 +4,7 @@ using Bit.Core.Business.Sso;
 using Bit.Core.IdentityServer;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
+using Bit.SharedWeb.Utilities;
 using Bit.Sso.Models;
 using IdentityServer4.Models;
 using IdentityServer4.ResponseHandling;

bitwarden_license/test/CmmCore.Test/AutoFixture/ProviderUserFixtures.cs

@@ -18,7 +18,7 @@ namespace Bit.CommCore.Test.AutoFixture.ProviderUserFixtures
 
         public void Customize(IFixture fixture)
         {
-            fixture.Customize<Core.Models.Table.Provider.ProviderUser>(composer => composer
+            fixture.Customize<Core.Entities.Provider.ProviderUser>(composer => composer
                 .With(o => o.Type, Type)
                 .With(o => o.Status, Status));
         }

bitwarden_license/test/CmmCore.Test/Services/ProviderServiceTests.cs

@@ -5,13 +5,13 @@ using System.Threading.Tasks;
 using Bit.CommCore.Services;
 using Bit.CommCore.Test.AutoFixture.ProviderUserFixtures;
 using Bit.Core.Context;
+using Bit.Core.Entities;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Enums;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Business.Provider;
-using Bit.Core.Models.Table;
-using Bit.Core.Models.Table.Provider;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.DataProtection;
 using NSubstitute;
 using NSubstitute.ReturnsExtensions;
 using Xunit;
-using ProviderUser = Bit.Core.Models.Table.Provider.ProviderUser;
+using ProviderUser = Bit.Core.Entities.Provider.ProviderUser;
 
 namespace Bit.CommCore.Test.Services
 {

src/Admin/Admin.csproj

@@ -5,6 +5,7 @@
   </PropertyGroup>
   
   <ItemGroup>
+    <ProjectReference Include="..\SharedWeb\SharedWeb.csproj" />
     <ProjectReference Include="..\..\util\Migrator\Migrator.csproj" />
     <ProjectReference Include="..\Core\Core.csproj" />
   </ItemGroup>

src/Admin/Controllers/OrganizationsController.cs

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

src/Admin/Controllers/ProvidersController.cs

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

src/Admin/Controllers/ToolsController.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Bit.Admin.Models;
 using Bit.Core;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Admin/Controllers/UsersController.cs

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

src/Admin/Models/CreateUpdateTransactionModel.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Table;
 
 namespace Bit.Admin.Models
 {

src/Admin/Models/OrganizationEditModel.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 

src/Admin/Models/OrganizationViewModel.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 
 namespace Bit.Admin.Models
 {

src/Admin/Models/OrganizationsModel.cs

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

src/Admin/Models/ProviderEditModel.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table.Provider;
 
 namespace Bit.Admin.Models
 {

src/Admin/Models/ProviderViewModel.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table.Provider;
 
 namespace Bit.Admin.Models
 {

src/Admin/Models/ProvidersModel.cs

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

src/Admin/Models/TaxRatesModel.cs

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

src/Admin/Models/UserEditModel.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities;
 using Bit.Core.Models.Business;
-using Bit.Core.Models.Table;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 

src/Admin/Models/UserViewModel.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 
 namespace Bit.Admin.Models
 {

src/Admin/Models/UsersModel.cs

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

src/Admin/Startup.cs

@@ -4,6 +4,7 @@ using Bit.Core.Context;
 using Bit.Core.Identity;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
+using Bit.SharedWeb.Utilities;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;

src/Admin/Views/Tools/TaxRate.cshtml

@@ -1,5 +1,3 @@
-@using Bit.Core.Models.Table
-
 @model TaxRatesModel
 @{
     ViewData["Title"] = "Tax Rates";

src/Api/Api.csproj

@@ -16,6 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\SharedWeb\SharedWeb.csproj" />
     <ProjectReference Include="..\Core\Core.csproj" />
   </ItemGroup>
 

src/Api/Controllers/AccountsController.cs

@@ -7,12 +7,12 @@ using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Response;
 using Bit.Api.Utilities;
 using Bit.Core;
+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.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Api/Controllers/CiphersController.cs

@@ -10,9 +10,9 @@ using Bit.Api.Models.Response;
 using Bit.Api.Utilities;
 using Bit.Core;
 using Bit.Core.Context;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Api/Controllers/CollectionsController.cs

@@ -5,8 +5,8 @@ using System.Threading.Tasks;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
 using Bit.Core.Context;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Microsoft.AspNetCore.Authorization;

src/Api/Controllers/DevicesController.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Microsoft.AspNetCore.Authorization;

src/Api/Controllers/EmergencyAccessController.cs

@@ -4,8 +4,8 @@ using System.Threading.Tasks;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Api/Controllers/OrganizationSponsorshipsController.cs

@@ -2,8 +2,8 @@
 using System.Threading.Tasks;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Core.Context;
+using Bit.Core.Entities;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Utilities;

src/Api/Controllers/SendsController.cs

@@ -8,10 +8,10 @@ using Bit.Api.Models.Response;
 using Bit.Api.Utilities;
 using Bit.Core;
 using Bit.Core.Context;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Api/Controllers/SyncController.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Bit.Api.Models.Response;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Api/Controllers/TwoFactorController.cs

@@ -6,9 +6,9 @@ using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Response;
 using Bit.Api.Models.Response.TwoFactor;
 using Bit.Core.Context;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Api/Models/Public/MemberBaseModel.cs

@@ -1,8 +1,8 @@
 using System;
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Public
 {

src/Api/Models/Public/Request/CollectionUpdateRequestModel.cs

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

src/Api/Models/Public/Request/GroupCreateUpdateRequestModel.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 
 namespace Bit.Api.Models.Public.Request
 {

src/Api/Models/Public/Request/MemberCreateRequestModel.cs

@@ -1,6 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
 namespace Bit.Api.Models.Public.Request

src/Api/Models/Public/Request/MemberUpdateRequestModel.cs

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

src/Api/Models/Public/Request/OrganizationImportRequestModel.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities;
 using Bit.Core.Models.Business;
-using Table = Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Public.Request
 {
@@ -51,7 +51,7 @@ namespace Bit.Api.Models.Public.Request
             {
                 var importedGroup = new ImportedGroup
                 {
-                    Group = new Table.Group
+                    Group = new Group
                     {
                         OrganizationId = organizationId,
                         Name = Name,

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

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

src/Api/Models/Public/Response/CollectionResponseModel.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Public.Response
 {

src/Api/Models/Public/Response/GroupResponseModel.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Public.Response
 {

src/Api/Models/Public/Response/MemberResponseModel.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Public.Response
 {

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

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Table;
 using Newtonsoft.Json;
 
 namespace Bit.Api.Models.Public.Response

src/Api/Models/Request/Accounts/KeysRequestModel.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 
 namespace Bit.Api.Models.Request.Accounts
 {

src/Api/Models/Request/Accounts/RegisterRequestModel.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
-using Bit.Core.Models.Table;
 using Bit.Core.Utilities;
 using Newtonsoft.Json;
 

src/Api/Models/Request/Accounts/SetKeyConnectorKeyRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Request.Accounts
 {

src/Api/Models/Request/Accounts/SetPasswordRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Request.Accounts
 {

src/Api/Models/Request/Accounts/UpdateProfileRequestModel.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 
 namespace Bit.Api.Models.Request.Accounts
 {

src/Api/Models/Request/CipherRequestModel.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Utilities;
 using Core.Models.Data;
 using Newtonsoft.Json;

src/Api/Models/Request/CollectionRequestModel.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
 namespace Bit.Api.Models.Request

src/Api/Models/Request/DeviceRequestModels.cs

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

src/Api/Models/Request/EmergencyAccessRequstModels.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Table;
 using Bit.Core.Utilities;
 
 namespace Bit.Api.Models.Request

src/Api/Models/Request/FolderRequestModel.cs

@@ -1,6 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
 namespace Bit.Api.Models.Request

src/Api/Models/Request/GroupRequestModel.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 
 namespace Bit.Api.Models.Request
 {

src/Api/Models/Request/InstallationRequestModel.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Models.Table;
+using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
 namespace Bit.Api.Models.Request

src/Api/Models/Request/Organizations/ImportOrganizationUsersRequestModel.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Models.Business;
-using Table = Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Request.Organizations
 {
@@ -27,7 +26,7 @@ namespace Bit.Api.Models.Request.Organizations
             {
                 var importedGroup = new ImportedGroup
                 {
-                    Group = new Table.Group
+                    Group = new Core.Entities.Group
                     {
                         OrganizationId = organizationId,
                         Name = Name,

src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;
-using Bit.Core.Models.Table;
 using Bit.Core.Utilities;
 
 namespace Bit.Api.Models.Request.Organizations

src/Api/Models/Request/Organizations/OrganizationKeysRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities;
 using Bit.Core.Models.Business;
-using Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Request.Organizations
 {

src/Api/Models/Request/Organizations/OrganizationSsoRequestModel.cs

@@ -4,9 +4,9 @@ using System.ComponentModel.DataAnnotations;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text.RegularExpressions;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Services;
 using Bit.Core.Sso;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;

src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Settings;
 
 namespace Bit.Api.Models.Request.Organizations

src/Api/Models/Request/Organizations/OrganizationUserRequestModels.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text.Json;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Utilities;
 
 namespace Bit.Api.Models.Request.Organizations

src/Api/Models/Request/PolicyRequestModel.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Request
 {

src/Api/Models/Request/Providers/ProviderSetupRequestModel.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Models.Table.Provider;
+using Bit.Core.Entities.Provider;
 
 namespace Bit.Api.Models.Request.Providers
 {

src/Api/Models/Request/Providers/ProviderUpdateRequestModel.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Models.Table.Provider;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Settings;
 
 namespace Bit.Api.Models.Request.Providers

src/Api/Models/Request/Providers/ProviderUserRequestModels.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Enums.Provider;
-using Bit.Core.Models.Table.Provider;
 using Bit.Core.Utilities;
 
 namespace Bit.Api.Models.Request.Providers

src/Api/Models/Request/SendRequestModel.cs

@@ -1,9 +1,9 @@
 using System;
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Newtonsoft.Json;

src/Api/Models/Request/TwoFactorRequestModels.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Bit.Api.Models.Request.Accounts;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
-using Bit.Core.Models.Table;
 using Fido2NetLib;
 
 namespace Bit.Api.Models.Request

src/Api/Models/Request/UpdateDomainsRequestModel.cs

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

src/Api/Models/Response/ApiKeyResponseModel.cs

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

src/Api/Models/Response/AttachmentResponseModel.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 

src/Api/Models/Response/CipherResponseModel.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Settings;
 using Core.Models.Data;
 using Newtonsoft.Json;

src/Api/Models/Response/CollectionResponseModel.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Response
 {

src/Api/Models/Response/DeviceResponseModel.cs

@@ -1,7 +1,7 @@
 using System;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
-using Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Response
 {

src/Api/Models/Response/DomainsResponseModel.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
-using Bit.Core.Models.Table;
 using Newtonsoft.Json;
 
 namespace Bit.Api.Models.Response

src/Api/Models/Response/EmergencyAccessResponseModel.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Settings;
 using Core.Models.Data;
 

src/Api/Models/Response/FolderResponseModel.cs

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

src/Api/Models/Response/GroupResponseModel.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Response
 {

src/Api/Models/Response/InstallationResponseModel.cs

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

src/Api/Models/Response/KeysResponseModel.cs

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

src/Api/Models/Response/OrganizationKeysResponseModel.cs

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

src/Api/Models/Response/OrganizationResponseModel.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Business;
-using Bit.Core.Models.Table;
 using Bit.Core.Utilities;
 
 namespace Bit.Api.Models.Response

src/Api/Models/Response/OrganizationSsoResponseModel.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Models.Api;
+using Bit.Core.Entities;
+using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Settings;
 
 namespace Bit.Api.Models.Response

src/Api/Models/Response/OrganizationUserResponseModel.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Utilities;
 
 namespace Bit.Api.Models.Response

src/Api/Models/Response/PolicyResponseModel.cs

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

src/Api/Models/Response/ProfileResponseModel.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using Bit.Api.Models.Response.Providers;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Response
 {

src/Api/Models/Response/Providers/ProviderOrganizationResponseModel.cs

@@ -1,7 +1,7 @@
 using System;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table.Provider;
 
 namespace Bit.Api.Models.Response.Providers
 {

src/Api/Models/Response/Providers/ProviderResponseModel.cs

@@ -1,6 +1,6 @@
 using System;
+using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Api;
-using Bit.Core.Models.Table.Provider;
 
 namespace Bit.Api.Models.Response.Providers
 {

src/Api/Models/Response/Providers/ProviderUserResponseModel.cs

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

src/Api/Models/Response/SendAccessResponseModel.cs

@@ -1,8 +1,8 @@
 using System;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Newtonsoft.Json;

src/Api/Models/Response/SendResponseModel.cs

@@ -1,8 +1,8 @@
 using System;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Newtonsoft.Json;

src/Api/Models/Response/SubscriptionResponseModel.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Business;
-using Bit.Core.Models.Table;
 using Bit.Core.Utilities;
 
 namespace Bit.Api.Models.Response

src/Api/Models/Response/SyncResponseModel.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Bit.Core.Entities;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
-using Bit.Core.Models.Table;
 using Bit.Core.Settings;
 using Core.Models.Data;
 

src/Api/Models/Response/TaxRateResponseModel.cs

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

src/Api/Models/Response/TwoFactor/TwoFactorAuthenticatorResponseModel.cs

@@ -1,7 +1,7 @@
 using System;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
-using Bit.Core.Models.Table;
 using OtpNet;
 
 namespace Bit.Api.Models.Response.TwoFactor

src/Api/Models/Response/TwoFactor/TwoFactorDuoResponseModel.cs

@@ -1,8 +1,8 @@
 using System;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.Models.Api;
-using Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Response.TwoFactor
 {