provide licensed endpoint information to SP when available in the license file (#5529)

Author: PhilBastian

src/Directory.Packages.props

@@ -61,7 +61,7 @@
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
     <PackageVersion Include="Particular.Approvals" Version="2.0.1" />
     <PackageVersion Include="Particular.LicensingComponent.Report" Version="1.1.1" />
-    <PackageVersion Include="Particular.Licensing.Sources" Version="6.1.1" />
+    <PackageVersion Include="Particular.Licensing.Sources" Version="6.2.1" />
     <PackageVersion Include="Particular.Obsoletes" Version="1.1.0" />
     <PackageVersion Include="Particular.ServicePulse.Core" Version="2.7.2" />
     <PackageVersion Include="Polly.Core" Version="8.6.6" />

src/ServiceControl.LicenseManagement/LicenseDetails.cs

@@ -1,6 +1,8 @@
 namespace ServiceControl.LicenseManagement
 {
     using System;
+    using System.Linq;
+    using System.Text.RegularExpressions;
     using Particular.Licensing;
 
     public class LicenseDetails
@@ -24,6 +26,7 @@ public class LicenseDetails
         public bool WarnUserUpgradeProtectionIsExpiring { get; private init; }
         public bool WarnUserUpgradeProtectionHasExpired { get; private init; }
         public string Status { get; private init; }
+        public LicensedProduct[] Products { get; private init; }
 
         public static LicenseDetails TrialFromEndDate(DateOnly endDate)
         {
@@ -64,6 +67,8 @@ internal static LicenseDetails FromLicense(License license)
                 IsTrialLicense = license.IsTrialLicense,
                 LicenseType = license.LicenseType,
                 Edition = license.Edition,
+                //strip any internal prefix from what gets displayed to the customer
+                Products = license.LicensedEndpoints?.Select(le => new LicensedProduct(le.Size.EndsWith("U") ? "Unlimited" : Regex.Replace(le.Size, @"^\D*", ""), le.Quantity)).ToArray(),
                 ValidForServiceControl = license.ValidForApplication("ServiceControl"),
                 DaysUntilSubscriptionExpires = license.GetDaysUntilLicenseExpires(),
                 DaysUntilUpgradeProtectionExpires = license.GetDaysUntilUpgradeProtectionExpires(),
@@ -95,4 +100,6 @@ static bool HasLicenseDateExpired(DateTime licenseDate)
             return oneDayGrace < DateTime.UtcNow.Date;
         }
     }
+
+    public record LicensedProduct(string Name, int Quantity);
 }

src/ServiceControl/Licensing/LicenseController.cs

@@ -6,6 +6,7 @@
     using Monitoring.HeartbeatMonitoring;
     using Particular.ServiceControl.Licensing;
     using ServiceBus.Management.Infrastructure.Settings;
+    using ServiceControl.LicenseManagement;
 
     [ApiController]
     [Route("api")]
@@ -31,6 +32,7 @@ public async Task<ActionResult<LicenseInfo>> License(bool refresh, string client
                 LicenseType = activeLicense.Details.LicenseType ?? string.Empty,
                 InstanceName = settings.InstanceName ?? string.Empty,
                 LicenseStatus = activeLicense.Details.Status,
+                Products = activeLicense.Details.Products,
                 LicenseExtensionUrl = connectorHeartbeatStatus.LastHeartbeat == null
                     ? $"https://particular.net/extend-your-trial?p={clientName}"
                     : $"https://particular.net/license/mt?p={clientName}&t={(activeLicense.IsEvaluation ? 0 : 1)}"
@@ -53,6 +55,8 @@ public class LicenseInfo
 
             public string Status { get; set; }
 
+            public LicensedProduct[] Products { get; set; }
+
             public string LicenseType { get; set; }
 
             public string InstanceName { get; set; }