diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs index 23eb6a34f..494b6194e 100644 --- a/src/Api/Startup.cs +++ b/src/Api/Startup.cs @@ -8,7 +8,6 @@ using Bit.Core; using Bit.Core.Context; using Bit.Core.Identity; using Bit.Core.Settings; -using Newtonsoft.Json.Serialization; using AspNetCoreRateLimit; using Stripe; using Bit.Core.Utilities; @@ -18,7 +17,6 @@ using Microsoft.IdentityModel.Logging; using Microsoft.Extensions.Hosting; using Microsoft.OpenApi.Models; using System.Collections.Generic; -using System; #if !OSS using Bit.CommCore.Utilities; @@ -135,12 +133,6 @@ namespace Bit.Api { config.Conventions.Add(new ApiExplorerGroupConvention()); config.Conventions.Add(new PublicApiControllersModelConvention()); - }).AddNewtonsoftJson(options => - { - if ((Environment.IsProduction() || Environment.IsEnvironment("QA")) && Configuration["swaggerGen"] != "true") - { - options.SerializerSettings.ContractResolver = new DefaultContractResolver(); - } }); services.AddSwagger(globalSettings); diff --git a/src/Api/Utilities/CamelCaseJsonResultFilterAttribute.cs b/src/Api/Utilities/CamelCaseJsonResultFilterAttribute.cs deleted file mode 100644 index ec8aa640e..000000000 --- a/src/Api/Utilities/CamelCaseJsonResultFilterAttribute.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Filters; -using System.Threading.Tasks; -using Newtonsoft.Json; -using Newtonsoft.Json.Serialization; - -namespace Bit.Api.Utilities -{ - public class CamelCaseJsonResultFilterAttribute : IAsyncResultFilter - { - private static JsonSerializerSettings _jsonSerializerSettings; - - static CamelCaseJsonResultFilterAttribute() - { - _jsonSerializerSettings = new JsonSerializerSettings - { - ContractResolver = new CamelCasePropertyNamesContractResolver() - }; - } - - public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next) - { - if (context.Result is JsonResult jsonResult) - { - context.Result = new JsonResult(jsonResult.Value, _jsonSerializerSettings); - } - await next(); - } - } -} diff --git a/src/Api/Utilities/PublicApiControllersModelConvention.cs b/src/Api/Utilities/PublicApiControllersModelConvention.cs index 668935425..64101148e 100644 --- a/src/Api/Utilities/PublicApiControllersModelConvention.cs +++ b/src/Api/Utilities/PublicApiControllersModelConvention.cs @@ -8,10 +8,6 @@ namespace Bit.Api.Utilities { var controllerNamespace = controller.ControllerType.Namespace; var publicApi = controllerNamespace.Contains(".Public."); - if (publicApi) - { - controller.Filters.Add(new CamelCaseJsonResultFilterAttribute()); - } controller.Filters.Add(new ExceptionHandlerFilterAttribute(publicApi)); controller.Filters.Add(new ModelStateValidationFilterAttribute(publicApi)); }