Merge branch 'release/14.0' into v14/dev

build/azure-pipelines.yml

@@ -715,7 +715,7 @@ stages:
     dependsOn:
       - Unit
       - Integration
-      - E2E
+#      - E2E
     condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.myGetDeploy}}))
     jobs:
       - job:

src/Umbraco.Core/Constants-Telemetry.cs

@@ -31,5 +31,9 @@ public static partial class Constants
         public static string BackofficeExternalLoginProviderCount = "BackofficeExternalLoginProviderCount";
         public static string DeliverApiEnabled = "DeliverApiEnabled";
         public static string DeliveryApiPublicAccess = "DeliveryApiPublicAccess";
+        public static string WebhookPrefix = "WebhookCount_";
+        public static string WebhookTotal = $"{WebhookPrefix}Total";
+        public static string WebhookCustomHeaders = $"{WebhookPrefix}CustomHeaders";
+        public static string WebhookCustomEvent = $"{WebhookPrefix}CustomEvent";
     }
 }

src/Umbraco.Core/EmbeddedResources/Lang/en.xml

@@ -476,7 +476,7 @@
     <key alias="detailedLevelDescription"><![CDATA[We will send:
 <ul>
     <li>Anonymized site ID, Umbraco version, and packages installed.</li>
-    <li>Number of: Root nodes, Content nodes, Macros, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, Backoffice external login providers, and Property Editors in use.</li>
+    <li>Number of: Root nodes, Content nodes, Macros, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, Backoffice external login providers, Webhooks, and Property Editors in use.</li>
     <li>System information: Webserver, server OS, server framework, server OS language, and database provider.</li>
     <li>Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, whether the delivery API is enabled, and allows public access, and if you are in debug mode.</li>
 </ul>

src/Umbraco.Infrastructure/BackgroundJobs/Jobs/ReportSiteJob.cs

@@ -10,19 +10,24 @@ namespace Umbraco.Cms.Infrastructure.BackgroundJobs.Jobs;
 public class ReportSiteJob : IRecurringBackgroundJob
 {
 
-    public TimeSpan Period { get => TimeSpan.FromDays(1); }
-    public TimeSpan Delay { get => TimeSpan.FromMinutes(5); }
-    public ServerRole[] ServerRoles { get => Enum.GetValues<ServerRole>(); }
+    public TimeSpan Period => TimeSpan.FromDays(1);
+
+    public TimeSpan Delay => TimeSpan.FromMinutes(5);
+
+    public ServerRole[] ServerRoles => Enum.GetValues<ServerRole>();
 
     // No-op event as the period never changes on this job
-    public event EventHandler PeriodChanged { add { } remove { } }
-
+    public event EventHandler PeriodChanged
+    {
+        add { } remove { }
+    }
 
     private static HttpClient _httpClient = new();
-    private readonly ILogger<ReportSiteJob> _logger;
-    private readonly ITelemetryService _telemetryService;
-    private readonly IJsonSerializer _jsonSerializer;
 
+    private readonly ILogger<ReportSiteJob> _logger;
+
+    private readonly ITelemetryService _telemetryService;
+private readonly IJsonSerializer _jsonSerializer;
 
     public ReportSiteJob(
         ILogger<ReportSiteJob> logger,
@@ -39,9 +44,8 @@ public class ReportSiteJob : IRecurringBackgroundJob
     /// Runs the background task to send the anonymous ID
     /// to telemetry service
     /// </summary>
-    public  async Task RunJobAsync()
+    public async Task RunJobAsync()
     {
-
         if (_telemetryService.TryGetTelemetryReportData(out TelemetryReportData? telemetryReportData) is false)
         {
             _logger.LogWarning("No telemetry marker found");

src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.TelemetryProviders.cs

@@ -19,6 +19,7 @@ public static class UmbracoBuilder_TelemetryProviders
         builder.Services.AddTransient<IDetailedTelemetryProvider, UserTelemetryProvider>();
         builder.Services.AddTransient<IDetailedTelemetryProvider, SystemTroubleshootingInformationTelemetryProvider>();
         builder.Services.AddTransient<IDetailedTelemetryProvider, DeliveryApiTelemetryProvider>();
+        builder.Services.AddTransient<IDetailedTelemetryProvider, WebhookTelemetryProvider>();
         return builder;
     }
 }

src/Umbraco.Infrastructure/Telemetry/Providers/WebhookTelemetryProvider.cs

@@ -0,0 +1,41 @@
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.Telemetry.Interfaces;
+
+namespace Umbraco.Cms.Infrastructure.Telemetry.Providers;
+
+public class WebhookTelemetryProvider : IDetailedTelemetryProvider
+{
+    private readonly IWebhookService _webhookService;
+
+    public WebhookTelemetryProvider(IWebhookService webhookService) => _webhookService = webhookService;
+
+    private readonly string[] _defaultEventTypes =
+        [
+            "Umbraco.ContentDelete",
+            "Umbraco.ContentPublish",
+            "Umbraco.ContentUnpublish",
+            "Umbraco.MediaDelete",
+            "Umbraco.MediaSave"
+        ];
+
+    public IEnumerable<UsageInformation> GetInformation()
+    {
+        IWebhook[] allWebhooks = _webhookService.GetAllAsync(0, int.MaxValue).GetAwaiter().GetResult().Items.ToArray();
+
+        yield return new UsageInformation(Constants.Telemetry.WebhookTotal, allWebhooks.Length);
+
+        foreach (var eventType in _defaultEventTypes)
+        {
+            IWebhook[] webhooks = allWebhooks.Where(x => x.Events.Contains(eventType)).ToArray();
+            yield return new UsageInformation($"{Constants.Telemetry.WebhookPrefix}{eventType}", webhooks.Length);
+        }
+
+        IEnumerable<IWebhook> customWebhooks = allWebhooks.Where(x => x.Events.Except(_defaultEventTypes).Any());
+        yield return new UsageInformation(Constants.Telemetry.WebhookCustomEvent, customWebhooks.Count());
+
+        IEnumerable<IWebhook> customHeaderWebhooks = allWebhooks.Where(x => x.Headers.Any());
+        yield return new UsageInformation(Constants.Telemetry.WebhookCustomHeaders, customHeaderWebhooks.Count());
+    }
+}

tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs

@@ -120,7 +120,18 @@ public static class UmbracoBuilderExtensions
 
                 var currFolder = new DirectoryInfo(srcFolder);
 
-                var uiProject = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).First();
+                if (!currFolder.Exists)
+                {
+                    currFolder = new DirectoryInfo(Path.GetTempPath());
+                }
+
+                var uiProject = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).FirstOrDefault();
+                if (uiProject == null)
+                {
+                    uiProject = new DirectoryInfo(Path.Combine(Path.GetTempPath(), "Umbraco.Web.UI"));
+                    uiProject.Create();
+                }
+
                 var mainLangFolder = new DirectoryInfo(Path.Combine(uiProject.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang"));
 
                 return new LocalizedTextServiceFileSources(

tests/Umbraco.Tests.Integration/Umbraco.Core/Telemetry/TelemetryServiceTests.cs

@@ -1,12 +1,11 @@
-using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Telemetry;
+using Umbraco.Cms.Core.Webhooks;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
@@ -20,12 +19,15 @@ public class TelemetryServiceTests : UmbracoIntegrationTest
         builder.Services.Configure<GlobalSettings>(options => options.Id = Guid.NewGuid().ToString());
 
     private ITelemetryService TelemetryService => GetRequiredService<ITelemetryService>();
+
     private IMetricsConsentService MetricsConsentService => GetRequiredService<IMetricsConsentService>();
 
+    private WebhookEventCollection WebhookEventCollection => GetRequiredService<WebhookEventCollection>();
+
     [Test]
     public async Task Expected_Detailed_Telemetry_Exists()
     {
-        var expectedData = new[]
+        var expectedData = new List<string>
         {
             Constants.Telemetry.RootCount,
             Constants.Telemetry.DomainCount,
@@ -51,9 +53,15 @@ public class TelemetryServiceTests : UmbracoIntegrationTest
             Constants.Telemetry.BackofficeExternalLoginProviderCount,
             Constants.Telemetry.RuntimeMode,
             Constants.Telemetry.DeliverApiEnabled,
-            Constants.Telemetry.DeliveryApiPublicAccess
+            Constants.Telemetry.DeliveryApiPublicAccess,
+            Constants.Telemetry.WebhookTotal,
+            Constants.Telemetry.WebhookCustomHeaders,
+            Constants.Telemetry.WebhookCustomEvent,
         };
 
+        // Add the default webhook events.
+        expectedData.AddRange(WebhookEventCollection.Select(eventInfo => $"{Constants.Telemetry.WebhookPrefix}{eventInfo.Alias}"));
+
         await MetricsConsentService.SetConsentLevelAsync(TelemetryLevel.Detailed);
         var success = TelemetryService.TryGetTelemetryReportData(out var telemetryReportData);
         var detailed = telemetryReportData.Detailed.ToArray();
@@ -62,7 +70,7 @@ public class TelemetryServiceTests : UmbracoIntegrationTest
         Assert.Multiple(() =>
         {
             Assert.IsNotNull(detailed);
-            Assert.AreEqual(expectedData.Length, detailed.Length);
+            Assert.AreEqual(expectedData.Count, detailed.Length);
 
             foreach (var expectedInfo in expectedData)
             {

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "14.0.0-rc1",
+  "version": "14.1.0-rc",
   "assemblyVersion": {
     "precision": "build"
   },