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

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB6233-install-steps-in-dotnet-core

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
This commit is contained in:
Bjarke Berg
2020-04-22 13:08:43 +02:00
parent 79e9235338 34ae4311d0
commit f79526e46a
89 changed files with 1512 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Umbraco.Web.Common/AspNetCore/AspNetCoreRequestAccessor.cs
View File

@@ -1,6 +1,8 @@
using System;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
using Umbraco.Web.Common.Extensions;
using Umbraco.Web.Common.Lifetime;
using Umbraco.Web.Routing;
namespace Umbraco.Web.Common.AspNetCore
@@ -8,20 +10,39 @@ namespace Umbraco.Web.Common.AspNetCore
public class AspNetCoreRequestAccessor : IRequestAccessor
{
private readonly IHttpContextAccessor _httpContextAccessor;
public AspNetCoreRequestAccessor(IHttpContextAccessor httpContextAccessor)
private readonly IUmbracoContextAccessor _umbracoContextAccessor;
public AspNetCoreRequestAccessor(IHttpContextAccessor httpContextAccessor, IUmbracoRequestLifetime umbracoRequestLifetime, IUmbracoContextAccessor umbracoContextAccessor)
{
_httpContextAccessor = httpContextAccessor;
_umbracoContextAccessor = umbracoContextAccessor;
umbracoRequestLifetime.RequestStart += RequestStart;
umbracoRequestLifetime.RequestEnd += RequestEnd;
}
private void RequestEnd(object sender, HttpContext e)
{
EndRequest?.Invoke(sender, new UmbracoRequestEventArgs(_umbracoContextAccessor.UmbracoContext));
}
private void RequestStart(object sender, HttpContext e)
{
var reason = EnsureRoutableOutcome.IsRoutable;
RouteAttempt?.Invoke(sender, new RoutableAttemptEventArgs(reason, _umbracoContextAccessor.UmbracoContext));
}
public string GetRequestValue(string name) => GetFormValue(name) ?? GetQueryStringValue(name);
public string GetFormValue(string name) => _httpContextAccessor.GetRequiredHttpContext().Request.Form[name];
public string GetQueryStringValue(string name) => _httpContextAccessor.GetRequiredHttpContext().Request.Query[name];
//TODO implement
public event EventHandler<UmbracoRequestEventArgs> EndRequest;
//TODO implement
public event EventHandler<RoutableAttemptEventArgs> RouteAttempt;
public Uri GetRequestUrl() => _httpContextAccessor.HttpContext != null ? new Uri(_httpContextAccessor.HttpContext.Request.GetEncodedUrl()) : null;
}
}