V14: Webhook endpoint fixes (#16215)

* Update to use presentation factory

* remove unused usings

* Update delete endpoint to work

* Remember to map key

* Map key for updating webhooks

Author: Zeegaan

src/Umbraco.Cms.Api.Management/Controllers/Webhook/CreateWebhookController.cs

@@ -2,9 +2,9 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Api.Management.Factories;
 using Umbraco.Cms.Api.Management.ViewModels.Webhook;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.OperationStatus;
@@ -17,13 +17,13 @@ namespace Umbraco.Cms.Api.Management.Controllers.Webhook;
 public class CreateWebhookController : WebhookControllerBase
 {
     private readonly IWebhookService _webhookService;
-    private readonly IUmbracoMapper _umbracoMapper;
+    private readonly IWebhookPresentationFactory _webhookPresentationFactory;
 
     public CreateWebhookController(
-        IWebhookService webhookService, IUmbracoMapper umbracoMapper)
+        IWebhookService webhookService, IWebhookPresentationFactory webhookPresentationFactory)
     {
         _webhookService = webhookService;
-        _umbracoMapper = umbracoMapper;
+        _webhookPresentationFactory = webhookPresentationFactory;
     }
 
     [HttpPost]
@@ -35,7 +35,7 @@ public async Task<IActionResult> Create(
         CancellationToken cancellationToken,
         CreateWebhookRequestModel createWebhookRequestModel)
     {
-        IWebhook created = _umbracoMapper.Map<IWebhook>(createWebhookRequestModel)!;
+        IWebhook created = _webhookPresentationFactory.CreateWebhook(createWebhookRequestModel);
 
         Attempt<IWebhook, WebhookOperationStatus> result = await _webhookService.CreateAsync(created);
 

src/Umbraco.Cms.Api.Management/Controllers/Webhook/DeleteWebhookController.cs

@@ -24,7 +24,7 @@ public DeleteWebhookController(IWebhookService webhookService, IBackOfficeSecuri
         _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
     }
 
-    [HttpDelete($"{{{nameof(id)}}}")]
+    [HttpDelete("{id:guid}")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
     [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]

src/Umbraco.Cms.Api.Management/Controllers/Webhook/UpdateWebhookController.cs

@@ -2,14 +2,12 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Api.Management.Factories;
 using Umbraco.Cms.Api.Management.ViewModels.Webhook;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.OperationStatus;
-using Umbraco.Cms.Core.Webhooks;
 using Umbraco.Cms.Web.Common.Authorization;
 
 namespace Umbraco.Cms.Api.Management.Controllers.Webhook;
@@ -19,14 +17,14 @@ namespace Umbraco.Cms.Api.Management.Controllers.Webhook;
 public class UpdateWebhookController : WebhookControllerBase
 {
     private readonly IWebhookService _webhookService;
-    private readonly IUmbracoMapper _umbracoMapper;
+    private readonly IWebhookPresentationFactory _webhookPresentationFactory;
+
 
     public UpdateWebhookController(
-        IWebhookService webhookService,
-        IUmbracoMapper umbracoMapper)
+        IWebhookService webhookService, IWebhookPresentationFactory webhookPresentationFactory)
     {
         _webhookService = webhookService;
-        _umbracoMapper = umbracoMapper;
+        _webhookPresentationFactory = webhookPresentationFactory;
     }
 
     [HttpPut("{id:guid}")]
@@ -45,7 +43,7 @@ public async Task<IActionResult> Update(
             return WebhookNotFound();
         }
 
-        IWebhook updated = _umbracoMapper.Map(updateWebhookRequestModel, current);
+        IWebhook updated = _webhookPresentationFactory.CreateWebhook(updateWebhookRequestModel, id);
 
         Attempt<IWebhook, WebhookOperationStatus> result = await _webhookService.UpdateAsync(updated);
 

src/Umbraco.Cms.Api.Management/Factories/IWebhookPresentationFactory.cs

@@ -10,5 +10,5 @@ public interface IWebhookPresentationFactory
 
     IWebhook CreateWebhook(CreateWebhookRequestModel webhookRequestModel);
 
-    IWebhook CreateWebhook(UpdateWebhookRequestModel webhookRequestModel);
+    IWebhook CreateWebhook(UpdateWebhookRequestModel webhookRequestModel, Guid existingWebhookKey);
 }

src/Umbraco.Cms.Api.Management/Factories/WebhookPresentationFactory.cs

@@ -28,13 +28,19 @@ public WebhookResponseModel CreateResponseModel(IWebhook webhook)
 
     public IWebhook CreateWebhook(CreateWebhookRequestModel webhookRequestModel)
     {
-        var target = new Webhook(webhookRequestModel.Url, webhookRequestModel.Enabled, webhookRequestModel.ContentTypeKeys, webhookRequestModel.Events, webhookRequestModel.Headers);
+        var target = new Webhook(webhookRequestModel.Url, webhookRequestModel.Enabled, webhookRequestModel.ContentTypeKeys, webhookRequestModel.Events, webhookRequestModel.Headers)
+        {
+            Key = webhookRequestModel.Id ?? Guid.NewGuid(),
+        };
         return target;
     }
 
-    public IWebhook CreateWebhook(UpdateWebhookRequestModel webhookRequestModel)
+    public IWebhook CreateWebhook(UpdateWebhookRequestModel webhookRequestModel, Guid existingWebhookkey)
     {
-        var target = new Webhook(webhookRequestModel.Url, webhookRequestModel.Enabled, webhookRequestModel.ContentTypeKeys, webhookRequestModel.Events, webhookRequestModel.Headers);
+        var target = new Webhook(webhookRequestModel.Url, webhookRequestModel.Enabled, webhookRequestModel.ContentTypeKeys, webhookRequestModel.Events, webhookRequestModel.Headers)
+        {
+            Key = existingWebhookkey,
+        };
         return target;
     }