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

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
 {

src/Api/Models/Response/TwoFactor/TwoFactorEmailResponseModel.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.TwoFactor
 {

src/Api/Models/Response/TwoFactor/TwoFactorProviderResponseModel.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
 {

src/Api/Models/Response/TwoFactor/TwoFactorRecoverResponseModel.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.TwoFactor
 {

src/Api/Models/Response/TwoFactor/TwoFactorWebAuthnResponseModel.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;
 using Bit.Core.Models.Api;
-using Bit.Core.Models.Table;
 
 namespace Bit.Api.Models.Response.TwoFactor
 {

src/Api/Models/Response/TwoFactor/TwoFactorYubiKeyResponseModel.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.TwoFactor
 {

src/Api/Startup.cs

@@ -17,6 +17,7 @@ using Microsoft.IdentityModel.Logging;
 using Microsoft.Extensions.Hosting;
 using Microsoft.OpenApi.Models;
 using System.Collections.Generic;
+using Bit.SharedWeb.Utilities;
 
 #if !OSS
 using Bit.CommCore.Utilities;

src/Billing/Billing.csproj

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

src/Billing/Controllers/BitPayController.cs

@@ -4,6 +4,7 @@ using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using Bit.Billing.Models;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
@@ -109,7 +110,7 @@ namespace Bit.Billing.Controllers
 
             try
             {
-                var tx = new Core.Models.Table.Transaction
+                var tx = new Transaction
                 {
                     Amount = Convert.ToDecimal(invoice.Price),
                     CreationDate = GetTransactionDate(invoice),

src/Billing/Controllers/PayPalController.cs

@@ -3,8 +3,8 @@ using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 using Bit.Billing.Utilities;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Utilities;