Move request/response models (#1754)

bitwarden_license/src/Sso/Controllers/AccountController.cs

@@ -23,7 +23,6 @@ using System.Threading.Tasks;
 using Bit.Core.Models;
 using Bit.Core.Models.Api;
 using Bit.Core.Utilities;
-using System.Text.Json;
 using Bit.Core.Models.Data;
 using Bit.Core.Settings;
 

src/Api/Controllers/AccountsController.cs

@@ -2,8 +2,6 @@
 using Bit.Core;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Api;
-using Bit.Core.Models.Api.Request.Accounts;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Table;
@@ -17,6 +15,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Bit.Api.Models.Request;
+using Bit.Api.Models.Request.Accounts;
+using Bit.Api.Models.Response;
 using Bit.Core.Enums.Provider;
 
 namespace Bit.Api.Controllers

src/Api/Controllers/CiphersController.cs

@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Models.Api;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
 using Bit.Core.Context;
@@ -15,6 +14,10 @@ using Bit.Core.Models.Table;
 using Bit.Core.Settings;
 using Core.Models.Data;
 using Azure.Messaging.EventGrid;
+using Bit.Api.Models.Request;
+using Bit.Api.Models.Request.Accounts;
+using Bit.Api.Models.Request.Organizations;
+using Bit.Api.Models.Response;
 using Bit.Core.Models.Data;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
@@ -600,8 +603,8 @@ namespace Bit.Api.Controllers
                 throw new BadRequestException($"Max file size is {CipherService.MAX_FILE_SIZE_READABLE}.");
             }
 
-
-            var (attachmentId, uploadUrl) = await _cipherService.CreateAttachmentForDelayedUploadAsync(cipher, request, userId);
+            var (attachmentId, uploadUrl) = await _cipherService.CreateAttachmentForDelayedUploadAsync(cipher,
+                request.Key, request.FileName, request.FileSize, request.AdminRequest, userId);
             return new AttachmentUploadDataResponseModel
             {
                 AttachmentId = attachmentId,
@@ -713,7 +716,8 @@ namespace Bit.Api.Controllers
         {
             var userId = _userService.GetProperUserId(User).Value;
             var cipher = await _cipherRepository.GetByIdAsync(new Guid(id), userId);
-            return await _cipherService.GetAttachmentDownloadDataAsync(cipher, attachmentId);
+            var result = await _cipherService.GetAttachmentDownloadDataAsync(cipher, attachmentId);
+            return new AttachmentResponseModel(result.Id, result.Data, result.Cipher, _globalSettings);
         }
 
         [HttpPost("{id}/attachment/{attachmentId}/share")]

src/Api/Controllers/CollectionsController.cs

@@ -4,12 +4,13 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Models.Api;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
 using Bit.Core.Context;
 using Bit.Core.Models.Table;
 using System.Collections.Generic;
+using Bit.Api.Models.Request;
+using Bit.Api.Models.Response;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/DevicesController.cs

@@ -2,10 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Bit.Api.Models.Request;
+using Bit.Api.Models.Response;
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Models.Api;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Table;
 using Bit.Core.Services;

src/Api/Controllers/EmergencyAccessController.cs

@@ -1,13 +1,14 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Bit.Api.Models.Request;
+using Bit.Api.Models.Request.Organizations;
+using Bit.Api.Models.Response;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Api;
-using Bit.Core.Models.Api.Request;
-using Bit.Core.Models.Api.Response;
 using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
+using Bit.Core.Settings;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -20,15 +21,18 @@ namespace Bit.Api.Controllers
         private readonly IUserService _userService;
         private readonly IEmergencyAccessRepository _emergencyAccessRepository;
         private readonly IEmergencyAccessService _emergencyAccessService;
+        private readonly IGlobalSettings _globalSettings;
 
         public EmergencyAccessController(
             IUserService userService,
             IEmergencyAccessRepository emergencyAccessRepository,
-            IEmergencyAccessService emergencyAccessService)
+            IEmergencyAccessService emergencyAccessService,
+            IGlobalSettings globalSettings)
         {
             _userService = userService;
             _emergencyAccessRepository = emergencyAccessRepository;
             _emergencyAccessService = emergencyAccessService;
+            _globalSettings = globalSettings;
         }
 
         [HttpGet("trusted")]
@@ -161,14 +165,17 @@ namespace Bit.Api.Controllers
         public async Task<EmergencyAccessViewResponseModel> ViewCiphers(string id)
         {
             var user = await _userService.GetUserByPrincipalAsync(User);
-            return await _emergencyAccessService.ViewAsync(new Guid(id), user);
+            var viewResult = await _emergencyAccessService.ViewAsync(new Guid(id), user);
+            return new EmergencyAccessViewResponseModel(_globalSettings, viewResult.EmergencyAccess, viewResult.Ciphers);
         }
 
         [HttpGet("{id}/{cipherId}/attachment/{attachmentId}")]
         public async Task<AttachmentResponseModel> GetAttachmentData(string id, string cipherId, string attachmentId)
         {
             var user = await _userService.GetUserByPrincipalAsync(User);
-            return await _emergencyAccessService.GetAttachmentDownloadAsync(new Guid(id), cipherId, attachmentId, user);
+            var result =
+                await _emergencyAccessService.GetAttachmentDownloadAsync(new Guid(id), cipherId, attachmentId, user);
+            return new AttachmentResponseModel(result.Id, result.Data, result.Cipher, _globalSettings);
         }
     }
 }

src/Api/Controllers/EventsController.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Bit.Api.Models.Response;
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Api;
 using Bit.Core.Services;
 using Bit.Core.Context;
 using Bit.Core.Models.Data;

src/Api/Controllers/FoldersController.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Bit.Api.Models.Request;
+using Bit.Api.Models.Response;
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Models.Api;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
 

src/Api/Controllers/GroupsController.cs

@@ -4,11 +4,12 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Models.Api;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
 using Bit.Core.Context;
 using System.Collections.Generic;
+using Bit.Api.Models.Request;
+using Bit.Api.Models.Response;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/InstallationsController.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Threading.Tasks;
+using Bit.Api.Models.Request;
+using Bit.Api.Models.Response;
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Repositories;
-using Bit.Core.Models.Api;
 using Microsoft.AspNetCore.Authorization;
 using Bit.Core.Exceptions;
 using Bit.Core.Utilities;

src/Api/Controllers/MiscController.cs

@@ -1,12 +1,10 @@
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Models.Api;
+using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
+using Bit.Api.Models.Request;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Bit.Core.Settings;
 using Stripe;
-using System.Linq;
-using System.Collections.Generic;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/OrganizationSponsorshipsController.cs

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

src/Api/Controllers/OrganizationUsersController.cs

@@ -4,11 +4,12 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Models.Api;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
 using Bit.Core.Context;
 using System.Collections.Generic;
+using Bit.Api.Models.Request.Organizations;
+using Bit.Api.Models.Response;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Data;
@@ -136,7 +137,7 @@ namespace Bit.Api.Controllers
 
             var userId = _userService.GetProperUserId(User);
             var result = await _organizationService.InviteUsersAsync(orgGuidId, userId.Value,
-                new (OrganizationUserInvite, string)[] { (new OrganizationUserInvite(model), null) });
+                new (OrganizationUserInvite, string)[] { (new OrganizationUserInvite(model.ToData()), null) });
         }
         
         [HttpPost("reinvite")]

src/Api/Controllers/OrganizationsController.cs

@@ -1,16 +1,18 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Bit.Api.Models.Request;
+using Bit.Api.Models.Request.Accounts;
+using Bit.Api.Models.Request.Organizations;
+using Bit.Api.Models.Response;
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
 using Bit.Core.Enums;
-using Bit.Core.Models.Api;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
 using Bit.Core.Context;
 using Bit.Api.Utilities;
-using Bit.Core.Models.Api.Response;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;

src/Api/Controllers/PlansController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Utilities;
-using Bit.Core.Models.Api;
 using System.Linq;
 using Bit.Core.Repositories;
 using System.Threading.Tasks;
+using Bit.Api.Models.Response;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/PoliciesController.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Bit.Api.Models.Request;
+using Bit.Api.Models.Response;
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Models.Api;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
 using Bit.Core.Context;

src/Api/Controllers/ProviderOrganizationsController.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Bit.Api.Models.Request.Providers;
+using Bit.Api.Models.Response;
+using Bit.Api.Models.Response.Providers;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Api;
-using Bit.Core.Models.Api.Request;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Utilities;

src/Api/Controllers/ProviderUsersController.cs

@@ -2,10 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Bit.Api.Models.Request.Providers;
+using Bit.Api.Models.Response;
+using Bit.Api.Models.Response.Providers;
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Models.Api;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
 using Bit.Core.Context;

src/Api/Controllers/ProvidersController.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Threading.Tasks;
+using Bit.Api.Models.Request.Providers;
+using Bit.Api.Models.Response.Providers;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Api;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;

src/Api/Controllers/PushController.cs

@@ -1,14 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Services;
 using Microsoft.AspNetCore.Authorization;
-using Bit.Core;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Api;
 using System.Threading.Tasks;
 using System.Linq;
 using Microsoft.AspNetCore.Hosting;
-using Bit.Api.Utilities;
+using Bit.Core.Models.Api;
 using Bit.Core.Utilities;
 using Bit.Core.Settings;
 using Microsoft.Extensions.Hosting;

src/Api/Controllers/SendsController.cs

@@ -4,17 +4,17 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Models.Api;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Bit.Core.Settings;
-using Bit.Core.Models.Api.Response;
 using Bit.Core.Enums;
 using Bit.Core.Context;
 using Azure.Messaging.EventGrid;
 using Bit.Api.Utilities;
 using System.Collections.Generic;
+using Bit.Api.Models.Request;
+using Bit.Api.Models.Response;
 using Bit.Core.Models.Table;
 using Newtonsoft.Json;
 using Bit.Core.Models.Data;

src/Api/Controllers/SettingsController.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Threading.Tasks;
+using Bit.Api.Models.Request;
+using Bit.Api.Models.Response;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Models.Api;
 using Bit.Core.Services;
 
 namespace Bit.Api.Controllers

src/Api/Controllers/SyncController.cs

@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Models.Api;
 using Bit.Core.Services;
 using Bit.Core.Repositories;
 using Bit.Core.Enums;
@@ -10,6 +9,7 @@ using Bit.Core.Exceptions;
 using System.Linq;
 using Bit.Core.Models.Table;
 using System.Collections.Generic;
+using Bit.Api.Models.Response;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Data;
 using Bit.Core.Settings;

src/Api/Controllers/TwoFactorController.cs

@@ -2,13 +2,16 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Models.Api;
 using Bit.Core.Exceptions;
 using Bit.Core.Services;
 using Microsoft.AspNetCore.Identity;
 using Bit.Core.Models.Table;
 using Bit.Core.Enums;
 using System.Linq;
+using Bit.Api.Models.Request;
+using Bit.Api.Models.Request.Accounts;
+using Bit.Api.Models.Response;
+using Bit.Api.Models.Response.TwoFactor;
 using Bit.Core.Context;
 using Bit.Core.Repositories;
 using Bit.Core.Utilities;

src/Api/Controllers/UsersController.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Threading.Tasks;
+using Bit.Api.Models.Response;
 using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Api;
 
 namespace Bit.Api.Controllers
 {

src/Api/Models/CipherAttachmentModel.cs

@@ -1,7 +1,7 @@
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models
 {
     public class CipherAttachmentModel
     {

src/Api/Models/CipherCardModel.cs

@@ -2,7 +2,7 @@
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models
 {
     public class CipherCardModel
     {

src/Api/Models/CipherFieldModel.cs

@@ -1,9 +1,8 @@
-using System.ComponentModel.DataAnnotations;
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models
 {
     public class CipherFieldModel
     {
@@ -23,5 +22,16 @@ namespace Bit.Core.Models.Api
         [EncryptedStringLength(5000)]
         public string Value { get; set; }
         public int? LinkedId { get; set; }
+
+        public CipherFieldData ToCipherFieldData()
+        {
+            return new CipherFieldData
+            {
+                Type = Type,
+                Name = Name,
+                Value = Value,
+                LinkedId = LinkedId ?? null,
+            };
+        }
     }
 }

src/Api/Models/CipherIdentityModel.cs

@@ -2,7 +2,7 @@
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models
 {
     public class CipherIdentityModel
     {

src/Api/Models/CipherLoginModel.cs

@@ -1,12 +1,11 @@
 using System;
-using System.ComponentModel.DataAnnotations;
-using Bit.Core.Utilities;
-using Bit.Core.Enums;
 using System.Collections.Generic;
 using System.Linq;
+using Bit.Core.Enums;
 using Bit.Core.Models.Data;
+using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models
 {
     public class CipherLoginModel
     {
@@ -79,6 +78,11 @@ namespace Bit.Core.Models.Api
             [EncryptedStringLength(10000)]
             public string Uri { get; set; }
             public UriMatchType? Match { get; set; } = null;
+
+            public CipherLoginData.CipherLoginUriData ToCipherLoginUriData()
+            {
+                return new CipherLoginData.CipherLoginUriData { Uri = Uri, Match = Match, };
+            }
         }
     }
 }

src/Api/Models/CipherPasswordHistoryModel.cs

@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models
 {
     public class CipherPasswordHistoryModel
     {
@@ -21,5 +21,10 @@ namespace Bit.Core.Models.Api
         public string Password { get; set; }
         [Required]
         public DateTime? LastUsedDate { get; set; }
+
+        public CipherPasswordHistoryData ToCipherPasswordHistoryData()
+        {
+            return new CipherPasswordHistoryData { Password = Password, LastUsedDate = LastUsedDate.Value, };
+        }
     }
 }

src/Api/Models/CipherSecureNoteModel.cs

@@ -1,7 +1,7 @@
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models
 {
     public class CipherSecureNoteModel
     {

src/Api/Models/Public/AssociationWithPermissionsBaseModel.cs

@@ -1,8 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using Newtonsoft.Json;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public
 {
     public abstract class AssociationWithPermissionsBaseModel
     {

src/Api/Models/Public/CollectionBaseModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public
 {
     public abstract class CollectionBaseModel
     {

src/Api/Models/Public/GroupBaseModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public
 {
     public abstract class GroupBaseModel
     {

src/Api/Models/Public/MemberBaseModel.cs

@@ -4,7 +4,7 @@ using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Table;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public
 {
     public abstract class MemberBaseModel
     {

src/Api/Models/Public/PolicyBaseModel.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public
 {
     public abstract class PolicyBaseModel
     {

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

@@ -1,6 +1,6 @@
 using Bit.Core.Models.Data;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Request
 {
     public class AssociationWithPermissionsRequestModel : AssociationWithPermissionsBaseModel
     {

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

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Bit.Core.Models.Table;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Request
 {
     public class CollectionUpdateRequestModel : CollectionBaseModel
     {

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

@@ -1,7 +1,7 @@
 using System;
 using Bit.Core.Exceptions;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Request
 {
     public class EventFilterRequestModel
     {

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

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Bit.Core.Models.Table;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Request
 {
     public class GroupCreateUpdateRequestModel : GroupBaseModel
     {

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

@@ -1,10 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Models.Table;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Request
 {
     public class MemberCreateRequestModel : MemberUpdateRequestModel
     {

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

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Bit.Core.Models.Table;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Request
 {
     public class MemberUpdateRequestModel : MemberBaseModel
     {

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

@@ -1,9 +1,10 @@
-using Bit.Core.Models.Business;
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Models.Business;
+using Table = Bit.Core.Models.Table;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Request
 {
     public class OrganizationImportRequestModel
     {

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

@@ -2,7 +2,7 @@
 using Bit.Core.Models.Table;
 using Newtonsoft.Json;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Request
 {
     public class PolicyUpdateRequestModel : PolicyBaseModel
     {

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

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Request
 {
     public class UpdateGroupIdsRequestModel
     {

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

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Request
 {
     public class UpdateMemberIdsRequestModel
     {

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

@@ -1,7 +1,7 @@
 using System;
 using Bit.Core.Models.Data;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Response
 {
     public class AssociationWithPermissionsResponseModel : AssociationWithPermissionsBaseModel
     {

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

@@ -5,7 +5,7 @@ using System.Linq;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Table;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Response
 {
     /// <summary>
     /// A collection.

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

@@ -1,9 +1,9 @@
-using System.Linq;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Response
 {
     public class ErrorResponseModel : IResponseModel
     {

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

@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Response
 {
     /// <summary>
     /// An event log.

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

@@ -5,7 +5,7 @@ using System.Linq;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Table;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Response
 {
     /// <summary>
     /// A user group.

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

@@ -1,4 +1,4 @@
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Response
 {
     public interface IResponseModel
     {

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

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Response
 {
     public class ListResponseModel<T> : IResponseModel where T : IResponseModel
     {

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

@@ -6,7 +6,7 @@ using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Table;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Response
 {
     /// <summary>
     /// An organization member.

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

@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Enums;
 using Bit.Core.Models.Table;
 using Newtonsoft.Json;
 
-namespace Bit.Core.Models.Api.Public
+namespace Bit.Api.Models.Public.Response
 {
     /// <summary>
     /// A policy.
@@ -43,6 +44,6 @@ namespace Bit.Core.Models.Api.Public
         /// The type of policy.
         /// </summary>
         [Required]
-        public Enums.PolicyType? Type { get; set; }
+        public PolicyType? Type { get; set; }
     }
 }

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

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class DeleteRecoverRequestModel
     {

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

@@ -1,8 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
-using Bit.Core.Models.Api;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class EmailRequestModel : SecretVerificationRequestModel
     {

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

@@ -1,8 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
-using Bit.Core.Models.Api;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class EmailTokenRequestModel : SecretVerificationRequestModel
     {

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

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class ImportCiphersRequestModel
     {

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

@@ -1,9 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class KdfRequestModel : PasswordRequestModel, IValidatableObject
     {

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

@@ -1,7 +1,7 @@
-using Bit.Core.Models.Table;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
+using Bit.Core.Models.Table;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class KeysRequestModel
     {

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

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class PasswordHintRequestModel
     {

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

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class PasswordRequestModel : SecretVerificationRequestModel
     {

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

@@ -1,7 +1,6 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class PreloginRequestModel
     {

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

@@ -1,16 +1,15 @@
-using Microsoft.AspNetCore.Http;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Collections.Generic;
-using Bit.Core.Enums;
 using Bit.Core.Settings;
+using Microsoft.AspNetCore.Http;
+using Enums = Bit.Core.Enums;
 
-
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class PremiumRequestModel : IValidatableObject
     {
         [Required]
-        public PaymentMethodType? PaymentMethodType { get; set; }
+        public Enums.PaymentMethodType? PaymentMethodType { get; set; }
         public string PaymentToken { get; set; }
         [Range(0, 99)]
         public short? AdditionalStorageGb { get; set; }

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

@@ -1,7 +1,6 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class RegenerateTwoFactorRequestModel
     {

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

@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
-using Bit.Core.Models.Business;
+using Bit.Core.Models.Api;
 using Bit.Core.Models.Table;
 using Bit.Core.Utilities;
 using Newtonsoft.Json;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class RegisterRequestModel : IValidatableObject, ICaptchaProtectedModel
     {

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

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class SecretVerificationRequestModel : IValidatableObject
     {

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

@@ -2,7 +2,7 @@
 using Bit.Core.Enums;
 using Bit.Core.Models.Table;
 
-namespace Bit.Core.Models.Api.Request.Accounts
+namespace Bit.Api.Models.Request.Accounts
 {
     public class SetKeyConnectorKeyRequestModel
     {

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

@@ -2,7 +2,7 @@
 using Bit.Core.Enums;
 using Bit.Core.Models.Table;
 
-namespace Bit.Core.Models.Api.Request.Accounts
+namespace Bit.Api.Models.Request.Accounts
 {
     public class SetPasswordRequestModel
     {

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

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class StorageRequestModel : IValidatableObject
     {

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

@@ -1,7 +1,7 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class TaxInfoUpdateRequestModel : IValidatableObject
     {

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

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class UpdateKeyRequestModel
     {

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

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Models.Table;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class UpdateProfileRequestModel
     {

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

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
+using Bit.Api.Models.Request.Organizations;
 
-namespace Bit.Core.Models.Api.Request.Accounts
+namespace Bit.Api.Models.Request.Accounts
 {
     public class UpdateTempPasswordRequestModel : OrganizationUserResetPasswordRequestModel
     {

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

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class VerifyDeleteRecoverRequestModel
     {

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

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class VerifyEmailRequestModel
     {

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

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Accounts
 {
     public class VerifyOTPRequestModel
     {

src/Api/Models/Request/AttachmentRequestModel.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request
 {
     public class AttachmentRequestModel
     {

src/Api/Models/Request/BitPayInvoiceRequestModel.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Settings;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request
 {
     public class BitPayInvoiceRequestModel : IValidatableObject
     {

src/Api/Models/Request/CipherPartialRequestModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request
 {
     public class CipherPartialRequestModel
     {

src/Api/Models/Request/CipherRequestModel.cs

@@ -1,16 +1,16 @@
 using System;
-using System.ComponentModel.DataAnnotations;
-using Bit.Core.Utilities;
-using Bit.Core.Models.Table;
-using Bit.Core.Enums;
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using Core.Models.Data;
+using Bit.Core.Enums;
 using Bit.Core.Models.Data;
+using Bit.Core.Models.Table;
+using Bit.Core.Utilities;
+using Core.Models.Data;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request
 {
     public class CipherRequestModel
     {
@@ -69,21 +69,21 @@ namespace Bit.Core.Models.Api
             switch (existingCipher.Type)
             {
                 case CipherType.Login:
-                    var loginObj = JObject.FromObject(new CipherLoginData(this),
+                    var loginObj = JObject.FromObject(ToCipherLoginData(),
                         new JsonSerializer { NullValueHandling = NullValueHandling.Ignore });
                     loginObj[nameof(CipherLoginData.Uri)]?.Parent?.Remove();
                     existingCipher.Data = loginObj.ToString(Formatting.None);
                     break;
                 case CipherType.Card:
-                    existingCipher.Data = JsonConvert.SerializeObject(new CipherCardData(this),
+                    existingCipher.Data = JsonConvert.SerializeObject(ToCipherCardData(),
                         new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
                     break;
                 case CipherType.Identity:
-                    existingCipher.Data = JsonConvert.SerializeObject(new CipherIdentityData(this),
+                    existingCipher.Data = JsonConvert.SerializeObject(ToCipherIdentityData(),
                         new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
                     break;
                 case CipherType.SecureNote:
-                    existingCipher.Data = JsonConvert.SerializeObject(new CipherSecureNoteData(this),
+                    existingCipher.Data = JsonConvert.SerializeObject(ToCipherSecureNoteData(),
                         new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
                     break;
                 default:
@@ -151,6 +151,87 @@ namespace Bit.Core.Models.Api
                 Edit = true
             });
         }
+
+        private CipherLoginData ToCipherLoginData()
+        {
+            return new CipherLoginData
+            {
+                Name = Name,
+                Notes = Notes,
+                Fields = Fields?.Select(f => f.ToCipherFieldData()),
+                PasswordHistory = PasswordHistory?.Select(ph => ph.ToCipherPasswordHistoryData()),
+
+                Uris =
+                    Login.Uris?.Where(u => u != null)
+                        .Select(u => u.ToCipherLoginUriData()),
+                Username = Login.Username,
+                Password = Login.Password,
+                PasswordRevisionDate = Login.PasswordRevisionDate,
+                Totp = Login.Totp,
+                AutofillOnPageLoad = Login.AutofillOnPageLoad,
+            };
+        }
+
+        private CipherIdentityData ToCipherIdentityData()
+        {
+            return new CipherIdentityData
+            {
+                Name = Name,
+                Notes = Notes,
+                Fields = Fields?.Select(f => f.ToCipherFieldData()),
+                PasswordHistory = PasswordHistory?.Select(ph => ph.ToCipherPasswordHistoryData()),
+
+                Title = Identity.Title,
+                FirstName = Identity.FirstName,
+                MiddleName = Identity.MiddleName,
+                LastName = Identity.LastName,
+                Address1 = Identity.Address1,
+                Address2 = Identity.Address2,
+                Address3 = Identity.Address3,
+                City = Identity.City,
+                State = Identity.State,
+                PostalCode = Identity.PostalCode,
+                Country = Identity.Country,
+                Company = Identity.Company,
+                Email = Identity.Email,
+                Phone = Identity.Phone,
+                SSN = Identity.SSN,
+                Username = Identity.Username,
+                PassportNumber = Identity.PassportNumber,
+                LicenseNumber = Identity.LicenseNumber,
+            };
+        }
+
+        private CipherCardData ToCipherCardData()
+        {
+            return new CipherCardData
+            {
+                Name = Name,
+                Notes = Notes,
+                Fields = Fields?.Select(f => f.ToCipherFieldData()),
+                PasswordHistory = PasswordHistory?.Select(ph => ph.ToCipherPasswordHistoryData()),
+
+                CardholderName = Card.CardholderName,
+                Brand = Card.Brand,
+                Number = Card.Number,
+                ExpMonth = Card.ExpMonth,
+                ExpYear = Card.ExpYear,
+                Code = Card.Code,
+            };
+        }
+
+        private CipherSecureNoteData ToCipherSecureNoteData()
+        {
+            return new CipherSecureNoteData
+            {
+                Name = Name,
+                Notes = Notes,
+                Fields = Fields?.Select(f => f.ToCipherFieldData()),
+                PasswordHistory = PasswordHistory?.Select(ph => ph.ToCipherPasswordHistoryData()),
+
+                Type = SecureNote.Type,
+            };
+        }
     }
 
     public class CipherWithIdRequestModel : CipherRequestModel

src/Api/Models/Request/CollectionRequestModel.cs

@@ -1,11 +1,10 @@
 using System;
-using System.ComponentModel.DataAnnotations;
-using Bit.Core.Utilities;
-using Bit.Core.Models.Table;
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Bit.Core.Models.Table;
+using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request
 {
     public class CollectionRequestModel
     {

src/Api/Models/Request/DeviceRequestModels.cs

@@ -1,10 +1,9 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Models.Table;
 using Bit.Core.Enums;
-using Newtonsoft.Json;
+using Bit.Core.Models.Table;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request
 {
     public class DeviceRequestModel
     {

src/Api/Models/Request/EmergencyAccessRequstModels.cs

@@ -1,8 +1,9 @@
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Utilities;
+using Bit.Core.Enums;
 using Bit.Core.Models.Table;
+using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Api.Request
+namespace Bit.Api.Models.Request
 {
     public class EmergencyAccessInviteRequestModel
     {
@@ -11,7 +12,7 @@ namespace Bit.Core.Models.Api.Request
         [StringLength(256)]
         public string Email { get; set; }
         [Required]
-        public Enums.EmergencyAccessType? Type { get; set; }
+        public EmergencyAccessType? Type { get; set; }
         [Required]
         public int WaitTimeDays { get; set; }
     }
@@ -19,7 +20,7 @@ namespace Bit.Core.Models.Api.Request
     public class EmergencyAccessUpdateRequestModel
     {
         [Required]
-        public Enums.EmergencyAccessType Type { get; set; }
+        public EmergencyAccessType Type { get; set; }
         [Required]
         public int WaitTimeDays { get; set; }
         public string KeyEncrypted { get; set; }

src/Api/Models/Request/FolderRequestModel.cs

@@ -1,10 +1,9 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Utilities;
 using Bit.Core.Models.Table;
-using Newtonsoft.Json;
+using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request
 {
     public class FolderRequestModel
     {

src/Api/Models/Request/GroupRequestModel.cs

@@ -1,10 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Models.Table;
-using Newtonsoft.Json;
-using System.Collections.Generic;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request
 {
     public class GroupRequestModel
     {

src/Api/Models/Request/IapCheckRequestModel.cs

@@ -1,13 +1,13 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Bit.Core.Enums;
+using Enums = Bit.Core.Enums;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request
 {
     public class IapCheckRequestModel : IValidatableObject
     {
         [Required]
-        public PaymentMethodType? PaymentMethodType { get; set; }
+        public Enums.PaymentMethodType? PaymentMethodType { get; set; }
 
         public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
         {

src/Api/Models/Request/InstallationRequestModel.cs

@@ -1,7 +1,8 @@
-using Bit.Core.Models.Table;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
+using Bit.Core.Models.Table;
+using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request
 {
     public class InstallationRequestModel
     {
@@ -14,7 +15,7 @@ namespace Bit.Core.Models.Api
         {
             return new Installation
             {
-                Key = Utilities.CoreHelpers.SecureRandomString(20),
+                Key = CoreHelpers.SecureRandomString(20),
                 Email = Email,
                 Enabled = true
             };

src/Api/Models/Request/LicenseRequestModel.cs

@@ -1,7 +1,7 @@
-using Microsoft.AspNetCore.Http;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request
 {
     public class LicenseRequestModel
     {

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

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Organizations
 {
     public class ImportOrganizationCiphersRequestModel
     {

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

@@ -1,10 +1,10 @@
-using Bit.Core.Models.Business;
-using Bit.Core.Models.Table;
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using Bit.Core.Models.Business;
+using Table = Bit.Core.Models.Table;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Organizations
 {
     public class ImportOrganizationUsersRequestModel
     {

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

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Organizations
 {
     public class OrganizationCreateLicenseRequestModel : LicenseRequestModel
     {

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

@@ -1,11 +1,11 @@
-using Bit.Core.Models.Table;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;
-using System.ComponentModel.DataAnnotations;
-using System.Collections.Generic;
+using Bit.Core.Models.Table;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Organizations
 {
     public class OrganizationCreateRequestModel : IValidatableObject
     {

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

@@ -1,8 +1,8 @@
-using Bit.Core.Models.Table;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Core.Models.Business;
+using Bit.Core.Models.Table;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Organizations
 {
     public class OrganizationKeysRequestModel
     {

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

@@ -1,8 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Organizations
 {
     public class OrganizationSeatRequestModel : IValidatableObject
     {

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

@@ -2,7 +2,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Organizations
 {
     public class OrganizationSponsorshipRedeemRequestModel
     {

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

@@ -1,9 +1,8 @@
-using System;
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Models.Api.Request
+namespace Bit.Api.Models.Request.Organizations
 {
     public class OrganizationSponsorshipRequestModel
     {

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

@@ -1,18 +1,18 @@
 using System;
-using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
-using Bit.Core.Services;
-using Bit.Core.Models.Data;
-using Bit.Core.Enums;
-using Bit.Core.Sso;
-using U2F.Core.Utils;
+using System.ComponentModel.DataAnnotations;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text.RegularExpressions;
+using Bit.Core.Enums;
+using Bit.Core.Models.Data;
 using Bit.Core.Models.Table;
+using Bit.Core.Services;
+using Bit.Core.Sso;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
+using U2F.Core.Utils;
 
-namespace Bit.Core.Models.Api
+namespace Bit.Api.Models.Request.Organizations
 {
     public class OrganizationSsoRequestModel
     {