From 8bcd4e04630932130cf884c2a7d2bfdcd6fbdd89 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 8 Mar 2017 21:55:08 -0500 Subject: [PATCH] move all models into core --- src/Api/Controllers/AccountsController.cs | 2 +- src/Api/Controllers/AuthController.cs | 2 +- src/Api/Controllers/CiphersController.cs | 2 +- src/Api/Controllers/DevicesController.cs | 2 +- src/Api/Controllers/FoldersController.cs | 2 +- src/Api/Controllers/LoginsController.cs | 2 +- src/Api/Controllers/OrganizationUsersController.cs | 2 +- src/Api/Controllers/OrganizationsController.cs | 2 +- src/Api/Controllers/SettingsController.cs | 2 +- src/Api/Controllers/SubvaultsController.cs | 2 +- src/Api/Controllers/UsersController.cs | 2 +- src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs | 2 +- src/Api/Middleware/CustomIpRateLimitMiddleware.cs | 2 +- src/Api/Utilities/ExceptionHandlerFilterAttribute.cs | 2 +- src/Api/Utilities/ModelStateValidationFilterAttribute.cs | 2 +- src/{Api/Models => Core/Models/Api}/FolderDataModel.cs | 2 +- src/{Api/Models => Core/Models/Api}/LoginDataModel.cs | 2 +- .../Models/Api}/Request/Accounts/DeleteAccountRequestModel.cs | 2 +- .../Models/Api}/Request/Accounts/EmailRequestModel.cs | 2 +- .../Models/Api}/Request/Accounts/EmailTokenRequestModel.cs | 2 +- .../Models/Api}/Request/Accounts/ImportRequestModel.cs | 2 +- .../Models/Api}/Request/Accounts/KeysRequestModel.cs | 2 +- .../Models/Api}/Request/Accounts/PasswordHintRequestModel.cs | 2 +- .../Models/Api}/Request/Accounts/PasswordRequestModel.cs | 2 +- .../Api}/Request/Accounts/RecoverTwoFactorRequestModel.cs | 2 +- .../Api}/Request/Accounts/RegenerateTwoFactorRequestModel.cs | 2 +- .../Models/Api}/Request/Accounts/RegisterRequestModel.cs | 2 +- .../Models/Api}/Request/Accounts/SecurityStampRequestModel.cs | 2 +- .../Models/Api}/Request/Accounts/UpdateProfileRequestModel.cs | 2 +- .../Api}/Request/Accounts/UpdateTwoFactorRequestModel.cs | 2 +- .../Models/Api}/Request/AuthTokenRequestModel.cs | 2 +- .../Models/Api}/Request/AuthTokenTwoFactorRequestModel.cs | 2 +- .../Models => Core/Models/Api}/Request/CipherRequestModel.cs | 4 ++-- .../Models => Core/Models/Api}/Request/DeviceRequestModels.cs | 2 +- .../Models => Core/Models/Api}/Request/FolderRequestModel.cs | 4 ++-- .../Models => Core/Models/Api}/Request/LoginRequestModel.cs | 4 ++-- .../Request/Organizations/OrganizationCreateRequestModel.cs | 2 +- .../Request/Organizations/OrganizationUpdateRequestModel.cs | 2 +- .../Organizations/OrganizationUserCreateRequestModels.cs | 2 +- .../Models/Api}/Request/SubvaultRequestModel.cs | 4 ++-- .../Models/Api}/Request/UpdateDomainsRequestModel.cs | 2 +- .../Models/Api}/Response/AuthTokenResponseModel.cs | 2 +- .../Models/Api}/Response/CipherHistoryResponseModel.cs | 2 +- .../Models/Api}/Response/CipherResponseModel.cs | 2 +- .../Models/Api}/Response/DeviceResponseModel.cs | 2 +- .../Models/Api}/Response/DomainsResponseModel.cs | 2 +- .../Models => Core/Models/Api}/Response/ErrorResponseModel.cs | 2 +- .../Models/Api}/Response/FolderResponseModel.cs | 2 +- .../Models => Core/Models/Api}/Response/KeysResponseModel.cs | 2 +- .../Models => Core/Models/Api}/Response/ListResponseModel.cs | 2 +- .../Models => Core/Models/Api}/Response/LoginResponseModel.cs | 2 +- .../Models/Api}/Response/OrganizationResponseModel.cs | 2 +- .../Models/Api}/Response/OrganizationUserResponseModel.cs | 2 +- .../Models/Api}/Response/ProfileOrganizationResponseModel.cs | 2 +- .../Models/Api}/Response/ProfileResponseModel.cs | 2 +- src/{Api/Models => Core/Models/Api}/Response/ResponseModel.cs | 2 +- .../Models/Api}/Response/SubvaultResponseModel.cs | 2 +- .../Models/Api}/Response/TwoFactorResponseModel.cs | 2 +- .../Models/Api}/Response/UserKeyResponseModel.cs | 2 +- src/{Api => Core}/Utilities/EncryptedValueAttribute.cs | 2 +- 60 files changed, 64 insertions(+), 64 deletions(-) rename src/{Api/Models => Core/Models/Api}/FolderDataModel.cs (96%) rename src/{Api/Models => Core/Models/Api}/LoginDataModel.cs (97%) rename src/{Api/Models => Core/Models/Api}/Request/Accounts/DeleteAccountRequestModel.cs (85%) rename src/{Api/Models => Core/Models/Api}/Request/Accounts/EmailRequestModel.cs (94%) rename src/{Api/Models => Core/Models/Api}/Request/Accounts/EmailTokenRequestModel.cs (91%) rename src/{Api/Models => Core/Models/Api}/Request/Accounts/ImportRequestModel.cs (95%) rename src/{Api/Models => Core/Models/Api}/Request/Accounts/KeysRequestModel.cs (94%) rename src/{Api/Models => Core/Models/Api}/Request/Accounts/PasswordHintRequestModel.cs (87%) rename src/{Api/Models => Core/Models/Api}/Request/Accounts/PasswordRequestModel.cs (92%) rename src/{Api/Models => Core/Models/Api}/Request/Accounts/RecoverTwoFactorRequestModel.cs (93%) rename src/{Api/Models => Core/Models/Api}/Request/Accounts/RegenerateTwoFactorRequestModel.cs (91%) rename src/{Api/Models => Core/Models/Api}/Request/Accounts/RegisterRequestModel.cs (96%) rename src/{Api/Models => Core/Models/Api}/Request/Accounts/SecurityStampRequestModel.cs (85%) rename src/{Api/Models => Core/Models/Api}/Request/Accounts/UpdateProfileRequestModel.cs (96%) rename src/{Api/Models => Core/Models/Api}/Request/Accounts/UpdateTwoFactorRequestModel.cs (92%) rename src/{Api/Models => Core/Models/Api}/Request/AuthTokenRequestModel.cs (91%) rename src/{Api/Models => Core/Models/Api}/Request/AuthTokenTwoFactorRequestModel.cs (90%) rename src/{Api/Models => Core/Models/Api}/Request/CipherRequestModel.cs (97%) rename src/{Api/Models => Core/Models/Api}/Request/DeviceRequestModels.cs (97%) rename src/{Api/Models => Core/Models/Api}/Request/FolderRequestModel.cs (93%) rename src/{Api/Models => Core/Models/Api}/Request/LoginRequestModel.cs (96%) rename src/{Api/Models => Core/Models/Api}/Request/Organizations/OrganizationCreateRequestModel.cs (95%) rename src/{Api/Models => Core/Models/Api}/Request/Organizations/OrganizationUpdateRequestModel.cs (91%) rename src/{Api/Models => Core/Models/Api}/Request/Organizations/OrganizationUserCreateRequestModels.cs (92%) rename src/{Api/Models => Core/Models/Api}/Request/SubvaultRequestModel.cs (93%) rename src/{Api/Models => Core/Models/Api}/Request/UpdateDomainsRequestModel.cs (96%) rename src/{Api/Models => Core/Models/Api}/Response/AuthTokenResponseModel.cs (93%) rename src/{Api/Models => Core/Models/Api}/Response/CipherHistoryResponseModel.cs (96%) rename src/{Api/Models => Core/Models/Api}/Response/CipherResponseModel.cs (97%) rename src/{Api/Models => Core/Models/Api}/Response/DeviceResponseModel.cs (96%) rename src/{Api/Models => Core/Models/Api}/Response/DomainsResponseModel.cs (98%) rename src/{Api/Models => Core/Models/Api}/Response/ErrorResponseModel.cs (97%) rename src/{Api/Models => Core/Models/Api}/Response/FolderResponseModel.cs (96%) rename src/{Api/Models => Core/Models/Api}/Response/KeysResponseModel.cs (94%) rename src/{Api/Models => Core/Models/Api}/Response/ListResponseModel.cs (91%) rename src/{Api/Models => Core/Models/Api}/Response/LoginResponseModel.cs (97%) rename src/{Api/Models => Core/Models/Api}/Response/OrganizationResponseModel.cs (97%) rename src/{Api/Models => Core/Models/Api}/Response/OrganizationUserResponseModel.cs (97%) rename src/{Api/Models => Core/Models/Api}/Response/ProfileOrganizationResponseModel.cs (95%) rename src/{Api/Models => Core/Models/Api}/Response/ProfileResponseModel.cs (97%) rename src/{Api/Models => Core/Models/Api}/Response/ResponseModel.cs (92%) rename src/{Api/Models => Core/Models/Api}/Response/SubvaultResponseModel.cs (95%) rename src/{Api/Models => Core/Models/Api}/Response/TwoFactorResponseModel.cs (96%) rename src/{Api/Models => Core/Models/Api}/Response/UserKeyResponseModel.cs (93%) rename src/{Api => Core}/Utilities/EncryptedValueAttribute.cs (98%) diff --git a/src/Api/Controllers/AccountsController.cs b/src/Api/Controllers/AccountsController.cs index 302d7819ac..d3155c1638 100644 --- a/src/Api/Controllers/AccountsController.cs +++ b/src/Api/Controllers/AccountsController.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Bit.Api.Models; +using Bit.Core.Models.Api; using Bit.Core.Exceptions; using Bit.Core.Services; using Microsoft.AspNetCore.Identity; diff --git a/src/Api/Controllers/AuthController.cs b/src/Api/Controllers/AuthController.cs index c2f1672c0c..9c4c34b0a5 100644 --- a/src/Api/Controllers/AuthController.cs +++ b/src/Api/Controllers/AuthController.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Bit.Core.Identity; -using Bit.Api.Models; +using Bit.Core.Models.Api; using Microsoft.AspNetCore.Authorization; using Bit.Core.Exceptions; using Bit.Core.Services; diff --git a/src/Api/Controllers/CiphersController.cs b/src/Api/Controllers/CiphersController.cs index 57fc1f1adb..11cafa6c40 100644 --- a/src/Api/Controllers/CiphersController.cs +++ b/src/Api/Controllers/CiphersController.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Bit.Core.Repositories; using Microsoft.AspNetCore.Authorization; -using Bit.Api.Models; +using Bit.Core.Models.Api; using Bit.Core.Exceptions; using Bit.Core.Services; diff --git a/src/Api/Controllers/DevicesController.cs b/src/Api/Controllers/DevicesController.cs index 01eab67d58..1d64c3e362 100644 --- a/src/Api/Controllers/DevicesController.cs +++ b/src/Api/Controllers/DevicesController.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Bit.Core.Repositories; using Microsoft.AspNetCore.Authorization; -using Bit.Api.Models; +using Bit.Core.Models.Api; using Bit.Core.Exceptions; using Bit.Core.Models.Table; using Microsoft.AspNetCore.Identity; diff --git a/src/Api/Controllers/FoldersController.cs b/src/Api/Controllers/FoldersController.cs index d8290223c0..0511c7c47f 100644 --- a/src/Api/Controllers/FoldersController.cs +++ b/src/Api/Controllers/FoldersController.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Bit.Core.Repositories; using Microsoft.AspNetCore.Authorization; -using Bit.Api.Models; +using Bit.Core.Models.Api; using Bit.Core.Exceptions; using Bit.Core.Models.Table; using Microsoft.AspNetCore.Identity; diff --git a/src/Api/Controllers/LoginsController.cs b/src/Api/Controllers/LoginsController.cs index 3419835a80..dd3d7a8cc7 100644 --- a/src/Api/Controllers/LoginsController.cs +++ b/src/Api/Controllers/LoginsController.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Bit.Core.Repositories; using Microsoft.AspNetCore.Authorization; -using Bit.Api.Models; +using Bit.Core.Models.Api; using Bit.Core.Exceptions; using Bit.Core.Models.Table; using Bit.Core.Services; diff --git a/src/Api/Controllers/OrganizationUsersController.cs b/src/Api/Controllers/OrganizationUsersController.cs index d7cbc3446a..8ca6b8096e 100644 --- a/src/Api/Controllers/OrganizationUsersController.cs +++ b/src/Api/Controllers/OrganizationUsersController.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Bit.Core.Repositories; using Microsoft.AspNetCore.Authorization; -using Bit.Api.Models; +using Bit.Core.Models.Api; using Bit.Core.Exceptions; using Bit.Core.Services; diff --git a/src/Api/Controllers/OrganizationsController.cs b/src/Api/Controllers/OrganizationsController.cs index 073792fbae..219b8dd695 100644 --- a/src/Api/Controllers/OrganizationsController.cs +++ b/src/Api/Controllers/OrganizationsController.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Bit.Core.Repositories; using Microsoft.AspNetCore.Authorization; -using Bit.Api.Models; +using Bit.Core.Models.Api; using Bit.Core.Exceptions; using Bit.Core.Services; diff --git a/src/Api/Controllers/SettingsController.cs b/src/Api/Controllers/SettingsController.cs index 5b66a71f39..c4fe1e6390 100644 --- a/src/Api/Controllers/SettingsController.cs +++ b/src/Api/Controllers/SettingsController.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Bit.Api.Models; +using Bit.Core.Models.Api; using Bit.Core.Services; namespace Bit.Api.Controllers diff --git a/src/Api/Controllers/SubvaultsController.cs b/src/Api/Controllers/SubvaultsController.cs index 5e85c94979..dccdb3aff9 100644 --- a/src/Api/Controllers/SubvaultsController.cs +++ b/src/Api/Controllers/SubvaultsController.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Bit.Core.Repositories; using Microsoft.AspNetCore.Authorization; -using Bit.Api.Models; +using Bit.Core.Models.Api; using Bit.Core.Exceptions; using Bit.Core.Services; diff --git a/src/Api/Controllers/UsersController.cs b/src/Api/Controllers/UsersController.cs index 27c13140fc..605ddd2050 100644 --- a/src/Api/Controllers/UsersController.cs +++ b/src/Api/Controllers/UsersController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc; using Bit.Core.Repositories; using Microsoft.AspNetCore.Authorization; using Bit.Core.Exceptions; -using Bit.Api.Models; +using Bit.Core.Models.Api; namespace Bit.Api.Controllers { diff --git a/src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs b/src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs index b54bf14094..93d71fd0a9 100644 --- a/src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs +++ b/src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs @@ -1,4 +1,4 @@ -using Bit.Api.Models.Response; +using Bit.Core.Models.Api; using Bit.Core.Models.Table; using Bit.Core.Enums; using Bit.Core.Identity; diff --git a/src/Api/Middleware/CustomIpRateLimitMiddleware.cs b/src/Api/Middleware/CustomIpRateLimitMiddleware.cs index 1b5c1f75f7..1dc9f48efd 100644 --- a/src/Api/Middleware/CustomIpRateLimitMiddleware.cs +++ b/src/Api/Middleware/CustomIpRateLimitMiddleware.cs @@ -1,5 +1,5 @@ using AspNetCoreRateLimit; -using Bit.Api.Models.Response; +using Bit.Core.Models.Api; using Bit.Core.Services; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Caching.Memory; diff --git a/src/Api/Utilities/ExceptionHandlerFilterAttribute.cs b/src/Api/Utilities/ExceptionHandlerFilterAttribute.cs index ad48e0b01c..e7bf77175b 100644 --- a/src/Api/Utilities/ExceptionHandlerFilterAttribute.cs +++ b/src/Api/Utilities/ExceptionHandlerFilterAttribute.cs @@ -1,5 +1,5 @@ using System; -using Bit.Api.Models.Response; +using Bit.Core.Models.Api; using Bit.Core.Exceptions; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; diff --git a/src/Api/Utilities/ModelStateValidationFilterAttribute.cs b/src/Api/Utilities/ModelStateValidationFilterAttribute.cs index 1a8ab38b4d..b60d21999b 100644 --- a/src/Api/Utilities/ModelStateValidationFilterAttribute.cs +++ b/src/Api/Utilities/ModelStateValidationFilterAttribute.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Bit.Api.Models.Response; +using Bit.Core.Models.Api; using System.Linq; namespace Bit.Api.Utilities diff --git a/src/Api/Models/FolderDataModel.cs b/src/Core/Models/Api/FolderDataModel.cs similarity index 96% rename from src/Api/Models/FolderDataModel.cs rename to src/Core/Models/Api/FolderDataModel.cs index b31ea95555..9726258a41 100644 --- a/src/Api/Models/FolderDataModel.cs +++ b/src/Core/Models/Api/FolderDataModel.cs @@ -2,7 +2,7 @@ using Bit.Core.Models.Table; using Newtonsoft.Json; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class FolderDataModel { diff --git a/src/Api/Models/LoginDataModel.cs b/src/Core/Models/Api/LoginDataModel.cs similarity index 97% rename from src/Api/Models/LoginDataModel.cs rename to src/Core/Models/Api/LoginDataModel.cs index 48cec1303e..71e2a90739 100644 --- a/src/Api/Models/LoginDataModel.cs +++ b/src/Core/Models/Api/LoginDataModel.cs @@ -2,7 +2,7 @@ using Bit.Core.Models.Table; using Newtonsoft.Json; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class LoginDataModel { diff --git a/src/Api/Models/Request/Accounts/DeleteAccountRequestModel.cs b/src/Core/Models/Api/Request/Accounts/DeleteAccountRequestModel.cs similarity index 85% rename from src/Api/Models/Request/Accounts/DeleteAccountRequestModel.cs rename to src/Core/Models/Api/Request/Accounts/DeleteAccountRequestModel.cs index 0a0f5f9bd9..3fd15080ea 100644 --- a/src/Api/Models/Request/Accounts/DeleteAccountRequestModel.cs +++ b/src/Core/Models/Api/Request/Accounts/DeleteAccountRequestModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class DeleteAccountRequestModel { diff --git a/src/Api/Models/Request/Accounts/EmailRequestModel.cs b/src/Core/Models/Api/Request/Accounts/EmailRequestModel.cs similarity index 94% rename from src/Api/Models/Request/Accounts/EmailRequestModel.cs rename to src/Core/Models/Api/Request/Accounts/EmailRequestModel.cs index 86c689d929..7d7bc3df02 100644 --- a/src/Api/Models/Request/Accounts/EmailRequestModel.cs +++ b/src/Core/Models/Api/Request/Accounts/EmailRequestModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class EmailRequestModel { diff --git a/src/Api/Models/Request/Accounts/EmailTokenRequestModel.cs b/src/Core/Models/Api/Request/Accounts/EmailTokenRequestModel.cs similarity index 91% rename from src/Api/Models/Request/Accounts/EmailTokenRequestModel.cs rename to src/Core/Models/Api/Request/Accounts/EmailTokenRequestModel.cs index 3c8ff27548..c154bf9db5 100644 --- a/src/Api/Models/Request/Accounts/EmailTokenRequestModel.cs +++ b/src/Core/Models/Api/Request/Accounts/EmailTokenRequestModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class EmailTokenRequestModel { diff --git a/src/Api/Models/Request/Accounts/ImportRequestModel.cs b/src/Core/Models/Api/Request/Accounts/ImportRequestModel.cs similarity index 95% rename from src/Api/Models/Request/Accounts/ImportRequestModel.cs rename to src/Core/Models/Api/Request/Accounts/ImportRequestModel.cs index 32f83a9e53..dfc272a1fb 100644 --- a/src/Api/Models/Request/Accounts/ImportRequestModel.cs +++ b/src/Core/Models/Api/Request/Accounts/ImportRequestModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class ImportRequestModel { diff --git a/src/Api/Models/Request/Accounts/KeysRequestModel.cs b/src/Core/Models/Api/Request/Accounts/KeysRequestModel.cs similarity index 94% rename from src/Api/Models/Request/Accounts/KeysRequestModel.cs rename to src/Core/Models/Api/Request/Accounts/KeysRequestModel.cs index d470be55fb..e1e23ac35e 100644 --- a/src/Api/Models/Request/Accounts/KeysRequestModel.cs +++ b/src/Core/Models/Api/Request/Accounts/KeysRequestModel.cs @@ -1,7 +1,7 @@ using Bit.Core.Models.Table; using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class KeysRequestModel { diff --git a/src/Api/Models/Request/Accounts/PasswordHintRequestModel.cs b/src/Core/Models/Api/Request/Accounts/PasswordHintRequestModel.cs similarity index 87% rename from src/Api/Models/Request/Accounts/PasswordHintRequestModel.cs rename to src/Core/Models/Api/Request/Accounts/PasswordHintRequestModel.cs index 64261423d6..49b2fce308 100644 --- a/src/Api/Models/Request/Accounts/PasswordHintRequestModel.cs +++ b/src/Core/Models/Api/Request/Accounts/PasswordHintRequestModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class PasswordHintRequestModel { diff --git a/src/Api/Models/Request/Accounts/PasswordRequestModel.cs b/src/Core/Models/Api/Request/Accounts/PasswordRequestModel.cs similarity index 92% rename from src/Api/Models/Request/Accounts/PasswordRequestModel.cs rename to src/Core/Models/Api/Request/Accounts/PasswordRequestModel.cs index 886bf2ff61..6233ddee08 100644 --- a/src/Api/Models/Request/Accounts/PasswordRequestModel.cs +++ b/src/Core/Models/Api/Request/Accounts/PasswordRequestModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class PasswordRequestModel { diff --git a/src/Api/Models/Request/Accounts/RecoverTwoFactorRequestModel.cs b/src/Core/Models/Api/Request/Accounts/RecoverTwoFactorRequestModel.cs similarity index 93% rename from src/Api/Models/Request/Accounts/RecoverTwoFactorRequestModel.cs rename to src/Core/Models/Api/Request/Accounts/RecoverTwoFactorRequestModel.cs index addf94a55d..6f227c084f 100644 --- a/src/Api/Models/Request/Accounts/RecoverTwoFactorRequestModel.cs +++ b/src/Core/Models/Api/Request/Accounts/RecoverTwoFactorRequestModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class RecoverTwoFactorRequestModel { diff --git a/src/Api/Models/Request/Accounts/RegenerateTwoFactorRequestModel.cs b/src/Core/Models/Api/Request/Accounts/RegenerateTwoFactorRequestModel.cs similarity index 91% rename from src/Api/Models/Request/Accounts/RegenerateTwoFactorRequestModel.cs rename to src/Core/Models/Api/Request/Accounts/RegenerateTwoFactorRequestModel.cs index d3ab5bee21..92091dbf41 100644 --- a/src/Api/Models/Request/Accounts/RegenerateTwoFactorRequestModel.cs +++ b/src/Core/Models/Api/Request/Accounts/RegenerateTwoFactorRequestModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class RegenerateTwoFactorRequestModel { diff --git a/src/Api/Models/Request/Accounts/RegisterRequestModel.cs b/src/Core/Models/Api/Request/Accounts/RegisterRequestModel.cs similarity index 96% rename from src/Api/Models/Request/Accounts/RegisterRequestModel.cs rename to src/Core/Models/Api/Request/Accounts/RegisterRequestModel.cs index f7eb9d9cc5..7168e29116 100644 --- a/src/Api/Models/Request/Accounts/RegisterRequestModel.cs +++ b/src/Core/Models/Api/Request/Accounts/RegisterRequestModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using Bit.Core.Models.Table; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class RegisterRequestModel { diff --git a/src/Api/Models/Request/Accounts/SecurityStampRequestModel.cs b/src/Core/Models/Api/Request/Accounts/SecurityStampRequestModel.cs similarity index 85% rename from src/Api/Models/Request/Accounts/SecurityStampRequestModel.cs rename to src/Core/Models/Api/Request/Accounts/SecurityStampRequestModel.cs index 2a4f96d21d..9aaa488453 100644 --- a/src/Api/Models/Request/Accounts/SecurityStampRequestModel.cs +++ b/src/Core/Models/Api/Request/Accounts/SecurityStampRequestModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class SecurityStampRequestModel { diff --git a/src/Api/Models/Request/Accounts/UpdateProfileRequestModel.cs b/src/Core/Models/Api/Request/Accounts/UpdateProfileRequestModel.cs similarity index 96% rename from src/Api/Models/Request/Accounts/UpdateProfileRequestModel.cs rename to src/Core/Models/Api/Request/Accounts/UpdateProfileRequestModel.cs index ab4692bf15..f4bbf75b60 100644 --- a/src/Api/Models/Request/Accounts/UpdateProfileRequestModel.cs +++ b/src/Core/Models/Api/Request/Accounts/UpdateProfileRequestModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using Bit.Core.Models.Table; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class UpdateProfileRequestModel { diff --git a/src/Api/Models/Request/Accounts/UpdateTwoFactorRequestModel.cs b/src/Core/Models/Api/Request/Accounts/UpdateTwoFactorRequestModel.cs similarity index 92% rename from src/Api/Models/Request/Accounts/UpdateTwoFactorRequestModel.cs rename to src/Core/Models/Api/Request/Accounts/UpdateTwoFactorRequestModel.cs index 24bec8dfc8..ec085a94e2 100644 --- a/src/Api/Models/Request/Accounts/UpdateTwoFactorRequestModel.cs +++ b/src/Core/Models/Api/Request/Accounts/UpdateTwoFactorRequestModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class UpdateTwoFactorRequestModel { diff --git a/src/Api/Models/Request/AuthTokenRequestModel.cs b/src/Core/Models/Api/Request/AuthTokenRequestModel.cs similarity index 91% rename from src/Api/Models/Request/AuthTokenRequestModel.cs rename to src/Core/Models/Api/Request/AuthTokenRequestModel.cs index 6ac5804cb8..499541799b 100644 --- a/src/Api/Models/Request/AuthTokenRequestModel.cs +++ b/src/Core/Models/Api/Request/AuthTokenRequestModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class AuthTokenRequestModel { diff --git a/src/Api/Models/Request/AuthTokenTwoFactorRequestModel.cs b/src/Core/Models/Api/Request/AuthTokenTwoFactorRequestModel.cs similarity index 90% rename from src/Api/Models/Request/AuthTokenTwoFactorRequestModel.cs rename to src/Core/Models/Api/Request/AuthTokenTwoFactorRequestModel.cs index 27a8bca1bc..07a0cc72ec 100644 --- a/src/Api/Models/Request/AuthTokenTwoFactorRequestModel.cs +++ b/src/Core/Models/Api/Request/AuthTokenTwoFactorRequestModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class AuthTokenTwoFactorRequestModel { diff --git a/src/Api/Models/Request/CipherRequestModel.cs b/src/Core/Models/Api/Request/CipherRequestModel.cs similarity index 97% rename from src/Api/Models/Request/CipherRequestModel.cs rename to src/Core/Models/Api/Request/CipherRequestModel.cs index 91477cea76..a12100543c 100644 --- a/src/Api/Models/Request/CipherRequestModel.cs +++ b/src/Core/Models/Api/Request/CipherRequestModel.cs @@ -1,11 +1,11 @@ using System; using System.ComponentModel.DataAnnotations; -using Bit.Api.Utilities; +using Bit.Core.Utilities; using Bit.Core.Models.Table; using Bit.Core.Enums; using Newtonsoft.Json; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class CipherRequestModel { diff --git a/src/Api/Models/Request/DeviceRequestModels.cs b/src/Core/Models/Api/Request/DeviceRequestModels.cs similarity index 97% rename from src/Api/Models/Request/DeviceRequestModels.cs rename to src/Core/Models/Api/Request/DeviceRequestModels.cs index 66ae2566c2..824f1658e1 100644 --- a/src/Api/Models/Request/DeviceRequestModels.cs +++ b/src/Core/Models/Api/Request/DeviceRequestModels.cs @@ -4,7 +4,7 @@ using Bit.Core.Models.Table; using Bit.Core.Enums; using Newtonsoft.Json; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class DeviceRequestModel { diff --git a/src/Api/Models/Request/FolderRequestModel.cs b/src/Core/Models/Api/Request/FolderRequestModel.cs similarity index 93% rename from src/Api/Models/Request/FolderRequestModel.cs rename to src/Core/Models/Api/Request/FolderRequestModel.cs index c76d3a2d4e..ab281b309b 100644 --- a/src/Api/Models/Request/FolderRequestModel.cs +++ b/src/Core/Models/Api/Request/FolderRequestModel.cs @@ -1,10 +1,10 @@ using System; using System.ComponentModel.DataAnnotations; -using Bit.Api.Utilities; +using Bit.Core.Utilities; using Bit.Core.Models.Table; using Newtonsoft.Json; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class FolderRequestModel { diff --git a/src/Api/Models/Request/LoginRequestModel.cs b/src/Core/Models/Api/Request/LoginRequestModel.cs similarity index 96% rename from src/Api/Models/Request/LoginRequestModel.cs rename to src/Core/Models/Api/Request/LoginRequestModel.cs index c78e1b684a..49efedc92d 100644 --- a/src/Api/Models/Request/LoginRequestModel.cs +++ b/src/Core/Models/Api/Request/LoginRequestModel.cs @@ -1,10 +1,10 @@ using System; using System.ComponentModel.DataAnnotations; -using Bit.Api.Utilities; +using Bit.Core.Utilities; using Bit.Core.Models.Table; using Newtonsoft.Json; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class LoginRequestModel { diff --git a/src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs b/src/Core/Models/Api/Request/Organizations/OrganizationCreateRequestModel.cs similarity index 95% rename from src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs rename to src/Core/Models/Api/Request/Organizations/OrganizationCreateRequestModel.cs index 225f3a8b06..e226aa82c7 100644 --- a/src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs +++ b/src/Core/Models/Api/Request/Organizations/OrganizationCreateRequestModel.cs @@ -3,7 +3,7 @@ using Bit.Core.Enums; using Bit.Core.Models.Business; using System; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class OrganizationCreateRequestModel { diff --git a/src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs b/src/Core/Models/Api/Request/Organizations/OrganizationUpdateRequestModel.cs similarity index 91% rename from src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs rename to src/Core/Models/Api/Request/Organizations/OrganizationUpdateRequestModel.cs index 7fd43f4d6d..32918065e6 100644 --- a/src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs +++ b/src/Core/Models/Api/Request/Organizations/OrganizationUpdateRequestModel.cs @@ -1,6 +1,6 @@ using Bit.Core.Models.Table; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class OrganizationUpdateRequestModel { diff --git a/src/Api/Models/Request/Organizations/OrganizationUserCreateRequestModels.cs b/src/Core/Models/Api/Request/Organizations/OrganizationUserCreateRequestModels.cs similarity index 92% rename from src/Api/Models/Request/Organizations/OrganizationUserCreateRequestModels.cs rename to src/Core/Models/Api/Request/Organizations/OrganizationUserCreateRequestModels.cs index 997d74c8f5..1352500a3a 100644 --- a/src/Api/Models/Request/Organizations/OrganizationUserCreateRequestModels.cs +++ b/src/Core/Models/Api/Request/Organizations/OrganizationUserCreateRequestModels.cs @@ -1,6 +1,6 @@ using Bit.Core.Models.Table; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class OrganizationUserInviteRequestModel { diff --git a/src/Api/Models/Request/SubvaultRequestModel.cs b/src/Core/Models/Api/Request/SubvaultRequestModel.cs similarity index 93% rename from src/Api/Models/Request/SubvaultRequestModel.cs rename to src/Core/Models/Api/Request/SubvaultRequestModel.cs index 294998a20e..0e08a38f29 100644 --- a/src/Api/Models/Request/SubvaultRequestModel.cs +++ b/src/Core/Models/Api/Request/SubvaultRequestModel.cs @@ -1,10 +1,10 @@ using System; using System.ComponentModel.DataAnnotations; -using Bit.Api.Utilities; +using Bit.Core.Utilities; using Bit.Core.Models.Table; using Newtonsoft.Json; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class SubvaultCreateRequestModel : SubvaultUpdateRequestModel { diff --git a/src/Api/Models/Request/UpdateDomainsRequestModel.cs b/src/Core/Models/Api/Request/UpdateDomainsRequestModel.cs similarity index 96% rename from src/Api/Models/Request/UpdateDomainsRequestModel.cs rename to src/Core/Models/Api/Request/UpdateDomainsRequestModel.cs index 3d2b75a497..321ab62c8d 100644 --- a/src/Api/Models/Request/UpdateDomainsRequestModel.cs +++ b/src/Core/Models/Api/Request/UpdateDomainsRequestModel.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Bit.Core.Enums; using Newtonsoft.Json; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class UpdateDomainsRequestModel { diff --git a/src/Api/Models/Response/AuthTokenResponseModel.cs b/src/Core/Models/Api/Response/AuthTokenResponseModel.cs similarity index 93% rename from src/Api/Models/Response/AuthTokenResponseModel.cs rename to src/Core/Models/Api/Response/AuthTokenResponseModel.cs index 68e92600ea..b94b7d0e1e 100644 --- a/src/Api/Models/Response/AuthTokenResponseModel.cs +++ b/src/Core/Models/Api/Response/AuthTokenResponseModel.cs @@ -1,7 +1,7 @@ using System; using Bit.Core.Models.Table; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class AuthTokenResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/CipherHistoryResponseModel.cs b/src/Core/Models/Api/Response/CipherHistoryResponseModel.cs similarity index 96% rename from src/Api/Models/Response/CipherHistoryResponseModel.cs rename to src/Core/Models/Api/Response/CipherHistoryResponseModel.cs index b478aa6622..ba7cf39dfe 100644 --- a/src/Api/Models/Response/CipherHistoryResponseModel.cs +++ b/src/Core/Models/Api/Response/CipherHistoryResponseModel.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using Bit.Core.Models.Table; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class CipherHistoryResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/CipherResponseModel.cs b/src/Core/Models/Api/Response/CipherResponseModel.cs similarity index 97% rename from src/Api/Models/Response/CipherResponseModel.cs rename to src/Core/Models/Api/Response/CipherResponseModel.cs index 4e98c98518..daa218eefb 100644 --- a/src/Api/Models/Response/CipherResponseModel.cs +++ b/src/Core/Models/Api/Response/CipherResponseModel.cs @@ -1,7 +1,7 @@ using System; using Bit.Core.Models.Table; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class CipherResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/DeviceResponseModel.cs b/src/Core/Models/Api/Response/DeviceResponseModel.cs similarity index 96% rename from src/Api/Models/Response/DeviceResponseModel.cs rename to src/Core/Models/Api/Response/DeviceResponseModel.cs index b5b9053a45..6110860324 100644 --- a/src/Api/Models/Response/DeviceResponseModel.cs +++ b/src/Core/Models/Api/Response/DeviceResponseModel.cs @@ -2,7 +2,7 @@ using Bit.Core.Models.Table; using Bit.Core.Enums; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class DeviceResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/DomainsResponseModel.cs b/src/Core/Models/Api/Response/DomainsResponseModel.cs similarity index 98% rename from src/Api/Models/Response/DomainsResponseModel.cs rename to src/Core/Models/Api/Response/DomainsResponseModel.cs index 1f5502d02d..383f7549a1 100644 --- a/src/Api/Models/Response/DomainsResponseModel.cs +++ b/src/Core/Models/Api/Response/DomainsResponseModel.cs @@ -5,7 +5,7 @@ using Newtonsoft.Json; using Bit.Core.Enums; using System.Linq; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class DomainsResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/ErrorResponseModel.cs b/src/Core/Models/Api/Response/ErrorResponseModel.cs similarity index 97% rename from src/Api/Models/Response/ErrorResponseModel.cs rename to src/Core/Models/Api/Response/ErrorResponseModel.cs index 3041617656..13067d085e 100644 --- a/src/Api/Models/Response/ErrorResponseModel.cs +++ b/src/Core/Models/Api/Response/ErrorResponseModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Mvc.ModelBinding; -namespace Bit.Api.Models.Response +namespace Bit.Core.Models.Api { public class ErrorResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/FolderResponseModel.cs b/src/Core/Models/Api/Response/FolderResponseModel.cs similarity index 96% rename from src/Api/Models/Response/FolderResponseModel.cs rename to src/Core/Models/Api/Response/FolderResponseModel.cs index d831af35f5..16a5ec3eb5 100644 --- a/src/Api/Models/Response/FolderResponseModel.cs +++ b/src/Core/Models/Api/Response/FolderResponseModel.cs @@ -1,7 +1,7 @@ using System; using Bit.Core.Models.Table; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class FolderResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/KeysResponseModel.cs b/src/Core/Models/Api/Response/KeysResponseModel.cs similarity index 94% rename from src/Api/Models/Response/KeysResponseModel.cs rename to src/Core/Models/Api/Response/KeysResponseModel.cs index 632befadef..35b1d22730 100644 --- a/src/Api/Models/Response/KeysResponseModel.cs +++ b/src/Core/Models/Api/Response/KeysResponseModel.cs @@ -1,7 +1,7 @@ using System; using Bit.Core.Models.Table; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class KeysResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/ListResponseModel.cs b/src/Core/Models/Api/Response/ListResponseModel.cs similarity index 91% rename from src/Api/Models/Response/ListResponseModel.cs rename to src/Core/Models/Api/Response/ListResponseModel.cs index db25e685e4..092dd7230b 100644 --- a/src/Api/Models/Response/ListResponseModel.cs +++ b/src/Core/Models/Api/Response/ListResponseModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class ListResponseModel : ResponseModel where T : ResponseModel { diff --git a/src/Api/Models/Response/LoginResponseModel.cs b/src/Core/Models/Api/Response/LoginResponseModel.cs similarity index 97% rename from src/Api/Models/Response/LoginResponseModel.cs rename to src/Core/Models/Api/Response/LoginResponseModel.cs index 02131565a1..2fd2dae7fa 100644 --- a/src/Api/Models/Response/LoginResponseModel.cs +++ b/src/Core/Models/Api/Response/LoginResponseModel.cs @@ -1,7 +1,7 @@ using System; using Bit.Core.Models.Table; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class LoginResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/OrganizationResponseModel.cs b/src/Core/Models/Api/Response/OrganizationResponseModel.cs similarity index 97% rename from src/Api/Models/Response/OrganizationResponseModel.cs rename to src/Core/Models/Api/Response/OrganizationResponseModel.cs index 6497ac6b7e..37bd7cb0c0 100644 --- a/src/Api/Models/Response/OrganizationResponseModel.cs +++ b/src/Core/Models/Api/Response/OrganizationResponseModel.cs @@ -1,7 +1,7 @@ using System; using Bit.Core.Models.Table; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class OrganizationResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/OrganizationUserResponseModel.cs b/src/Core/Models/Api/Response/OrganizationUserResponseModel.cs similarity index 97% rename from src/Api/Models/Response/OrganizationUserResponseModel.cs rename to src/Core/Models/Api/Response/OrganizationUserResponseModel.cs index 60dd16d8b4..ceb4a0a97a 100644 --- a/src/Api/Models/Response/OrganizationUserResponseModel.cs +++ b/src/Core/Models/Api/Response/OrganizationUserResponseModel.cs @@ -2,7 +2,7 @@ using Bit.Core.Enums; using Bit.Core.Models.Data; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class OrganizationUserResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/ProfileOrganizationResponseModel.cs b/src/Core/Models/Api/Response/ProfileOrganizationResponseModel.cs similarity index 95% rename from src/Api/Models/Response/ProfileOrganizationResponseModel.cs rename to src/Core/Models/Api/Response/ProfileOrganizationResponseModel.cs index a433a546e7..9eba8bf9a8 100644 --- a/src/Api/Models/Response/ProfileOrganizationResponseModel.cs +++ b/src/Core/Models/Api/Response/ProfileOrganizationResponseModel.cs @@ -1,7 +1,7 @@ using Bit.Core.Enums; using Bit.Core.Models.Data; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class ProfileOrganizationResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/ProfileResponseModel.cs b/src/Core/Models/Api/Response/ProfileResponseModel.cs similarity index 97% rename from src/Api/Models/Response/ProfileResponseModel.cs rename to src/Core/Models/Api/Response/ProfileResponseModel.cs index c64afed8f2..0f7f5ba1ad 100644 --- a/src/Api/Models/Response/ProfileResponseModel.cs +++ b/src/Core/Models/Api/Response/ProfileResponseModel.cs @@ -5,7 +5,7 @@ using System.Linq; using Bit.Core.Models.Data; using Bit.Core.Enums; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class ProfileResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/ResponseModel.cs b/src/Core/Models/Api/Response/ResponseModel.cs similarity index 92% rename from src/Api/Models/Response/ResponseModel.cs rename to src/Core/Models/Api/Response/ResponseModel.cs index d2a8d57935..0b9ea320d6 100644 --- a/src/Api/Models/Response/ResponseModel.cs +++ b/src/Core/Models/Api/Response/ResponseModel.cs @@ -1,6 +1,6 @@ using System; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public abstract class ResponseModel { diff --git a/src/Api/Models/Response/SubvaultResponseModel.cs b/src/Core/Models/Api/Response/SubvaultResponseModel.cs similarity index 95% rename from src/Api/Models/Response/SubvaultResponseModel.cs rename to src/Core/Models/Api/Response/SubvaultResponseModel.cs index 0a15f6e7a2..436182a33d 100644 --- a/src/Api/Models/Response/SubvaultResponseModel.cs +++ b/src/Core/Models/Api/Response/SubvaultResponseModel.cs @@ -1,7 +1,7 @@ using System; using Bit.Core.Models.Table; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class SubvaultResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/TwoFactorResponseModel.cs b/src/Core/Models/Api/Response/TwoFactorResponseModel.cs similarity index 96% rename from src/Api/Models/Response/TwoFactorResponseModel.cs rename to src/Core/Models/Api/Response/TwoFactorResponseModel.cs index 43a0109788..2c9b0ad385 100644 --- a/src/Api/Models/Response/TwoFactorResponseModel.cs +++ b/src/Core/Models/Api/Response/TwoFactorResponseModel.cs @@ -2,7 +2,7 @@ using Bit.Core.Models.Table; using Bit.Core.Enums; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class TwoFactorResponseModel : ResponseModel { diff --git a/src/Api/Models/Response/UserKeyResponseModel.cs b/src/Core/Models/Api/Response/UserKeyResponseModel.cs similarity index 93% rename from src/Api/Models/Response/UserKeyResponseModel.cs rename to src/Core/Models/Api/Response/UserKeyResponseModel.cs index 7366d90c5e..f4e1d8cdcb 100644 --- a/src/Api/Models/Response/UserKeyResponseModel.cs +++ b/src/Core/Models/Api/Response/UserKeyResponseModel.cs @@ -2,7 +2,7 @@ using Bit.Core.Models.Table; using Bit.Core.Enums; -namespace Bit.Api.Models +namespace Bit.Core.Models.Api { public class UserKeyResponseModel : ResponseModel { diff --git a/src/Api/Utilities/EncryptedValueAttribute.cs b/src/Core/Utilities/EncryptedValueAttribute.cs similarity index 98% rename from src/Api/Utilities/EncryptedValueAttribute.cs rename to src/Core/Utilities/EncryptedValueAttribute.cs index 65408c1662..5772ea64d8 100644 --- a/src/Api/Utilities/EncryptedValueAttribute.cs +++ b/src/Core/Utilities/EncryptedValueAttribute.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace Bit.Api.Utilities +namespace Bit.Core.Utilities { /// /// Validates a string that is in encrypted form: "b64iv=|b64ct="