nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 23:52:50 -05:00
Code Activity

Move request/response models (#1754)

Browse Source
This commit is contained in:
Oscar Hinton
2021-12-14 15:05:07 +00:00
committed by GitHub
parent 3ae573bd8d
commit 63f6dd9a24
206 changed files with 641 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Api/Utilities/ExceptionHandlerFilterAttribute.cs
View File

@ -1,6 +1,6 @@
using System;
using Bit.Api.Models.Public.Response;
using InternalApi = Bit.Core.Models.Api;
using PublicApi = Bit.Core.Models.Api.Public;
using Bit.Core.Exceptions;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
@ -33,7 +33,7 @@ namespace Bit.Api.Utilities
return;
}
PublicApi.ErrorResponseModel publicErrorModel = null;
ErrorResponseModel publicErrorModel = null;
InternalApi.ErrorResponseModel internalErrorModel = null;
if (exception is BadRequestException badRequestException)
{
@ -42,7 +42,7 @@ namespace Bit.Api.Utilities
{
if (_publicApi)
{
publicErrorModel = new PublicApi.ErrorResponseModel(badRequestException.ModelState);
publicErrorModel = new ErrorResponseModel(badRequestException.ModelState);
}
else
{
@ -59,7 +59,7 @@ namespace Bit.Api.Utilities
context.HttpContext.Response.StatusCode = 400;
if (_publicApi)
{
publicErrorModel = new PublicApi.ErrorResponseModel(stripeException.StripeError.Param,
publicErrorModel = new ErrorResponseModel(stripeException.StripeError.Param,
stripeException.Message);
}
else
@ -107,7 +107,7 @@ namespace Bit.Api.Utilities
if (_publicApi)
{
var errorModel = publicErrorModel ?? new PublicApi.ErrorResponseModel(errorMessage);
var errorModel = publicErrorModel ?? new ErrorResponseModel(errorMessage);
context.Result = new ObjectResult(errorModel);
}
else

4
src/Api/Utilities/ModelStateValidationFilterAttribute.cs
View File

@ -1,8 +1,8 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using InternalApi = Bit.Core.Models.Api;
using PublicApi = Bit.Core.Models.Api.Public;
using System.Linq;
using Bit.Api.Models.Public.Response;
namespace Bit.Api.Utilities
{
@ -27,7 +27,7 @@ namespace Bit.Api.Utilities
{
if (_publicApi)
{
context.Result = new BadRequestObjectResult(new PublicApi.ErrorResponseModel(context.ModelState));
context.Result = new BadRequestObjectResult(new ErrorResponseModel(context.ModelState));
}
else
{

2
src/Api/Utilities/MultipartFormDataHelper.cs
View File

@ -5,8 +5,8 @@ using Microsoft.Net.Http.Headers;
using System;
using System.IO;
using System.Threading.Tasks;
using Bit.Api.Models.Request;
using Microsoft.Extensions.Primitives;
using Bit.Core.Models.Api;
using Newtonsoft.Json;
namespace Bit.Api.Utilities