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

Inject IUmbracoContextAccessor instead of UmbracoContext

Browse Source
This commit is contained in:
Bjarke Berg
2019-02-14 12:40:45 +01:00
parent fe9b964ffe
commit 1770a0abec
63 changed files with 296 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
View File

@@ -33,7 +33,7 @@ namespace Umbraco.Web.WebApi
protected UmbracoApiControllerBase()
: this(
Current.Factory.GetInstance<IGlobalSettings>(),
Current.Factory.GetInstance<IUmbracoContextAccessor>().UmbracoContext,
Current.Factory.GetInstance<IUmbracoContextAccessor>(),
Current.Factory.GetInstance<ISqlContext>(),
Current.Factory.GetInstance<ServiceContext>(),
Current.Factory.GetInstance<AppCaches>(),
@@ -46,15 +46,15 @@ namespace Umbraco.Web.WebApi
/// <summary>
/// Initializes a new instance of the <see cref="UmbracoApiControllerBase"/> class with all its dependencies.
/// </summary>
protected UmbracoApiControllerBase(IGlobalSettings globalSettings, UmbracoContext umbracoContext, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
protected UmbracoApiControllerBase(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
{
UmbracoContextAccessor = umbracoContextAccessor;
GlobalSettings = globalSettings;
SqlContext = sqlContext;
Services = services;
AppCaches = appCaches;
Logger = logger;
RuntimeState = runtimeState;
UmbracoContext = umbracoContext;
Umbraco = umbracoHelper;
}
@@ -72,8 +72,14 @@ namespace Umbraco.Web.WebApi
/// <summary>
/// Gets the Umbraco context.
/// </summary>
public virtual UmbracoContext UmbracoContext { get; }
public virtual UmbracoContext UmbracoContext => UmbracoContextAccessor.UmbracoContext;
/// <summary>
/// Gets the Umbraco context accessor.
/// </summary>
public virtual IUmbracoContextAccessor UmbracoContextAccessor { get; }
/// <summary>
/// Gets the sql context.
/// </summary>
@@ -113,7 +119,7 @@ namespace Umbraco.Web.WebApi
/// Gets the Umbraco helper.
/// </summary>
public UmbracoHelper Umbraco { get; }
/// <summary>
/// Gets the web security helper.
/// </summary>