move all models into core

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;

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;

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;
 

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;

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;

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;

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;
 

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;
 

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

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;
 

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
 {

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;

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;

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;

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

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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<T> : ResponseModel where T : ResponseModel
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

src/Core/Utilities/EncryptedValueAttribute.cs

@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Utilities
+namespace Bit.Core.Utilities
 {
     /// <summary>
     /// Validates a string that is in encrypted form: "b64iv=|b64ct="