From bd0c960e9f27ce3158e6439eff17dfdf3d442d72 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 8 Mar 2017 21:45:08 -0500 Subject: [PATCH] move domains to Models.Table --- src/Api/Controllers/AccountsController.cs | 2 +- src/Api/Controllers/DevicesController.cs | 2 +- src/Api/Controllers/FoldersController.cs | 2 +- src/Api/Controllers/LoginsController.cs | 2 +- src/Api/IdentityServer/PersistedGrantStore.cs | 2 +- src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs | 2 +- src/Api/Models/FolderDataModel.cs | 2 +- src/Api/Models/LoginDataModel.cs | 2 +- src/Api/Models/Request/Accounts/KeysRequestModel.cs | 2 +- src/Api/Models/Request/Accounts/RegisterRequestModel.cs | 2 +- src/Api/Models/Request/Accounts/UpdateProfileRequestModel.cs | 2 +- src/Api/Models/Request/CipherRequestModel.cs | 2 +- src/Api/Models/Request/DeviceRequestModels.cs | 2 +- src/Api/Models/Request/FolderRequestModel.cs | 2 +- src/Api/Models/Request/LoginRequestModel.cs | 2 +- .../Request/Organizations/OrganizationCreateRequestModel.cs | 2 +- .../Request/Organizations/OrganizationUpdateRequestModel.cs | 2 +- .../Organizations/OrganizationUserCreateRequestModels.cs | 2 +- src/Api/Models/Request/SubvaultRequestModel.cs | 2 +- src/Api/Models/Request/UpdateDomainsRequestModel.cs | 2 +- src/Api/Models/Response/AuthTokenResponseModel.cs | 2 +- src/Api/Models/Response/CipherHistoryResponseModel.cs | 2 +- src/Api/Models/Response/CipherResponseModel.cs | 2 +- src/Api/Models/Response/DeviceResponseModel.cs | 2 +- src/Api/Models/Response/DomainsResponseModel.cs | 2 +- src/Api/Models/Response/FolderResponseModel.cs | 2 +- src/Api/Models/Response/KeysResponseModel.cs | 2 +- src/Api/Models/Response/LoginResponseModel.cs | 2 +- src/Api/Models/Response/OrganizationResponseModel.cs | 2 +- src/Api/Models/Response/ProfileResponseModel.cs | 2 +- src/Api/Models/Response/SubvaultResponseModel.cs | 2 +- src/Api/Models/Response/TwoFactorResponseModel.cs | 2 +- src/Api/Models/Response/UserKeyResponseModel.cs | 2 +- src/Api/Startup.cs | 2 +- src/Core/CurrentContext.cs | 2 +- src/Core/Identity/AuthenticatorTokenProvider.cs | 2 +- .../Identity/JwtBearerIdentityServiceCollectionExtensions.cs | 2 +- src/Core/Identity/JwtBearerSignInManager.cs | 2 +- src/Core/Identity/JwtBearerSignInResult.cs | 2 +- src/Core/Identity/RoleStore.cs | 2 +- src/Core/Identity/UserStore.cs | 2 +- src/Core/Models/Business/OrganizationSignup.cs | 2 +- src/Core/{Domains => Models/Table}/Cipher.cs | 2 +- src/Core/{Domains => Models/Table}/Device.cs | 2 +- src/Core/{Domains => Models/Table}/Grant.cs | 2 +- src/Core/{Domains => Models/Table}/Organization.cs | 2 +- src/Core/{Domains => Models/Table}/OrganizationUser.cs | 2 +- src/Core/{Domains => Models/Table}/Role.cs | 2 +- src/Core/{Domains => Models/Table}/Subvault.cs | 2 +- src/Core/{Domains => Models/Table}/SubvaultUser.cs | 2 +- src/Core/{Domains => Models/Table}/User.cs | 2 +- src/Core/Repositories/ICipherRepository.cs | 2 +- src/Core/Repositories/IDeviceRepository.cs | 2 +- src/Core/Repositories/IGrantRepository.cs | 2 +- src/Core/Repositories/IOrganizationRepository.cs | 2 +- src/Core/Repositories/IOrganizationUserRepository.cs | 2 +- src/Core/Repositories/ISubvaultRepository.cs | 2 +- src/Core/Repositories/ISubvaultUserRepository.cs | 2 +- src/Core/Repositories/IUserRepository.cs | 2 +- src/Core/Repositories/SqlServer/CipherRepository.cs | 2 +- src/Core/Repositories/SqlServer/DeviceRepository.cs | 2 +- src/Core/Repositories/SqlServer/GrantRepository.cs | 2 +- src/Core/Repositories/SqlServer/OrganizationRepository.cs | 2 +- src/Core/Repositories/SqlServer/OrganizationUserRepository.cs | 2 +- src/Core/Repositories/SqlServer/SubvaultRepository.cs | 2 +- src/Core/Repositories/SqlServer/SubvaultUserRepository.cs | 2 +- src/Core/Repositories/SqlServer/UserRepository.cs | 2 +- src/Core/Services/ICipherService.cs | 2 +- src/Core/Services/IDeviceService.cs | 2 +- src/Core/Services/IMailService.cs | 2 +- src/Core/Services/IOrganizationService.cs | 2 +- src/Core/Services/IPushService.cs | 2 +- src/Core/Services/IUserService.cs | 2 +- src/Core/Services/Implementations/CipherService.cs | 2 +- src/Core/Services/Implementations/DeviceService.cs | 2 +- src/Core/Services/Implementations/NoopMailService.cs | 2 +- src/Core/Services/Implementations/NoopPushService.cs | 2 +- src/Core/Services/Implementations/OrganizationService.cs | 2 +- src/Core/Services/Implementations/PushSharpPushService.cs | 2 +- src/Core/Services/Implementations/SendGridMailService.cs | 2 +- src/Core/Services/Implementations/UserService.cs | 2 +- 81 files changed, 81 insertions(+), 81 deletions(-) rename src/Core/{Domains => Models/Table}/Cipher.cs (95%) rename src/Core/{Domains => Models/Table}/Device.cs (95%) rename src/Core/{Domains => Models/Table}/Grant.cs (92%) rename src/Core/{Domains => Models/Table}/Organization.cs (96%) rename src/Core/{Domains => Models/Table}/OrganizationUser.cs (95%) rename src/Core/{Domains => Models/Table}/Role.cs (85%) rename src/Core/{Domains => Models/Table}/Subvault.cs (93%) rename src/Core/{Domains => Models/Table}/SubvaultUser.cs (94%) rename src/Core/{Domains => Models/Table}/User.cs (97%) diff --git a/src/Api/Controllers/AccountsController.cs b/src/Api/Controllers/AccountsController.cs index 034969579d..302d7819ac 100644 --- a/src/Api/Controllers/AccountsController.cs +++ b/src/Api/Controllers/AccountsController.cs @@ -6,7 +6,7 @@ using Bit.Api.Models; using Bit.Core.Exceptions; using Bit.Core.Services; using Microsoft.AspNetCore.Identity; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Enums; using System.Linq; using Bit.Core.Repositories; diff --git a/src/Api/Controllers/DevicesController.cs b/src/Api/Controllers/DevicesController.cs index c52c781ee2..01eab67d58 100644 --- a/src/Api/Controllers/DevicesController.cs +++ b/src/Api/Controllers/DevicesController.cs @@ -7,7 +7,7 @@ using Bit.Core.Repositories; using Microsoft.AspNetCore.Authorization; using Bit.Api.Models; using Bit.Core.Exceptions; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Microsoft.AspNetCore.Identity; using Bit.Core.Services; diff --git a/src/Api/Controllers/FoldersController.cs b/src/Api/Controllers/FoldersController.cs index d95bef2fe1..d8290223c0 100644 --- a/src/Api/Controllers/FoldersController.cs +++ b/src/Api/Controllers/FoldersController.cs @@ -7,7 +7,7 @@ using Bit.Core.Repositories; using Microsoft.AspNetCore.Authorization; using Bit.Api.Models; using Bit.Core.Exceptions; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Microsoft.AspNetCore.Identity; using Bit.Core.Services; diff --git a/src/Api/Controllers/LoginsController.cs b/src/Api/Controllers/LoginsController.cs index 5063a89d26..3419835a80 100644 --- a/src/Api/Controllers/LoginsController.cs +++ b/src/Api/Controllers/LoginsController.cs @@ -7,7 +7,7 @@ using Bit.Core.Repositories; using Microsoft.AspNetCore.Authorization; using Bit.Api.Models; using Bit.Core.Exceptions; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Services; namespace Bit.Api.Controllers diff --git a/src/Api/IdentityServer/PersistedGrantStore.cs b/src/Api/IdentityServer/PersistedGrantStore.cs index 2ce3e1ec7b..7b2947d88a 100644 --- a/src/Api/IdentityServer/PersistedGrantStore.cs +++ b/src/Api/IdentityServer/PersistedGrantStore.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Repositories; using IdentityServer4.Models; using IdentityServer4.Stores; diff --git a/src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs b/src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs index 6e0d1d3c0b..b54bf14094 100644 --- a/src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs +++ b/src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs @@ -1,5 +1,5 @@ using Bit.Api.Models.Response; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Enums; using Bit.Core.Identity; using Bit.Core.Repositories; diff --git a/src/Api/Models/FolderDataModel.cs b/src/Api/Models/FolderDataModel.cs index 429bf22eb9..b31ea95555 100644 --- a/src/Api/Models/FolderDataModel.cs +++ b/src/Api/Models/FolderDataModel.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Newtonsoft.Json; namespace Bit.Api.Models diff --git a/src/Api/Models/LoginDataModel.cs b/src/Api/Models/LoginDataModel.cs index ea79c1ea9c..48cec1303e 100644 --- a/src/Api/Models/LoginDataModel.cs +++ b/src/Api/Models/LoginDataModel.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Newtonsoft.Json; namespace Bit.Api.Models diff --git a/src/Api/Models/Request/Accounts/KeysRequestModel.cs b/src/Api/Models/Request/Accounts/KeysRequestModel.cs index 2ab8a5a788..d470be55fb 100644 --- a/src/Api/Models/Request/Accounts/KeysRequestModel.cs +++ b/src/Api/Models/Request/Accounts/KeysRequestModel.cs @@ -1,4 +1,4 @@ -using Bit.Core.Domains; +using Bit.Core.Models.Table; using System.ComponentModel.DataAnnotations; namespace Bit.Api.Models diff --git a/src/Api/Models/Request/Accounts/RegisterRequestModel.cs b/src/Api/Models/Request/Accounts/RegisterRequestModel.cs index 8b5dc3fced..f7eb9d9cc5 100644 --- a/src/Api/Models/Request/Accounts/RegisterRequestModel.cs +++ b/src/Api/Models/Request/Accounts/RegisterRequestModel.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Api.Models { diff --git a/src/Api/Models/Request/Accounts/UpdateProfileRequestModel.cs b/src/Api/Models/Request/Accounts/UpdateProfileRequestModel.cs index f7cfee0e22..ab4692bf15 100644 --- a/src/Api/Models/Request/Accounts/UpdateProfileRequestModel.cs +++ b/src/Api/Models/Request/Accounts/UpdateProfileRequestModel.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Api.Models { diff --git a/src/Api/Models/Request/CipherRequestModel.cs b/src/Api/Models/Request/CipherRequestModel.cs index 111def53bc..91477cea76 100644 --- a/src/Api/Models/Request/CipherRequestModel.cs +++ b/src/Api/Models/Request/CipherRequestModel.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; using Bit.Api.Utilities; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Enums; using Newtonsoft.Json; diff --git a/src/Api/Models/Request/DeviceRequestModels.cs b/src/Api/Models/Request/DeviceRequestModels.cs index 0d27f3b997..66ae2566c2 100644 --- a/src/Api/Models/Request/DeviceRequestModels.cs +++ b/src/Api/Models/Request/DeviceRequestModels.cs @@ -1,6 +1,6 @@ using System; using System.ComponentModel.DataAnnotations; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Enums; using Newtonsoft.Json; diff --git a/src/Api/Models/Request/FolderRequestModel.cs b/src/Api/Models/Request/FolderRequestModel.cs index 73a072740f..c76d3a2d4e 100644 --- a/src/Api/Models/Request/FolderRequestModel.cs +++ b/src/Api/Models/Request/FolderRequestModel.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; using Bit.Api.Utilities; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Newtonsoft.Json; namespace Bit.Api.Models diff --git a/src/Api/Models/Request/LoginRequestModel.cs b/src/Api/Models/Request/LoginRequestModel.cs index 219fc4dac4..c78e1b684a 100644 --- a/src/Api/Models/Request/LoginRequestModel.cs +++ b/src/Api/Models/Request/LoginRequestModel.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; using Bit.Api.Utilities; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Newtonsoft.Json; namespace Bit.Api.Models diff --git a/src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs b/src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs index d81dc6969e..225f3a8b06 100644 --- a/src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs +++ b/src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs @@ -1,4 +1,4 @@ -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Enums; using Bit.Core.Models.Business; using System; diff --git a/src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs b/src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs index 32b9724610..7fd43f4d6d 100644 --- a/src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs +++ b/src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs @@ -1,4 +1,4 @@ -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Api.Models { diff --git a/src/Api/Models/Request/Organizations/OrganizationUserCreateRequestModels.cs b/src/Api/Models/Request/Organizations/OrganizationUserCreateRequestModels.cs index 1f6d2fcede..997d74c8f5 100644 --- a/src/Api/Models/Request/Organizations/OrganizationUserCreateRequestModels.cs +++ b/src/Api/Models/Request/Organizations/OrganizationUserCreateRequestModels.cs @@ -1,4 +1,4 @@ -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Api.Models { diff --git a/src/Api/Models/Request/SubvaultRequestModel.cs b/src/Api/Models/Request/SubvaultRequestModel.cs index 6e9bd45a3a..294998a20e 100644 --- a/src/Api/Models/Request/SubvaultRequestModel.cs +++ b/src/Api/Models/Request/SubvaultRequestModel.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; using Bit.Api.Utilities; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Newtonsoft.Json; namespace Bit.Api.Models diff --git a/src/Api/Models/Request/UpdateDomainsRequestModel.cs b/src/Api/Models/Request/UpdateDomainsRequestModel.cs index 68f19c6d26..3d2b75a497 100644 --- a/src/Api/Models/Request/UpdateDomainsRequestModel.cs +++ b/src/Api/Models/Request/UpdateDomainsRequestModel.cs @@ -1,4 +1,4 @@ -using Bit.Core.Domains; +using Bit.Core.Models.Table; using System.Collections.Generic; using Bit.Core.Enums; using Newtonsoft.Json; diff --git a/src/Api/Models/Response/AuthTokenResponseModel.cs b/src/Api/Models/Response/AuthTokenResponseModel.cs index 4b500769e1..68e92600ea 100644 --- a/src/Api/Models/Response/AuthTokenResponseModel.cs +++ b/src/Api/Models/Response/AuthTokenResponseModel.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Api.Models { diff --git a/src/Api/Models/Response/CipherHistoryResponseModel.cs b/src/Api/Models/Response/CipherHistoryResponseModel.cs index 2b4bb3a00b..b478aa6622 100644 --- a/src/Api/Models/Response/CipherHistoryResponseModel.cs +++ b/src/Api/Models/Response/CipherHistoryResponseModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Api.Models { diff --git a/src/Api/Models/Response/CipherResponseModel.cs b/src/Api/Models/Response/CipherResponseModel.cs index f510473028..4e98c98518 100644 --- a/src/Api/Models/Response/CipherResponseModel.cs +++ b/src/Api/Models/Response/CipherResponseModel.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Api.Models { diff --git a/src/Api/Models/Response/DeviceResponseModel.cs b/src/Api/Models/Response/DeviceResponseModel.cs index 690c06d80f..b5b9053a45 100644 --- a/src/Api/Models/Response/DeviceResponseModel.cs +++ b/src/Api/Models/Response/DeviceResponseModel.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Enums; namespace Bit.Api.Models diff --git a/src/Api/Models/Response/DomainsResponseModel.cs b/src/Api/Models/Response/DomainsResponseModel.cs index 7d5e1686fa..1f5502d02d 100644 --- a/src/Api/Models/Response/DomainsResponseModel.cs +++ b/src/Api/Models/Response/DomainsResponseModel.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using System.Collections.Generic; using Newtonsoft.Json; using Bit.Core.Enums; diff --git a/src/Api/Models/Response/FolderResponseModel.cs b/src/Api/Models/Response/FolderResponseModel.cs index a9620a7477..d831af35f5 100644 --- a/src/Api/Models/Response/FolderResponseModel.cs +++ b/src/Api/Models/Response/FolderResponseModel.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Api.Models { diff --git a/src/Api/Models/Response/KeysResponseModel.cs b/src/Api/Models/Response/KeysResponseModel.cs index f1377603f8..632befadef 100644 --- a/src/Api/Models/Response/KeysResponseModel.cs +++ b/src/Api/Models/Response/KeysResponseModel.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Api.Models { diff --git a/src/Api/Models/Response/LoginResponseModel.cs b/src/Api/Models/Response/LoginResponseModel.cs index d71107ab87..02131565a1 100644 --- a/src/Api/Models/Response/LoginResponseModel.cs +++ b/src/Api/Models/Response/LoginResponseModel.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Api.Models { diff --git a/src/Api/Models/Response/OrganizationResponseModel.cs b/src/Api/Models/Response/OrganizationResponseModel.cs index 7b7d41aa0f..6497ac6b7e 100644 --- a/src/Api/Models/Response/OrganizationResponseModel.cs +++ b/src/Api/Models/Response/OrganizationResponseModel.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Api.Models { diff --git a/src/Api/Models/Response/ProfileResponseModel.cs b/src/Api/Models/Response/ProfileResponseModel.cs index 09229ad808..c64afed8f2 100644 --- a/src/Api/Models/Response/ProfileResponseModel.cs +++ b/src/Api/Models/Response/ProfileResponseModel.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using System.Collections.Generic; using System.Linq; using Bit.Core.Models.Data; diff --git a/src/Api/Models/Response/SubvaultResponseModel.cs b/src/Api/Models/Response/SubvaultResponseModel.cs index f7d0c94e93..0a15f6e7a2 100644 --- a/src/Api/Models/Response/SubvaultResponseModel.cs +++ b/src/Api/Models/Response/SubvaultResponseModel.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Api.Models { diff --git a/src/Api/Models/Response/TwoFactorResponseModel.cs b/src/Api/Models/Response/TwoFactorResponseModel.cs index da598f1cc6..43a0109788 100644 --- a/src/Api/Models/Response/TwoFactorResponseModel.cs +++ b/src/Api/Models/Response/TwoFactorResponseModel.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Enums; namespace Bit.Api.Models diff --git a/src/Api/Models/Response/UserKeyResponseModel.cs b/src/Api/Models/Response/UserKeyResponseModel.cs index 07d26e9561..7366d90c5e 100644 --- a/src/Api/Models/Response/UserKeyResponseModel.cs +++ b/src/Api/Models/Response/UserKeyResponseModel.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Enums; namespace Bit.Api.Models diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs index 3ac09a8870..f9fb92382b 100644 --- a/src/Api/Startup.cs +++ b/src/Api/Startup.cs @@ -11,7 +11,7 @@ using Microsoft.Extensions.Options; using Microsoft.IdentityModel.Tokens; using Bit.Api.Utilities; using Bit.Core; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Identity; using Bit.Core.Repositories; using Bit.Core.Services; diff --git a/src/Core/CurrentContext.cs b/src/Core/CurrentContext.cs index 2ec7847acc..27c7605436 100644 --- a/src/Core/CurrentContext.cs +++ b/src/Core/CurrentContext.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Core { diff --git a/src/Core/Identity/AuthenticatorTokenProvider.cs b/src/Core/Identity/AuthenticatorTokenProvider.cs index 3b360a2ed8..2062c5041f 100644 --- a/src/Core/Identity/AuthenticatorTokenProvider.cs +++ b/src/Core/Identity/AuthenticatorTokenProvider.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Identity; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Enums; using OtpNet; diff --git a/src/Core/Identity/JwtBearerIdentityServiceCollectionExtensions.cs b/src/Core/Identity/JwtBearerIdentityServiceCollectionExtensions.cs index 29ac18fde5..ee67ac2d13 100644 --- a/src/Core/Identity/JwtBearerIdentityServiceCollectionExtensions.cs +++ b/src/Core/Identity/JwtBearerIdentityServiceCollectionExtensions.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; diff --git a/src/Core/Identity/JwtBearerSignInManager.cs b/src/Core/Identity/JwtBearerSignInManager.cs index 0e86717c40..e61d38bc07 100644 --- a/src/Core/Identity/JwtBearerSignInManager.cs +++ b/src/Core/Identity/JwtBearerSignInManager.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Microsoft.AspNetCore.Builder; using Microsoft.IdentityModel.Tokens; using Bit.Core.Repositories; diff --git a/src/Core/Identity/JwtBearerSignInResult.cs b/src/Core/Identity/JwtBearerSignInResult.cs index 2bccc59e31..a72f4878e5 100644 --- a/src/Core/Identity/JwtBearerSignInResult.cs +++ b/src/Core/Identity/JwtBearerSignInResult.cs @@ -1,4 +1,4 @@ -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Core.Identity { diff --git a/src/Core/Identity/RoleStore.cs b/src/Core/Identity/RoleStore.cs index 610ac4b2eb..33fb27b43f 100644 --- a/src/Core/Identity/RoleStore.cs +++ b/src/Core/Identity/RoleStore.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Identity; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Core.Identity { diff --git a/src/Core/Identity/UserStore.cs b/src/Core/Identity/UserStore.cs index ce45f57dec..fe76e59d59 100644 --- a/src/Core/Identity/UserStore.cs +++ b/src/Core/Identity/UserStore.cs @@ -5,7 +5,7 @@ using System.Security.Claims; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Identity; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Repositories; using Bit.Core.Services; diff --git a/src/Core/Models/Business/OrganizationSignup.cs b/src/Core/Models/Business/OrganizationSignup.cs index 09b724dbd6..c11baee759 100644 --- a/src/Core/Models/Business/OrganizationSignup.cs +++ b/src/Core/Models/Business/OrganizationSignup.cs @@ -1,4 +1,4 @@ -using Bit.Core.Domains; +using Bit.Core.Models.Table; using System; namespace Bit.Core.Models.Business diff --git a/src/Core/Domains/Cipher.cs b/src/Core/Models/Table/Cipher.cs similarity index 95% rename from src/Core/Domains/Cipher.cs rename to src/Core/Models/Table/Cipher.cs index 46accfb29d..ccd53e1683 100644 --- a/src/Core/Domains/Cipher.cs +++ b/src/Core/Models/Table/Cipher.cs @@ -1,7 +1,7 @@ using System; using Bit.Core.Utilities; -namespace Bit.Core.Domains +namespace Bit.Core.Models.Table { public class Cipher : IDataObject { diff --git a/src/Core/Domains/Device.cs b/src/Core/Models/Table/Device.cs similarity index 95% rename from src/Core/Domains/Device.cs rename to src/Core/Models/Table/Device.cs index 8376b35d02..21152a4904 100644 --- a/src/Core/Domains/Device.cs +++ b/src/Core/Models/Table/Device.cs @@ -1,7 +1,7 @@ using System; using Bit.Core.Utilities; -namespace Bit.Core.Domains +namespace Bit.Core.Models.Table { public class Device : IDataObject { diff --git a/src/Core/Domains/Grant.cs b/src/Core/Models/Table/Grant.cs similarity index 92% rename from src/Core/Domains/Grant.cs rename to src/Core/Models/Table/Grant.cs index 19aa078ca9..95fd169572 100644 --- a/src/Core/Domains/Grant.cs +++ b/src/Core/Models/Table/Grant.cs @@ -1,6 +1,6 @@ using System; -namespace Bit.Core.Domains +namespace Bit.Core.Models.Table { public class Grant { diff --git a/src/Core/Domains/Organization.cs b/src/Core/Models/Table/Organization.cs similarity index 96% rename from src/Core/Domains/Organization.cs rename to src/Core/Models/Table/Organization.cs index 39f67b0427..207d8f342d 100644 --- a/src/Core/Domains/Organization.cs +++ b/src/Core/Models/Table/Organization.cs @@ -2,7 +2,7 @@ using Bit.Core.Utilities; using Bit.Core.Enums; -namespace Bit.Core.Domains +namespace Bit.Core.Models.Table { public class Organization : IDataObject { diff --git a/src/Core/Domains/OrganizationUser.cs b/src/Core/Models/Table/OrganizationUser.cs similarity index 95% rename from src/Core/Domains/OrganizationUser.cs rename to src/Core/Models/Table/OrganizationUser.cs index 0aa97fab12..e6c746d1fc 100644 --- a/src/Core/Domains/OrganizationUser.cs +++ b/src/Core/Models/Table/OrganizationUser.cs @@ -2,7 +2,7 @@ using Bit.Core.Utilities; using Bit.Core.Enums; -namespace Bit.Core.Domains +namespace Bit.Core.Models.Table { public class OrganizationUser : IDataObject { diff --git a/src/Core/Domains/Role.cs b/src/Core/Models/Table/Role.cs similarity index 85% rename from src/Core/Domains/Role.cs rename to src/Core/Models/Table/Role.cs index cb9a3b8df8..cfbde2e387 100644 --- a/src/Core/Domains/Role.cs +++ b/src/Core/Models/Table/Role.cs @@ -1,4 +1,4 @@ -namespace Bit.Core.Domains +namespace Bit.Core.Models.Table { /// /// This class is not used. It is implemented to make the Identity provider happy. diff --git a/src/Core/Domains/Subvault.cs b/src/Core/Models/Table/Subvault.cs similarity index 93% rename from src/Core/Domains/Subvault.cs rename to src/Core/Models/Table/Subvault.cs index af3a0afa78..8f52016eeb 100644 --- a/src/Core/Domains/Subvault.cs +++ b/src/Core/Models/Table/Subvault.cs @@ -1,7 +1,7 @@ using System; using Bit.Core.Utilities; -namespace Bit.Core.Domains +namespace Bit.Core.Models.Table { public class Subvault : IDataObject { diff --git a/src/Core/Domains/SubvaultUser.cs b/src/Core/Models/Table/SubvaultUser.cs similarity index 94% rename from src/Core/Domains/SubvaultUser.cs rename to src/Core/Models/Table/SubvaultUser.cs index 3e51e7301d..7accfee082 100644 --- a/src/Core/Domains/SubvaultUser.cs +++ b/src/Core/Models/Table/SubvaultUser.cs @@ -1,7 +1,7 @@ using System; using Bit.Core.Utilities; -namespace Bit.Core.Domains +namespace Bit.Core.Models.Table { public class SubvaultUser : IDataObject { diff --git a/src/Core/Domains/User.cs b/src/Core/Models/Table/User.cs similarity index 97% rename from src/Core/Domains/User.cs rename to src/Core/Models/Table/User.cs index 3cb3d6dfbf..54ae8c3b6a 100644 --- a/src/Core/Domains/User.cs +++ b/src/Core/Models/Table/User.cs @@ -2,7 +2,7 @@ using Bit.Core.Enums; using Bit.Core.Utilities; -namespace Bit.Core.Domains +namespace Bit.Core.Models.Table { public class User : IDataObject { diff --git a/src/Core/Repositories/ICipherRepository.cs b/src/Core/Repositories/ICipherRepository.cs index 10e1fada2f..4dd8e88d9d 100644 --- a/src/Core/Repositories/ICipherRepository.cs +++ b/src/Core/Repositories/ICipherRepository.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Core.Repositories { diff --git a/src/Core/Repositories/IDeviceRepository.cs b/src/Core/Repositories/IDeviceRepository.cs index 86db7aacfd..b79203e932 100644 --- a/src/Core/Repositories/IDeviceRepository.cs +++ b/src/Core/Repositories/IDeviceRepository.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Core.Repositories { diff --git a/src/Core/Repositories/IGrantRepository.cs b/src/Core/Repositories/IGrantRepository.cs index c78614d68a..ba86c6b287 100644 --- a/src/Core/Repositories/IGrantRepository.cs +++ b/src/Core/Repositories/IGrantRepository.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using System.Collections.Generic; namespace Bit.Core.Repositories diff --git a/src/Core/Repositories/IOrganizationRepository.cs b/src/Core/Repositories/IOrganizationRepository.cs index ffe0248549..5c64d4f7ff 100644 --- a/src/Core/Repositories/IOrganizationRepository.cs +++ b/src/Core/Repositories/IOrganizationRepository.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Core.Repositories { diff --git a/src/Core/Repositories/IOrganizationUserRepository.cs b/src/Core/Repositories/IOrganizationUserRepository.cs index 0b708355bc..24c1cec91d 100644 --- a/src/Core/Repositories/IOrganizationUserRepository.cs +++ b/src/Core/Repositories/IOrganizationUserRepository.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Models.Data; namespace Bit.Core.Repositories diff --git a/src/Core/Repositories/ISubvaultRepository.cs b/src/Core/Repositories/ISubvaultRepository.cs index 522f54a636..c6091af5d5 100644 --- a/src/Core/Repositories/ISubvaultRepository.cs +++ b/src/Core/Repositories/ISubvaultRepository.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using System.Collections.Generic; namespace Bit.Core.Repositories diff --git a/src/Core/Repositories/ISubvaultUserRepository.cs b/src/Core/Repositories/ISubvaultUserRepository.cs index 9f1de45ac6..b1296c1d69 100644 --- a/src/Core/Repositories/ISubvaultUserRepository.cs +++ b/src/Core/Repositories/ISubvaultUserRepository.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Core.Repositories { diff --git a/src/Core/Repositories/IUserRepository.cs b/src/Core/Repositories/IUserRepository.cs index f5a1df875b..cd96a165d8 100644 --- a/src/Core/Repositories/IUserRepository.cs +++ b/src/Core/Repositories/IUserRepository.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Core.Repositories { diff --git a/src/Core/Repositories/SqlServer/CipherRepository.cs b/src/Core/Repositories/SqlServer/CipherRepository.cs index 774cb3f348..59f410ce10 100644 --- a/src/Core/Repositories/SqlServer/CipherRepository.cs +++ b/src/Core/Repositories/SqlServer/CipherRepository.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Data.SqlClient; using System.Threading.Tasks; using DataTableProxy; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using System.Data; using Dapper; diff --git a/src/Core/Repositories/SqlServer/DeviceRepository.cs b/src/Core/Repositories/SqlServer/DeviceRepository.cs index 26f21e3e53..330fa16619 100644 --- a/src/Core/Repositories/SqlServer/DeviceRepository.cs +++ b/src/Core/Repositories/SqlServer/DeviceRepository.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Collections.Generic; using System.Data.SqlClient; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using System.Data; using Dapper; diff --git a/src/Core/Repositories/SqlServer/GrantRepository.cs b/src/Core/Repositories/SqlServer/GrantRepository.cs index 2f3506e874..53fee674ad 100644 --- a/src/Core/Repositories/SqlServer/GrantRepository.cs +++ b/src/Core/Repositories/SqlServer/GrantRepository.cs @@ -4,7 +4,7 @@ using System.Data; using System.Data.SqlClient; using System.Linq; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Dapper; namespace Bit.Core.Repositories.SqlServer diff --git a/src/Core/Repositories/SqlServer/OrganizationRepository.cs b/src/Core/Repositories/SqlServer/OrganizationRepository.cs index b2c5182900..92d57522e8 100644 --- a/src/Core/Repositories/SqlServer/OrganizationRepository.cs +++ b/src/Core/Repositories/SqlServer/OrganizationRepository.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using System.Threading.Tasks; using System.Data.SqlClient; using System.Data; diff --git a/src/Core/Repositories/SqlServer/OrganizationUserRepository.cs b/src/Core/Repositories/SqlServer/OrganizationUserRepository.cs index b6d6a9401d..503ca1c3d7 100644 --- a/src/Core/Repositories/SqlServer/OrganizationUserRepository.cs +++ b/src/Core/Repositories/SqlServer/OrganizationUserRepository.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using System.Data; using System.Data.SqlClient; using System.Threading.Tasks; diff --git a/src/Core/Repositories/SqlServer/SubvaultRepository.cs b/src/Core/Repositories/SqlServer/SubvaultRepository.cs index 95d03019a3..cddc9c46eb 100644 --- a/src/Core/Repositories/SqlServer/SubvaultRepository.cs +++ b/src/Core/Repositories/SqlServer/SubvaultRepository.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using System.Collections.Generic; using System.Threading.Tasks; using System.Data.SqlClient; diff --git a/src/Core/Repositories/SqlServer/SubvaultUserRepository.cs b/src/Core/Repositories/SqlServer/SubvaultUserRepository.cs index 4550bf140c..0396e268ce 100644 --- a/src/Core/Repositories/SqlServer/SubvaultUserRepository.cs +++ b/src/Core/Repositories/SqlServer/SubvaultUserRepository.cs @@ -1,5 +1,5 @@ using System; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Core.Repositories.SqlServer { diff --git a/src/Core/Repositories/SqlServer/UserRepository.cs b/src/Core/Repositories/SqlServer/UserRepository.cs index 5dd122c507..5963b4b7d1 100644 --- a/src/Core/Repositories/SqlServer/UserRepository.cs +++ b/src/Core/Repositories/SqlServer/UserRepository.cs @@ -3,7 +3,7 @@ using System.Data; using System.Data.SqlClient; using System.Linq; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Dapper; namespace Bit.Core.Repositories.SqlServer diff --git a/src/Core/Services/ICipherService.cs b/src/Core/Services/ICipherService.cs index 0e33207557..2cebb1bfa6 100644 --- a/src/Core/Services/ICipherService.cs +++ b/src/Core/Services/ICipherService.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Core.Services { diff --git a/src/Core/Services/IDeviceService.cs b/src/Core/Services/IDeviceService.cs index b3116d55e1..5bfebbc178 100644 --- a/src/Core/Services/IDeviceService.cs +++ b/src/Core/Services/IDeviceService.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Core.Services { diff --git a/src/Core/Services/IMailService.cs b/src/Core/Services/IMailService.cs index 9be1583c1b..96d0617d2f 100644 --- a/src/Core/Services/IMailService.cs +++ b/src/Core/Services/IMailService.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Core.Services { diff --git a/src/Core/Services/IOrganizationService.cs b/src/Core/Services/IOrganizationService.cs index 5d370f12b1..d069079cb2 100644 --- a/src/Core/Services/IOrganizationService.cs +++ b/src/Core/Services/IOrganizationService.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Bit.Core.Models.Business; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using System; namespace Bit.Core.Services diff --git a/src/Core/Services/IPushService.cs b/src/Core/Services/IPushService.cs index 2484219713..70aff578f9 100644 --- a/src/Core/Services/IPushService.cs +++ b/src/Core/Services/IPushService.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Core.Services { diff --git a/src/Core/Services/IUserService.cs b/src/Core/Services/IUserService.cs index edd5061209..ca6c6f3f1c 100644 --- a/src/Core/Services/IUserService.cs +++ b/src/Core/Services/IUserService.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Identity; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using System.Security.Claims; namespace Bit.Core.Services diff --git a/src/Core/Services/Implementations/CipherService.cs b/src/Core/Services/Implementations/CipherService.cs index fbfc532001..d73327a8a5 100644 --- a/src/Core/Services/Implementations/CipherService.cs +++ b/src/Core/Services/Implementations/CipherService.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Collections.Generic; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Repositories; namespace Bit.Core.Services diff --git a/src/Core/Services/Implementations/DeviceService.cs b/src/Core/Services/Implementations/DeviceService.cs index a7b27b209f..712c6c5124 100644 --- a/src/Core/Services/Implementations/DeviceService.cs +++ b/src/Core/Services/Implementations/DeviceService.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Repositories; namespace Bit.Core.Services diff --git a/src/Core/Services/Implementations/NoopMailService.cs b/src/Core/Services/Implementations/NoopMailService.cs index 75d539812e..3117636a5c 100644 --- a/src/Core/Services/Implementations/NoopMailService.cs +++ b/src/Core/Services/Implementations/NoopMailService.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Core.Services { diff --git a/src/Core/Services/Implementations/NoopPushService.cs b/src/Core/Services/Implementations/NoopPushService.cs index 2688740368..9df45c17c3 100644 --- a/src/Core/Services/Implementations/NoopPushService.cs +++ b/src/Core/Services/Implementations/NoopPushService.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; namespace Bit.Core.Services { diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs index 5d27db4f24..95cf5e1f89 100644 --- a/src/Core/Services/Implementations/OrganizationService.cs +++ b/src/Core/Services/Implementations/OrganizationService.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Threading.Tasks; using Bit.Core.Repositories; using Bit.Core.Models.Business; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Utilities; using Bit.Core.Exceptions; diff --git a/src/Core/Services/Implementations/PushSharpPushService.cs b/src/Core/Services/Implementations/PushSharpPushService.cs index b841bb526b..dc54691e5a 100644 --- a/src/Core/Services/Implementations/PushSharpPushService.cs +++ b/src/Core/Services/Implementations/PushSharpPushService.cs @@ -8,7 +8,7 @@ using PushSharp.Google; using PushSharp.Apple; using Microsoft.AspNetCore.Hosting; using PushSharp.Core; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Enums; using Newtonsoft.Json; using Microsoft.Extensions.Logging; diff --git a/src/Core/Services/Implementations/SendGridMailService.cs b/src/Core/Services/Implementations/SendGridMailService.cs index 88fee79279..ee1619ccc3 100644 --- a/src/Core/Services/Implementations/SendGridMailService.cs +++ b/src/Core/Services/Implementations/SendGridMailService.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using SendGrid; using SendGrid.Helpers.Mail; diff --git a/src/Core/Services/Implementations/UserService.cs b/src/Core/Services/Implementations/UserService.cs index 343712ad82..688f1c328d 100644 --- a/src/Core/Services/Implementations/UserService.cs +++ b/src/Core/Services/Implementations/UserService.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Bit.Core.Domains; +using Bit.Core.Models.Table; using Bit.Core.Repositories; using System.Linq; using Microsoft.AspNetCore.Builder;