Cleans up some routing, mvc base classes, gets controller specific model binding working, applies our own application model to our controllers

This commit is contained in:
Shannon
2020-05-12 10:21:40 +10:00
parent 09a3c4afee
commit 39fed867c1
26 changed files with 580 additions and 160 deletions

View File

@@ -53,20 +53,10 @@ namespace Umbraco.Web.UI.BackOffice
{
services.AddUmbracoConfiguration(_config);
services.AddUmbracoCore(_env, out var factory);
services.AddUmbracoWebsite();
services.AddUmbracoWebComponents();
services.AddUmbracoRuntimeMinifier(_config);
services.AddMvc(options =>
{
options.Filters.Add<HttpResponseExceptionFilter>();
}).SetCompatibilityVersion(CompatibilityVersion.Version_3_0)
.AddNewtonsoftJson(options =>
{
options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
})
;
services.AddMvc();
services.AddMiniProfiler(options =>
{
@@ -90,19 +80,24 @@ namespace Umbraco.Web.UI.BackOffice
public void Configure(IApplicationBuilder app)
{
//app.UseMiniProfiler();
app.UseUmbracoRequestLifetime();
//app.UseMiniProfiler();
if (_env.IsDevelopment())
{
app.UseDeveloperExceptionPage();
}
app.UseStatusCodePages();
app.UseRouting();
app.UseUmbracoRouting();
app.UseUmbracoCore();
app.UseUmbracoRequestLogging();
app.UseUmbracoWebsite();
app.UseUmbracoBackOffice();
app.UseRouting();
app.UseUmbracoBackOffice();
app.UseUmbracoRuntimeMinification();
app.UseEndpoints(endpoints =>
{
endpoints.MapControllerRoute("Backoffice", "/umbraco/{Action}", new
@@ -111,7 +106,7 @@ namespace Umbraco.Web.UI.BackOffice
Action = "Default"
});
// TODO: Fix this routing with an area
endpoints.MapControllerRoute("Install", "/install/{controller}/{Action}", defaults:new { Area = "Install"});
//TODO register routing correct: Name must be like this