diff --git a/src/Umbraco.Web/Editors/PublishedSnapshotCacheStatusController.cs b/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs similarity index 68% rename from src/Umbraco.Web/Editors/PublishedSnapshotCacheStatusController.cs rename to src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs index 6a701fdcfa..1a0e3457ca 100644 --- a/src/Umbraco.Web/Editors/PublishedSnapshotCacheStatusController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/PublishedSnapshotCacheStatusController.cs @@ -1,19 +1,24 @@ using System; -using System.Web.Http; +using System.Reflection.Metadata; +using Microsoft.AspNetCore.Mvc; +using Umbraco.Core; using Umbraco.Web.Cache; -using Umbraco.Web.Composing; +using Umbraco.Web.Common.Attributes; using Umbraco.Web.PublishedCache; -using Umbraco.Web.WebApi; -namespace Umbraco.Web.Editors +namespace Umbraco.Web.BackOffice.Controllers { + [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] + [IsBackOffice] public class PublishedSnapshotCacheStatusController : UmbracoAuthorizedApiController { private readonly IPublishedSnapshotService _publishedSnapshotService; + private readonly DistributedCache _distributedCache; - public PublishedSnapshotCacheStatusController(IPublishedSnapshotService publishedSnapshotService) + public PublishedSnapshotCacheStatusController(IPublishedSnapshotService publishedSnapshotService, DistributedCache distributedCache) { _publishedSnapshotService = publishedSnapshotService ?? throw new ArgumentNullException(nameof(publishedSnapshotService)); + _distributedCache = distributedCache; } [HttpPost] @@ -40,7 +45,7 @@ namespace Umbraco.Web.Editors [HttpPost] public void ReloadCache() { - Current.DistributedCache.RefreshAllPublishedSnapshot(); + _distributedCache.RefreshAllPublishedSnapshot(); } } } diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs index b63964972d..2e5e078882 100644 --- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs +++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs @@ -303,10 +303,10 @@ namespace Umbraco.Web.Editors "dictionaryApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl( controller => controller.DeleteById(int.MaxValue)) }, - { - "publishedSnapshotCacheStatusBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl( - controller => controller.GetStatus()) - }, + // { + // "publishedSnapshotCacheStatusBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl( + // controller => controller.GetStatus()) + // }, //TODO Reintroduce // { // "helpApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl( diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 34903a7dc5..e9ab9db390 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -297,7 +297,6 @@ -