Skip to content

Remove date header from webhook request and use constants #15407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zeegaan merged 2 commits into from
Dec 11, 2023
Merged

Remove date header from webhook request and use constants #15407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db465d8
Remove date header
ronaldbarendse Dec 8, 2023
15e4b1d
Move webhook event header names to constants
ronaldbarendse Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 33 additions & 21 deletions src/Umbraco.Core/Constants-WebhookEvents.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,107 +1,119 @@
namespace Umbraco.Cms.Core;
namespace Umbraco.Cms.Core;

public static partial class Constants
{
public static class WebhookEvents
{
public static class Aliases
public static class HeaderNames
{
/// <summary>
/// Gets the <c>Umb-Webhook-Event</c> HTTP header name.
/// </summary>
public const string EventName = "Umb-Webhook-Event";

/// <summary>
/// Webhook event alias for content versions deleted
/// Gets the <c>Umb-Webhook-RetryCount</c> HTTP header name.
/// </summary>
public const string RetryCount = "Umb-Webhook-RetryCount";
}

public static class Aliases
{
/// <summary>
/// Webhook event alias for content versions deleted.
/// </summary>
public const string ContentDeletedVersions = "Umbraco.ContentDeletedVersions";

/// <summary>
/// Webhook event alias for content blueprint saved
/// Webhook event alias for content blueprint saved.
/// </summary>
public const string ContentSavedBlueprint = "Umbraco.ContentSavedBlueprint";

/// <summary>
/// Webhook event alias for content blueprint deleted
/// Webhook event alias for content blueprint deleted.
/// </summary>
public const string ContentDeletedBlueprint = "Umbraco.ContentDeletedBlueprint";

/// <summary>
/// Webhook event alias for content moved into the recycle bin.
/// Webhook event alias for content moved into the recycle bin.
/// </summary>
public const string ContentMovedToRecycleBin = "Umbraco.ContentMovedToRecycleBin";

/// <summary>
/// Webhook event alias for content sorted.
/// Webhook event alias for content sorted.
/// </summary>
public const string ContentSorted = "Umbraco.ContentSorted";

/// <summary>
/// Webhook event alias for content moved.
/// Webhook event alias for content moved.
/// </summary>
public const string ContentMoved = "Umbraco.ContentMoved";

/// <summary>
/// Webhook event alias for content copied.
/// Webhook event alias for content copied.
/// </summary>
public const string ContentCopied = "Umbraco.ContentCopied";

/// <summary>
/// Webhook event alias for content emptied recycle bin.
/// Webhook event alias for content emptied recycle bin.
/// </summary>
public const string ContentEmptiedRecycleBin = "Umbraco.ContentEmptiedRecycleBin";

/// <summary>
/// Webhook event alias for content rolled back.
/// Webhook event alias for content rolled back.
/// </summary>
public const string ContentRolledBack = "Umbraco.ContentRolledBack";

/// <summary>
/// Webhook event alias for content saved.
/// Webhook event alias for content saved.
/// </summary>
public const string ContentSaved = "Umbraco.ContentSaved";

/// <summary>
/// Webhook event alias for content publish.
/// Webhook event alias for content publish.
/// </summary>
public const string ContentPublish = "Umbraco.ContentPublish";

/// <summary>
/// Webhook event alias for content delete.
/// Webhook event alias for content delete.
/// </summary>
public const string ContentDelete = "Umbraco.ContentDelete";

/// <summary>
/// Webhook event alias for content unpublish.
/// Webhook event alias for content unpublish.
/// </summary>
public const string ContentUnpublish = "Umbraco.ContentUnpublish";

/// <summary>
/// Webhook event alias for media delete.
/// Webhook event alias for media delete.
/// </summary>
public const string MediaDelete = "Umbraco.MediaDelete";

/// <summary>
/// Webhook event alias for media save.
/// Webhook event alias for media save.
/// </summary>
public const string MediaSave = "Umbraco.MediaSave";
}

public static class Types
{
/// <summary>
/// Webhook event type for content.
/// Webhook event type for content.
/// </summary>
public const string Content = "Content";

/// <summary>
/// Webhook event type for content media.
/// Webhook event type for content media.
/// </summary>
public const string Media = "Media";

/// <summary>
/// Webhook event type for content member.
/// Webhook event type for content member.
/// </summary>
public const string Member = "Member";

/// <summary>
/// Webhook event type for others, this is the default category if you have not chosen one.
/// Webhook event type for others, this is the default category if you have not chosen one.
/// </summary>
public const string Other = "Other";
}
Expand Down
7 changes: 3 additions & 4 deletions src/Umbraco.Infrastructure/BackgroundJobs/Jobs/WebhookFiring.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Net.Mime;
using System.Net.Mime;
using System.Text;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
Expand Down Expand Up @@ -101,9 +101,8 @@ await Task.WhenAll(requests.Select(request =>
try
{
// Add headers
request.Headers.Add("Umb-Webhook-Event", eventName);
request.Headers.Add("Umb-Webhook-RetryCount", retryCount.ToString());
request.Headers.Add("Umb-Webhook-Date", DateTime.Now.ToString("R"));
request.Headers.Add(Constants.WebhookEvents.HeaderNames.EventName, eventName);
request.Headers.Add(Constants.WebhookEvents.HeaderNames.RetryCount, retryCount.ToString());

foreach (KeyValuePair<string, string> header in webhook.Headers)
{
Expand Down