* Rename Umbraco.Core namespace to Umbraco.Cms.Core * Move extension methods in core project to Umbraco.Extensions * Move extension methods in core project to Umbraco.Extensions * Rename Umbraco.Examine namespace to Umbraco.Cms.Examine * Move examine extensions to Umbraco.Extensions namespace * Reflect changed namespaces in Builder and fix unit tests * Adjust namespace in Umbraco.ModelsBuilder.Embedded * Adjust namespace in Umbraco.Persistence.SqlCe * Adjust namespace in Umbraco.PublishedCache.NuCache * Align namespaces in Umbraco.Web.BackOffice * Align namespaces in Umbraco.Web.Common * Ensure that SqlCeSupport is still enabled after changing the namespace * Align namespaces in Umbraco.Web.Website * Align namespaces in Umbraco.Web.UI.NetCore * Align namespaces in Umbraco.Tests.Common * Align namespaces in Umbraco.Tests.UnitTests * Align namespaces in Umbraco.Tests.Integration * Fix errors caused by changed namespaces * Fix integration tests * Undo the Umbraco.Examine.Lucene namespace change This breaks integration tests on linux, since the namespace wont exists there because it's only used on windows. * Fix merge * Fix Merge
47 lines
2.1 KiB
C#
47 lines
2.1 KiB
C#
using System.Buffers;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using Microsoft.AspNetCore.Mvc.Formatters;
|
|
using Microsoft.AspNetCore.Mvc.Infrastructure;
|
|
using Microsoft.AspNetCore.Mvc.ModelBinding;
|
|
using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
|
|
using Microsoft.Extensions.Logging;
|
|
using Microsoft.Extensions.ObjectPool;
|
|
using Umbraco.Cms.Web.Common.Formatters;
|
|
|
|
namespace Umbraco.Cms.Web.Common.ModelBinders
|
|
{
|
|
/// <summary>
|
|
/// A custom body model binder that only uses a <see cref="NewtonsoftJsonInputFormatter"/> to bind body action parameters
|
|
/// </summary>
|
|
public class UmbracoJsonModelBinder : BodyModelBinder, IModelBinder
|
|
{
|
|
public UmbracoJsonModelBinder(ArrayPool<char> arrayPool, ObjectPoolProvider objectPoolProvider, IHttpRequestStreamReaderFactory readerFactory, ILoggerFactory loggerFactory)
|
|
: base(GetNewtonsoftJsonFormatter(loggerFactory, arrayPool, objectPoolProvider), readerFactory, loggerFactory)
|
|
{
|
|
}
|
|
|
|
private static IInputFormatter[] GetNewtonsoftJsonFormatter(ILoggerFactory logger, ArrayPool<char> arrayPool, ObjectPoolProvider objectPoolProvider)
|
|
{
|
|
var jsonOptions = new MvcNewtonsoftJsonOptions
|
|
{
|
|
AllowInputFormatterExceptionMessages = true
|
|
};
|
|
|
|
var ss = jsonOptions.SerializerSettings; // Just use the defaults as base
|
|
|
|
// We need to ignore required attributes when serializing. E.g UserSave.ChangePassword. Otherwise the model is not model bound.
|
|
ss.ContractResolver = new IgnoreRequiredAttributesResolver();
|
|
return new IInputFormatter[]
|
|
{
|
|
new NewtonsoftJsonInputFormatter(
|
|
logger.CreateLogger<UmbracoJsonModelBinder>(),
|
|
jsonOptions.SerializerSettings, // Just use the defaults
|
|
arrayPool,
|
|
objectPoolProvider,
|
|
new MvcOptions(), // The only option that NewtonsoftJsonInputFormatter uses is SuppressInputFormatterBuffering
|
|
jsonOptions)
|
|
};
|
|
}
|
|
}
|
|
}
|