PluginManager: support injecting plugin dependencies

Author: webprofusion-chrisc

src/Certify.Core/Management/CertifyManager/CertifyManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
@@ -100,14 +100,16 @@ public partial class CertifyManager : ICertifyManager, IDisposable
         private System.Timers.Timer _hourlyTimer;
         private System.Timers.Timer _dailyTimer;
 
-        public CertifyManager() : this(true)
+        private IServiceProvider _injectedServiceProvider;
+        public CertifyManager(IServiceProvider injectedServiceProvider) : this()
         {
-
+            _injectedServiceProvider = injectedServiceProvider;
         }
 
-        public CertifyManager(bool useWindowsNativeFeatures = true)
+        public CertifyManager()
         {
-            _useWindowsNativeFeatures = useWindowsNativeFeatures;
+            // load setting here so that we know our instance ID etc early on. Other longer tasks are deferred until Init is called.
+            SettingsManager.LoadAppSettings();
         }
 
         public async Task Init()
@@ -116,13 +118,11 @@ public async Task Init()
 
             _serverConfig = SharedUtils.ServiceConfigManager.GetAppServiceConfig();
 
-            SettingsManager.LoadAppSettings();
-
             InitLogging(_serverConfig);
 
             Util.SetSupportedTLSVersions();
 
-            _pluginManager = new PluginManager
+            _pluginManager = new PluginManager(_injectedServiceProvider)
             {
                 EnableExternalPlugins = CoreAppSettings.Current.IncludeExternalPlugins
             };

src/Certify.Models/Certify.Models.csproj

@@ -21,6 +21,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
         <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.1" />
         <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.12.0">
             <PrivateAssets>all</PrivateAssets>

src/Certify.Models/Plugins/PluginProviderBase.cs

@@ -3,12 +3,25 @@
 using System.Linq;
 using Certify.Models.Config;
 using Certify.Models.Plugins;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Certify.Plugins
 {
     public class PluginProviderBase<TProviderInterface, TProviderDefinition> : IProviderPlugin<TProviderInterface, TProviderDefinition>
     {
 
+        public PluginProviderBase()
+        {
+        }
+
+        // optionally support dependency injection
+        public PluginProviderBase(IServiceProvider serviceProvider)
+        {
+            _services = serviceProvider;
+        }
+
+        private IServiceProvider? _services { get; }
+
         public TProviderInterface GetProvider(Type pluginType, string? id)
         {
 
@@ -26,7 +39,14 @@ public TProviderInterface GetProvider(Type pluginType, string? id)
                 {
                     if ((def as ProviderDefinition)?.Id?.ToLowerInvariant() == id)
                     {
-                        return (TProviderInterface)Activator.CreateInstance(t);
+                        if (_services == null)
+                        {
+                            return (TProviderInterface)Activator.CreateInstance(t);
+                        }
+                        else
+                        {
+                            return (TProviderInterface)ActivatorUtilities.CreateInstance(_services, t);
+                        }
                     }
                 }
             }

src/Certify.Shared/Management/PluginManager.cs

@@ -7,6 +7,7 @@
 using Certify.Models;
 using Certify.Models.Config;
 using Certify.Models.Plugins;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Serilog;
 using Serilog.Extensions.Logging;
@@ -52,6 +53,16 @@ public class PluginManager
 
         private Models.Providers.ILog _log = null;
 
+        private IServiceProvider _services;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="serviceProvider"></param>
+        public PluginManager(IServiceProvider serviceProvider) : this()
+        {
+            _services = serviceProvider;
+        }
         public PluginManager()
         {
             var serilogLogger = new LoggerConfiguration()
@@ -124,9 +135,14 @@ private T LoadPlugin<T>(string dllFileName, string pluginFolder = null)
 
                     if (pluginType != null)
                     {
-                        var obj = (T)Activator.CreateInstance(pluginType);
-
-                        return obj;
+                        if (_services == null)
+                        {
+                            return (T)Activator.CreateInstance(pluginType);
+                        }
+                        else
+                        {
+                            return (T)ActivatorUtilities.CreateInstance(_services, pluginType);
+                        }
                     }
                     else
                     {