Adds license warnings to the BFF (#2130)

* licensing

* format

* Apply suggestions from code review

Co-authored-by: Maarten Balliauw <maarten.balliauw@duendesoftware.com>

* Update LicensingLogMessages.cs

* Update LicensingLogMessages.cs

added the word 'trial'

---------

Co-authored-by: Maarten Balliauw <maarten.balliauw@duendesoftware.com>

Author: Erwinvandervalk

Directory.Packages.props

@@ -14,6 +14,7 @@
     <PackageVersion Include="Duende.IdentityModel" Version="7.1.0" />
     <PackageVersion Include="Duende.IdentityModel.OidcClient" Version="6.0.1" />
     <PackageVersion Include="Duende.IdentityServer" Version="7.1.0" />
+    <PackageVersion Include="Duende.Private.Licensing" Version="1.0.0" />
     <PackageVersion Include="IdentityModel.AspNetCore.OAuth2Introspection" Version="6.2.0" />
     <PackageVersion Include="Meziantou.Extensions.Logging.Xunit" Version="1.0.8" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.Certificate" Condition="'$(TargetFramework)' == 'net8.0'" Version="8.0.16" />

bff/src/Bff.Blazor.Client/Bff.Blazor.Client.csproj

@@ -12,11 +12,13 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" />
     <PackageReference Include="Microsoft.Extensions.Http" />
     <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="Duende.Private.Licensing" />
   </ItemGroup>
 
   <ItemGroup>
     <InternalsVisibleTo Include="Duende.Bff.Tests" />
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
+
   </ItemGroup>
 
 </Project>

bff/src/Bff.Blazor/BffServerAuthenticationStateProvider.cs

@@ -5,6 +5,7 @@
 using System.Security.Claims;
 using Duende.Bff.Configuration;
 using Duende.Bff.Internal;
+using Duende.Bff.Licensing;
 using Duende.Bff.SessionManagement.SessionStore;
 using Duende.IdentityModel;
 using Microsoft.AspNetCore.Components;
@@ -50,6 +51,7 @@ public BffServerAuthenticationStateProvider(
         BuildUserSessionPartitionKey buildUserSessionPartitionKey,
         IOptions<BffBlazorServerOptions> blazorOptions,
         IOptions<BffOptions> bffOptions,
+        LicenseValidator licenseValidator,
         ILoggerFactory loggerFactory)
         : base(loggerFactory)
     {
@@ -65,20 +67,16 @@ public BffServerAuthenticationStateProvider(
         AuthenticationStateChanged += OnAuthenticationStateChanged;
         _subscription = _state.RegisterOnPersisting(OnPersistingAsync, RenderMode.InteractiveWebAssembly);
 
-        CheckLicense(loggerFactory, _bffOptions);
+        CheckLicense(licenseValidator);
     }
 
-    internal static bool LicenseChecked;
 
-    internal static void CheckLicense(ILoggerFactory loggerFactory, BffOptions options)
+    internal static void CheckLicense(LicenseValidator validator)
     {
-        if (LicenseChecked == false)
+        if (!validator.IsValid())
         {
-            Licensing.LicenseValidator.Initalize(loggerFactory, options);
-            Licensing.LicenseValidator.ValidateLicense();
+            // todo: license enforcement
         }
-
-        LicenseChecked = true;
     }
 
     private void OnAuthenticationStateChanged(Task<AuthenticationState> task) => _authenticationStateTask = task;

bff/src/Bff/Bff.csproj

@@ -22,4 +22,8 @@
     <InternalsVisibleTo Include="Duende.Bff.Yarp" />
     <InternalsVisibleTo Include="Duende.Bff.Tests" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Duende.Private.Licensing" />
+  </ItemGroup>
 </Project>

bff/src/Bff/BffBuilderExtensions.cs

@@ -10,11 +10,13 @@
 using Duende.Bff.Endpoints;
 using Duende.Bff.Endpoints.Internal;
 using Duende.Bff.Internal;
+using Duende.Bff.Licensing;
 using Duende.Bff.Otel;
 using Duende.Bff.SessionManagement.Configuration;
 using Duende.Bff.SessionManagement.Revocation;
 using Duende.Bff.SessionManagement.SessionStore;
 using Duende.Bff.SessionManagement.TicketStore;
+using Duende.Private.Licensing;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
@@ -44,6 +46,10 @@ public static T ConfigureCookies<T>(this T builder, Action<CookieAuthenticationO
 
     internal static T AddBaseBffServices<T>(this T builder) where T : IBffServicesBuilder
     {
+        builder.Services.AddSingleton<GetLicenseKey>(sp => () => sp.GetRequiredService<IOptions<BffOptions>>().Value.LicenseKey);
+        builder.Services.AddSingleton<LicenseAccessor<BffLicense>>();
+        builder.Services.AddSingleton<BffLicense>(sp => sp.GetRequiredService<LicenseAccessor<BffLicense>>().Current);
+        builder.Services.TryAddSingleton<LicenseValidator>();
         builder.Services.AddDistributedMemoryCache();
         // IMPORTANT: The BffConfigureOpenIdConnectOptions MUST be called before calling
         // AddOpenIdConnectAccessTokenManagement because both configure the same options

bff/src/Bff/BffEndpointRouteBuilderExtensions.cs

@@ -4,14 +4,14 @@
 using Duende.Bff.Configuration;
 using Duende.Bff.Endpoints;
 using Duende.Bff.Endpoints.Internal;
+using Duende.Bff.Licensing;
 using Duende.Bff.Otel;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using LicenseValidator = Duende.Bff.Licensing.LicenseValidator;
 
 
 namespace Duende.Bff;
@@ -175,15 +175,13 @@ public static void MapBffDiagnosticsEndpoint(this IEndpointRouteBuilder endpoint
 
     internal static void CheckLicense(this IServiceProvider serviceProvider)
     {
-        if (LicenseChecked == false)
-        {
-            var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
-            var options = serviceProvider.GetRequiredService<IOptions<BffOptions>>().Value;
+        var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
+        var options = serviceProvider.GetRequiredService<IOptions<BffOptions>>().Value;
 
-            LicenseValidator.Initalize(loggerFactory, options);
-            LicenseValidator.ValidateLicense();
+        var license = serviceProvider.GetRequiredService<LicenseValidator>();
+        if (!license.IsValid())
+        {
+            // Todo, enforce license validation
         }
-
-        LicenseChecked = true;
     }
 }

bff/src/Bff/DynamicFrontends/Internal/FrontendCollection.cs

@@ -3,12 +3,13 @@
 
 using System.Collections;
 using Duende.Bff.Configuration;
+using Duende.Bff.Licensing;
 using Microsoft.Extensions.Options;
 
 namespace Duende.Bff.DynamicFrontends.Internal;
-
 internal class FrontendCollection : IDisposable, IFrontendCollection
 {
+    private readonly LicenseValidator _licenseValidator;
     private readonly IBffPluginLoader[] _plugins;
     private readonly object _syncRoot = new();
 
@@ -24,11 +25,13 @@ internal class FrontendCollection : IDisposable, IFrontendCollection
     internal event Action<BffFrontend> OnFrontendAdded = (_) => { };
 
     public FrontendCollection(
+        LicenseValidator licenseValidator,
         IOptionsMonitor<BffConfiguration> bffConfiguration,
         IEnumerable<IBffPluginLoader> plugins,
         IEnumerable<BffFrontend>? frontendsConfiguredDuringStartup = null
     )
     {
+        _licenseValidator = licenseValidator;
         _plugins = plugins.ToArray();
         _frontends = ReadFrontends(bffConfiguration.CurrentValue, frontendsConfiguredDuringStartup ?? []);
 
@@ -57,9 +60,18 @@ public FrontendCollection(
                     .Where(frontend => oldFrontends.All(x => x.Name != frontend.Name))
                     .ToArray();
 
+                var totalFrontends = oldFrontends.Length - removedFrontends.Length;
+
+                foreach (var frontend in addedFrontends)
+                {
+                    _licenseValidator.LogFrontendAdded(frontend.Name, ++totalFrontends);
+                }
+
                 Interlocked.Exchange(ref _frontends, newFrontends);
+
             }
 
+
             foreach (var added in addedFrontends)
             {
                 OnFrontendAdded(added);
@@ -77,6 +89,9 @@ public FrontendCollection(
         });
     }
 
+
+
+
     private static bool IsUpdated(BffFrontend left, BffFrontend right)
     {
         if (!left.Equals(right))
@@ -171,6 +186,7 @@ public void AddOrUpdate(BffFrontend frontend)
         }
         else
         {
+            _licenseValidator.LogFrontendAdded(frontend.Name, _frontends.Length);
             OnFrontendAdded(frontend);
         }