Move request/response models (#1754)

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
 {