yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gets body model binders working per controller and figures out how the application model works

Browse Source
This commit is contained in:
Shannon
2020-05-12 12:29:03 +10:00
parent 39fed867c1
commit 3add4746fe
5 changed files with 43 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/Umbraco.Web.Common/ModelBinding/UmbracoJsonModelBinderProvider.cs
View File

@@ -5,53 +5,13 @@ using Microsoft.AspNetCore.Mvc.ModelBinding;
using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.ObjectPool;
using Microsoft.Extensions.Options;
using System;
using System.Buffers;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Umbraco.Core;
using Umbraco.Web.Common.Controllers;
namespace Umbraco.Web.Common.ModelBinding
{
public class UmbracoJsonModelBinderFactory : ModelBinderFactory
{
public UmbracoJsonModelBinderFactory(
UmbracoJsonModelBinderProvider umbracoJsonModelBinderProvider,
IModelMetadataProvider metadataProvider,
IOptions<MvcOptions> options,
IServiceProvider serviceProvider)
: base(metadataProvider, GetOptions(options, umbracoJsonModelBinderProvider), serviceProvider)
{
}
private static IOptions<MvcOptions> GetOptions(IOptions<MvcOptions> options, UmbracoJsonModelBinderProvider umbracoJsonModelBinderProvider)
{
// copy to new collection
var providers = options.Value.ModelBinderProviders.ToList();
// remove the default
providers.RemoveType<BodyModelBinderProvider>();
// prepend our own
providers.Insert(0, umbracoJsonModelBinderProvider);
var newOptions = new MvcOptions();
foreach (var p in providers)
newOptions.ModelBinderProviders.Add(p);
return new CustomOptions(newOptions);
}
private class CustomOptions : IOptions<MvcOptions>
{
public CustomOptions(MvcOptions options)
{
Value = options;
}
public MvcOptions Value { get; }
}
}
/// <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)
@@ -59,7 +19,7 @@ namespace Umbraco.Web.Common.ModelBinding
{
}
internal static IInputFormatter[] GetNewtonsoftJsonFormatter(ILoggerFactory logger, ArrayPool<char> arrayPool, ObjectPoolProvider objectPoolProvider)
private static IInputFormatter[] GetNewtonsoftJsonFormatter(ILoggerFactory logger, ArrayPool<char> arrayPool, ObjectPoolProvider objectPoolProvider)
{
var jsonOptions = new MvcNewtonsoftJsonOptions
{
@@ -76,42 +36,5 @@ namespace Umbraco.Web.Common.ModelBinding
jsonOptions)
};
}
Task IModelBinder.BindModelAsync(ModelBindingContext bindingContext)
{
return BindModelAsync(bindingContext);
}
}
/// <summary>
/// A model binder for Umbraco models that require Newtonsoft Json serializers
/// </summary>
public class UmbracoJsonModelBinderProvider : BodyModelBinderProvider, IModelBinderProvider
{
public UmbracoJsonModelBinderProvider(IHttpRequestStreamReaderFactory readerFactory, ILoggerFactory logger, ArrayPool<char> arrayPool, ObjectPoolProvider objectPoolProvider)
: base(UmbracoJsonModelBinder.GetNewtonsoftJsonFormatter(logger, arrayPool, objectPoolProvider), readerFactory)
{
}
/// <summary>
/// Returns the model binder if it's for Umbraco models
/// </summary>
/// <param name="context"></param>
/// <returns></returns>
IModelBinder IModelBinderProvider.GetBinder(ModelBinderProviderContext context)
{
// Must be 'Body' (json) binding
if (context.BindingInfo.BindingSource != BindingSource.Body)
return null;
if (context.Metadata?.UnderlyingOrModelType.Assembly == typeof(UmbracoJsonModelBinderProvider).Assembly // Umbraco.Web.Common
|| context.Metadata?.UnderlyingOrModelType.Assembly == typeof(IRuntimeState).Assembly // Umbraco.Core
|| context.Metadata?.UnderlyingOrModelType.Assembly == typeof(RuntimeState).Assembly) // Umbraco.Infrastructure
{
return GetBinder(context);
}
return null;
}
}
}