diff --git a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs index 0e132d3fed..354ef7a40c 100644 --- a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs +++ b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs @@ -332,7 +332,7 @@ namespace Umbraco.Cms.Core.DependencyInjection // Register filestream security analyzers Services.AddUnique(); Services.AddUnique(); - Services.AddUnique(); + Services.AddUnique(); Services.AddUnique(); Services.AddUnique(); } diff --git a/src/Umbraco.Core/Services/IWebHookService.cs b/src/Umbraco.Core/Services/IWebhookService.cs similarity index 96% rename from src/Umbraco.Core/Services/IWebHookService.cs rename to src/Umbraco.Core/Services/IWebhookService.cs index 785f5e8701..d38adaa999 100644 --- a/src/Umbraco.Core/Services/IWebHookService.cs +++ b/src/Umbraco.Core/Services/IWebhookService.cs @@ -2,7 +2,7 @@ using Umbraco.Cms.Core.Models; namespace Umbraco.Cms.Core.Services; -public interface IWebHookService +public interface IWebhookService { /// /// Creates a webhook. diff --git a/src/Umbraco.Core/Services/WebhookService.cs b/src/Umbraco.Core/Services/WebhookService.cs index 424f1afb14..e6d5f405b4 100644 --- a/src/Umbraco.Core/Services/WebhookService.cs +++ b/src/Umbraco.Core/Services/WebhookService.cs @@ -4,7 +4,7 @@ using Umbraco.Cms.Core.Scoping; namespace Umbraco.Cms.Core.Services; -public class WebhookService : IWebHookService +public class WebhookService : IWebhookService { private readonly ICoreScopeProvider _provider; private readonly IWebhookRepository _webhookRepository; diff --git a/src/Umbraco.Core/Webhooks/Events/ContentDeleteWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/ContentDeleteWebhookEvent.cs index d8386b9914..85a1f39ba9 100644 --- a/src/Umbraco.Core/Webhooks/Events/ContentDeleteWebhookEvent.cs +++ b/src/Umbraco.Core/Webhooks/Events/ContentDeleteWebhookEvent.cs @@ -12,12 +12,12 @@ public class ContentDeleteWebhookEvent : WebhookEventContentBase webhookSettings, IServerRoleAccessor serverRoleAccessor) : base( webhookFiringService, - webHookService, + webhookService, webhookSettings, serverRoleAccessor) { diff --git a/src/Umbraco.Core/Webhooks/Events/ContentPublishWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/ContentPublishWebhookEvent.cs index 03f2e71706..e1ba7125ec 100644 --- a/src/Umbraco.Core/Webhooks/Events/ContentPublishWebhookEvent.cs +++ b/src/Umbraco.Core/Webhooks/Events/ContentPublishWebhookEvent.cs @@ -18,14 +18,14 @@ public class ContentPublishWebhookEvent : WebhookEventContentBase webhookSettings, IServerRoleAccessor serverRoleAccessor, IPublishedSnapshotAccessor publishedSnapshotAccessor, IApiContentBuilder apiContentBuilder) : base( webhookFiringService, - webHookService, + webhookService, webhookSettings, serverRoleAccessor) { diff --git a/src/Umbraco.Core/Webhooks/Events/ContentUnpublishWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/ContentUnpublishWebhookEvent.cs index 354cdb295b..76499eb277 100644 --- a/src/Umbraco.Core/Webhooks/Events/ContentUnpublishWebhookEvent.cs +++ b/src/Umbraco.Core/Webhooks/Events/ContentUnpublishWebhookEvent.cs @@ -12,12 +12,12 @@ public class ContentUnpublishWebhookEvent : WebhookEventContentBase webhookSettings, IServerRoleAccessor serverRoleAccessor) : base( webhookFiringService, - webHookService, + webhookService, webhookSettings, serverRoleAccessor) { diff --git a/src/Umbraco.Core/Webhooks/Events/MediaDeleteWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/MediaDeleteWebhookEvent.cs index ab0fd98942..ba9fb2333a 100644 --- a/src/Umbraco.Core/Webhooks/Events/MediaDeleteWebhookEvent.cs +++ b/src/Umbraco.Core/Webhooks/Events/MediaDeleteWebhookEvent.cs @@ -12,12 +12,12 @@ public class MediaDeleteWebhookEvent : WebhookEventContentBase webhookSettings, IServerRoleAccessor serverRoleAccessor) : base( webhookFiringService, - webHookService, + webhookService, webhookSettings, serverRoleAccessor) { diff --git a/src/Umbraco.Core/Webhooks/Events/MediaSaveWebhookEvent.cs b/src/Umbraco.Core/Webhooks/Events/MediaSaveWebhookEvent.cs index 6907067b87..cea7181d51 100644 --- a/src/Umbraco.Core/Webhooks/Events/MediaSaveWebhookEvent.cs +++ b/src/Umbraco.Core/Webhooks/Events/MediaSaveWebhookEvent.cs @@ -18,14 +18,14 @@ public class MediaSaveWebhookEvent : WebhookEventContentBase webhookSettings, IServerRoleAccessor serverRoleAccessor, IPublishedSnapshotAccessor publishedSnapshotAccessor, IApiMediaBuilder apiMediaBuilder) : base( webhookFiringService, - webHookService, + webhookService, webhookSettings, serverRoleAccessor) { diff --git a/src/Umbraco.Core/Webhooks/WebhookEventBase.cs b/src/Umbraco.Core/Webhooks/WebhookEventBase.cs index cd1666135a..de15e23a00 100644 --- a/src/Umbraco.Core/Webhooks/WebhookEventBase.cs +++ b/src/Umbraco.Core/Webhooks/WebhookEventBase.cs @@ -23,7 +23,7 @@ public abstract class WebhookEventBase : IWebhookEvent, INotifica protected IWebhookFiringService WebhookFiringService { get; } - protected IWebHookService WebHookService { get; } + protected IWebhookService WebhookService { get; } protected WebhookSettings WebhookSettings { get; private set; } @@ -31,13 +31,13 @@ public abstract class WebhookEventBase : IWebhookEvent, INotifica protected WebhookEventBase( IWebhookFiringService webhookFiringService, - IWebHookService webHookService, + IWebhookService webhookService, IOptionsMonitor webhookSettings, IServerRoleAccessor serverRoleAccessor) { WebhookFiringService = webhookFiringService; - WebHookService = webHookService; + WebhookService = webhookService; _serverRoleAccessor = serverRoleAccessor; // assign properties based on the attribute, if it is found @@ -91,7 +91,7 @@ public abstract class WebhookEventBase : IWebhookEvent, INotifica return; } - IEnumerable webhooks = await WebHookService.GetByAliasAsync(Alias); + IEnumerable webhooks = await WebhookService.GetByAliasAsync(Alias); await ProcessWebhooks(notification, webhooks, cancellationToken); } diff --git a/src/Umbraco.Core/Webhooks/WebhookEventContentBase.cs b/src/Umbraco.Core/Webhooks/WebhookEventContentBase.cs index 3f7cd4c7b2..6b72bbaacb 100644 --- a/src/Umbraco.Core/Webhooks/WebhookEventContentBase.cs +++ b/src/Umbraco.Core/Webhooks/WebhookEventContentBase.cs @@ -14,10 +14,10 @@ public abstract class WebhookEventContentBase : WebhookE { protected WebhookEventContentBase( IWebhookFiringService webhookFiringService, - IWebHookService webHookService, + IWebhookService webhookService, IOptionsMonitor webhookSettings, IServerRoleAccessor serverRoleAccessor) - : base(webhookFiringService, webHookService, webhookSettings, serverRoleAccessor) + : base(webhookFiringService, webhookService, webhookSettings, serverRoleAccessor) { } diff --git a/src/Umbraco.Web.BackOffice/Controllers/WebhookController.cs b/src/Umbraco.Web.BackOffice/Controllers/WebhookController.cs index 49b80144a7..68d668645e 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/WebhookController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/WebhookController.cs @@ -13,15 +13,15 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers; [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] public class WebhookController : UmbracoAuthorizedJsonController { - private readonly IWebHookService _webHookService; + private readonly IWebhookService _webhookService; private readonly IUmbracoMapper _umbracoMapper; private readonly WebhookEventCollection _webhookEventCollection; private readonly IWebhookLogService _webhookLogService; private readonly IWebhookPresentationFactory _webhookPresentationFactory; - public WebhookController(IWebHookService webHookService, IUmbracoMapper umbracoMapper, WebhookEventCollection webhookEventCollection, IWebhookLogService webhookLogService, IWebhookPresentationFactory webhookPresentationFactory) + public WebhookController(IWebhookService webhookService, IUmbracoMapper umbracoMapper, WebhookEventCollection webhookEventCollection, IWebhookLogService webhookLogService, IWebhookPresentationFactory webhookPresentationFactory) { - _webHookService = webHookService; + _webhookService = webhookService; _umbracoMapper = umbracoMapper; _webhookEventCollection = webhookEventCollection; _webhookLogService = webhookLogService; @@ -31,7 +31,7 @@ public class WebhookController : UmbracoAuthorizedJsonController [HttpGet] public async Task GetAll(int skip = 0, int take = int.MaxValue) { - PagedModel webhooks = await _webHookService.GetAllAsync(skip, take); + PagedModel webhooks = await _webhookService.GetAllAsync(skip, take); IEnumerable webhookViewModels = webhooks.Items.Select(_webhookPresentationFactory.Create); @@ -43,7 +43,7 @@ public class WebhookController : UmbracoAuthorizedJsonController { Webhook updateModel = _umbracoMapper.Map(webhookViewModel)!; - await _webHookService.UpdateAsync(updateModel); + await _webhookService.UpdateAsync(updateModel); return Ok(); } @@ -52,7 +52,7 @@ public class WebhookController : UmbracoAuthorizedJsonController public async Task Create(WebhookViewModel webhookViewModel) { Webhook webhook = _umbracoMapper.Map(webhookViewModel)!; - await _webHookService.CreateAsync(webhook); + await _webhookService.CreateAsync(webhook); return Ok(); } @@ -60,7 +60,7 @@ public class WebhookController : UmbracoAuthorizedJsonController [HttpGet] public async Task GetByKey(Guid key) { - Webhook? webhook = await _webHookService.GetAsync(key); + Webhook? webhook = await _webhookService.GetAsync(key); return webhook is null ? NotFound() : Ok(webhook); } @@ -68,7 +68,7 @@ public class WebhookController : UmbracoAuthorizedJsonController [HttpDelete] public async Task Delete(Guid key) { - await _webHookService.DeleteAsync(key); + await _webhookService.DeleteAsync(key); return Ok(); } diff --git a/src/Umbraco.Web.UI.Client/src/views/webhooks/webhooks.controller.js b/src/Umbraco.Web.UI.Client/src/views/webhooks/webhooks.controller.js index b840facd59..cf85f0df2c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/webhooks/webhooks.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/webhooks/webhooks.controller.js @@ -14,7 +14,7 @@ vm.page = {}; vm.webhooks = []; vm.events = []; - vm.webHooksContentTypes = {}; + vm.webhooksContentTypes = {}; vm.webhookEvents = {}; function init() { @@ -88,17 +88,17 @@ function resolveTypeNames(webhook) { let resource = determineResource(webhook.events[0].eventType.toLowerCase()); - if (vm.webHooksContentTypes[webhook.key]){ - delete vm.webHooksContentTypes[webhook.key]; + if (vm.webhooksContentTypes[webhook.key]){ + delete vm.webhooksContentTypes[webhook.key]; } webhook.contentTypeKeys.forEach(key => { resource.getById(key) .then(data => { - if (!vm.webHooksContentTypes[webhook.key]) { - vm.webHooksContentTypes[webhook.key] = data.name; + if (!vm.webhooksContentTypes[webhook.key]) { + vm.webhooksContentTypes[webhook.key] = data.name; } else { - vm.webHooksContentTypes[webhook.key] += ", " + data.name; + vm.webhooksContentTypes[webhook.key] += ", " + data.name; } }); }); @@ -176,7 +176,7 @@ .then(result => { vm.webhooks = result; vm.webhookEvents = {}; - vm.webHooksContentTypes = {}; + vm.webhooksContentTypes = {}; vm.webhooks.forEach(webhook => { resolveTypeNames(webhook); diff --git a/src/Umbraco.Web.UI.Client/src/views/webhooks/webhooks.html b/src/Umbraco.Web.UI.Client/src/views/webhooks/webhooks.html index e6f4e8f53d..9b2c1f7461 100644 --- a/src/Umbraco.Web.UI.Client/src/views/webhooks/webhooks.html +++ b/src/Umbraco.Web.UI.Client/src/views/webhooks/webhooks.html @@ -36,7 +36,7 @@ {{ vm.webhookEvents[webhook.key] }} {{ webhook.url }} - {{ vm.webHooksContentTypes[webhook.key] }} + {{ vm.webhooksContentTypes[webhook.key] }} GetRequiredService(); + private IWebhookService WebhookService => GetRequiredService(); [Test] [TestCase("https://example.com", Constants.WebhookEvents.Aliases.ContentPublish, "00000000-0000-0000-0000-010000000000")]