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/move-files-after-umbraco-context-abstractions

Browse Source 
# Conflicts:
#	src/Umbraco.Abstractions/PublishedContentExtensions.cs
#	src/Umbraco.Abstractions/Routing/AliasUrlProvider.cs
#	src/Umbraco.Abstractions/Routing/DefaultMediaUrlProvider.cs
#	src/Umbraco.Abstractions/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Abstractions/Routing/UrlProvider.cs
#	src/Umbraco.Abstractions/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
#	src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
#	src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
#	src/Umbraco.Tests/Routing/UrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
#	src/Umbraco.Tests/TestHelpers/TestHelper.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
#	src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
#	src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/UmbracoContext.cs
#	src/Umbraco.Web/UmbracoContextFactory.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
This commit is contained in:
Bjarke Berg
2020-02-17 12:45:37 +01:00
parent e7e4dc8441 2b8be2cf00
commit aeca49dddb
62 changed files with 222 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web/UmbracoInjectedModule.cs
View File

@@ -40,6 +40,7 @@ namespace Umbraco.Web
private readonly IUmbracoContextFactory _umbracoContextFactory;
private readonly RoutableDocumentFilter _routableDocumentLookup;
private readonly IRequestCache _requestCache;
private readonly UriUtility _uriUtility;
public UmbracoInjectedModule(
IGlobalSettings globalSettings,
@@ -48,6 +49,7 @@ namespace Umbraco.Web
IPublishedRouter publishedRouter,
IUmbracoContextFactory umbracoContextFactory,
RoutableDocumentFilter routableDocumentLookup,
UriUtility uriUtility,
IRequestCache requestCache)
{
_globalSettings = globalSettings;
@@ -56,6 +58,7 @@ namespace Umbraco.Web
_publishedRouter = publishedRouter;
_umbracoContextFactory = umbracoContextFactory;
_routableDocumentLookup = routableDocumentLookup;
_uriUtility = uriUtility;
_requestCache = requestCache;
}
@@ -121,7 +124,7 @@ namespace Umbraco.Web
var isRoutableAttempt = EnsureUmbracoRoutablePage(umbracoContext, httpContext);
// raise event here
UmbracoModule.OnRouteAttempt(this, new RoutableAttemptEventArgs(isRoutableAttempt.Result, umbracoContext, httpContext));
UmbracoModule.OnRouteAttempt(this, new RoutableAttemptEventArgs(isRoutableAttempt.Result, umbracoContext));
if (isRoutableAttempt.Success == false) return;
httpContext.Trace.Write("UmbracoModule", "Umbraco request confirmed");
@@ -210,7 +213,7 @@ namespace Umbraco.Web
case RuntimeLevel.Upgrade:
// redirect to install
ReportRuntime(level, "Umbraco must install or upgrade.");
var installPath = UriUtility.ToAbsolute(Constants.SystemDirectories.Install);
var installPath = _uriUtility.ToAbsolute(Constants.SystemDirectories.Install);
var installUrl = $"{installPath}/?redir=true&url={HttpUtility.UrlEncode(uri.ToString())}";
httpContext.Response.Redirect(installUrl, true);
return false; // cannot serve content
@@ -242,7 +245,7 @@ namespace Umbraco.Web
_logger.Warn<UmbracoModule>("Umbraco has no content");
const string noContentUrl = "~/config/splashes/noNodes.aspx";
httpContext.RewritePath(UriUtility.ToAbsolute(noContentUrl));
httpContext.RewritePath(_uriUtility.ToAbsolute(noContentUrl));
return false;
}
@@ -430,7 +433,7 @@ namespace Umbraco.Web
_logger.Verbose<UmbracoModule>("End Request [{HttpRequestId}]: {RequestUrl} ({RequestDuration}ms)", httpRequestId, httpContext.Request.Url, DateTime.Now.Subtract(Current.UmbracoContext.ObjectCreated).TotalMilliseconds);
}
UmbracoModule.OnEndRequest(this, new UmbracoRequestEventArgs(Current.UmbracoContext, new HttpContextWrapper(httpContext)));
UmbracoModule.OnEndRequest(this, new UmbracoRequestEventArgs(Current.UmbracoContext));
DisposeRequestCacheItems(httpContext, _requestCache);
};