Resolved PR feedback comments

Author: lilla28

src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/DependencyInjection/Fdc3DesktopAgentBuilder.cs

@@ -12,7 +12,9 @@
  * and limitations under the License.
  */
 
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 
 namespace MorganStanley.ComposeUI.Fdc3.DesktopAgent.DependencyInjection;
 
@@ -25,20 +27,17 @@ public Fdc3DesktopAgentBuilder(IServiceCollection serviceCollection)
         ServiceCollection = serviceCollection;
     }
 
-    public Fdc3DesktopAgentBuilder WithUserChannel(string channelId)
+    public Fdc3DesktopAgentBuilder Configure<T>(IConfiguration configuration) where T : IOptions<Fdc3Options>
     {
-        ServiceCollection.Configure<Fdc3Options>(config =>
-        {
-            config.BuilderActions.Add(fdc3 => fdc3.AddUserChannel(channelId));
-        });
+        ServiceCollection.Configure<Fdc3Options>(configuration.GetSection(Fdc3Options.Fdc3OptionsName));
 
         return this;
     }
 
-    public Fdc3DesktopAgentBuilder Configure(Action<Fdc3Options> confiureOptions)
+    public Fdc3DesktopAgentBuilder Configure(Action<Fdc3Options> configureOptions)
     {
         ServiceCollection.AddOptions<Fdc3Options>()
-            .Configure(confiureOptions);
+            .Configure(configureOptions);
 
         return this;
     }

src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/DependencyInjection/Fdc3Options.cs

@@ -20,8 +20,6 @@ public sealed class Fdc3Options : IOptions<Fdc3Options>
 {
     public static readonly string Fdc3OptionsName = "Fdc3Options";
 
-    internal List<Func<Fdc3DesktopAgent, ValueTask>> BuilderActions { get; } = new();
-
     /// <summary>
     /// When set to <value>true</value>, it will enable Fdc3 backend service.
     /// </summary>

src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/DependencyInjection/ServiceCollectionExtensions.cs

@@ -25,14 +25,13 @@ public static IServiceCollection AddFdc3DesktopAgent(
         this IServiceCollection serviceCollection,
         Action<Fdc3DesktopAgentBuilder>? builderAction = null)
     {
-        var config = new Fdc3DesktopAgentBuilder(serviceCollection);
+        var builder = new Fdc3DesktopAgentBuilder(serviceCollection);
 
         if (builderAction != null)
         {
-            builderAction(config);
+            builderAction(builder);
         }
 
-        serviceCollection.AddSingleton(config);
         serviceCollection.AddSingleton<IHostedService, Fdc3DesktopAgent>();
         return serviceCollection;
     }
@@ -42,23 +41,20 @@ public static IServiceCollection AddFdc3DesktopAgent(
     /// If that tag value is true, it will add the DesktopAgent service to the ServiceCollection, with the given Fdc3Options, that was set in the configuration.
     /// </summary>
     /// <param name="serviceCollection"></param>
-    /// <param name="configuration"></param>
+    /// <param name="configuration">This should be the IConfigurationSection, which contains the configuration for Fdc3.</param>
     /// <param name="builderAction"></param>
     /// <returns></returns>
     public static IServiceCollection InjectFdc3BackendServiceIfEnabledFromConfig(
         this IServiceCollection serviceCollection,
         IConfiguration configuration,
         Action<Fdc3DesktopAgentBuilder>? builderAction = null)
     {
-        var fdc3Options = new Fdc3Options();
-
-        var fdc3Configuration = configuration.GetSection(Fdc3Options.Fdc3OptionsName);
-
-        fdc3Configuration.Bind(fdc3Options);
+        var fdc3Options = ConfigurationBinder.Get<Fdc3Options>(configuration);
 
+        //TODO: This should be feature toggle, once we have feature toggles in the future - instead of having `EnableFdc3` inside Fdc3Options.
         if (fdc3Options.EnableFdc3)
         {
-            serviceCollection.Configure<Fdc3Options>(fdc3Configuration);
+            serviceCollection.Configure<Fdc3Options>(configuration);
             serviceCollection.AddFdc3DesktopAgent(builderAction);
         }
 

src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Fdc3DesktopAgent.cs

@@ -34,7 +34,7 @@ public class Fdc3DesktopAgent : IHostedService
     public Fdc3DesktopAgent(
         IOptions<Fdc3Options> options, 
         IMessageRouter messageRouter, 
-        ILoggerFactory? loggerFactory)
+        ILoggerFactory? loggerFactory = null)
     {
         _options = options.Value;
         _messageRouter = messageRouter;
@@ -65,16 +65,11 @@ public async Task StartAsync(CancellationToken cancellationToken)
     {
         await _messageRouter.RegisterServiceAsync(Fdc3Topic.FindChannel, FindChannel);
 
-        if (_options.BuilderActions.Count <= 0) return;
+        if (_options.ChannelId == null) return;
 
         // There are no dependencies among possible actions at the moment.
         // Future features may introduce dependencies, in that case this solution needs to change
-        foreach (var task in _options.BuilderActions.Select(x => x(this)).ToArray())
-        {
-            await (task);
-        }
-
-        _options.BuilderActions.Clear();        
+        await AddUserChannel(_options.ChannelId);
     }
 
     public async Task StopAsync(CancellationToken cancellationToken)

src/fdc3/dotnet/DesktopAgent/tests/DesktopAgent.Tests/EndToEndTests.cs

@@ -45,7 +45,11 @@ public async Task InitializeAsync()
                         opt.Port = _webSocketUri.Port;
                     }));
                     services.AddMessageRouter(mr => mr.UseServer());
-                    services.AddFdc3DesktopAgent(fdc3 => fdc3.WithUserChannel(TestChannel));
+                    services.AddFdc3DesktopAgent(fdc3 => fdc3.Configure(builder =>
+                    {
+                        builder.EnableFdc3 = true; //no impact here
+                        builder.ChannelId = TestChannel; //DesktopAgent will call the `AddUserChannel` method, as this property is set for the `_options` field;
+                    }));
                 });
             _host = builder.Build();
             await _host.StartAsync();

src/shell/dotnet/Shell/App.xaml.cs

@@ -113,17 +113,14 @@ private void ConfigureServices(HostBuilderContext context, IServiceCollection se
                 .UseAccessToken(_messageRouterAccessToken));
 
         //This can be replaced by the `InjectFdc3BackendServiceIfEnabledFromConfig` extension method
-        ///*
-        var fdc3Configuration = context.Configuration
-            .GetSection(Fdc3Options.Fdc3OptionsName);
-
-        var fdc3Options = fdc3Configuration
-            .Get<Fdc3Options>();
+        ///* services.InjectFdc3BackendServiceIfEnabledFromConfig(fdc3ConfigurationSection);
+        var fdc3ConfigurationSection = context.Configuration.GetSection(Fdc3Options.Fdc3OptionsName);
+        var fdc3Options = ConfigurationBinder.Get<Fdc3Options>(fdc3ConfigurationSection);
 
+        //TODO: This should be feature toggle, once we have feature toggles - instead of having `EnableFdc3` inside Fdc3Options.
         if (fdc3Options != null && fdc3Options.EnableFdc3)
         {
-            services.Configure<Fdc3Options>(fdc3Configuration);
-            services.AddFdc3DesktopAgent(builder => builder.WithUserChannel(fdc3Options.ChannelId ?? "default"));
+            services.AddFdc3DesktopAgent(builder => builder.Configure<Fdc3Options>(context.Configuration));
         }
         //*/