From 882cd231a2d95a1468909468605302789bcd8256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Th=C3=A9ate?=
 <97221392+antoineatstariongroup@users.noreply.github.com>
Date: Fri, 24 Jan 2025 13:01:16 +0100
Subject: [PATCH] Revert "Fix bug on DLL resolve for plugins (#380)"

This reverts commit 7725cc3b0524c20a70cbedfe0f1b6add85d5de57.
---
 .github/workflows/CodeQuality.yml             |  2 +-
 .../AuthenticationPluginInjector.cs           | 38 ++-----------------
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/CodeQuality.yml b/.github/workflows/CodeQuality.yml
index de987574..e548219f 100644
--- a/.github/workflows/CodeQuality.yml
+++ b/.github/workflows/CodeQuality.yml
@@ -79,7 +79,7 @@ jobs:
         run: dotnet-coverage collect --output CoverageResults/integration.test.report.coverage.xml --output-format cobertura --session-id integrationtestsession "dotnet run --project CometServer/CometServer.csproj -c Debug" &
 
       - name: Wait for API to start
-        run: sleep 60  # Adjust as necessary to ensure the API is up
+        run: sleep 45  # Adjust as necessary to ensure the API is up
 
       - name: Checkout Integration Test Suite
         uses: actions/checkout@v4
diff --git a/CometServer/Authentication/AuthenticationPluginInjector.cs b/CometServer/Authentication/AuthenticationPluginInjector.cs
index 146d9c84..b0832ee4 100644
--- a/CometServer/Authentication/AuthenticationPluginInjector.cs
+++ b/CometServer/Authentication/AuthenticationPluginInjector.cs
@@ -41,13 +41,8 @@ namespace CometServer.Authentication
     /// <summary>
     /// The injector loads up authenticator plugins.
     /// </summary>
-    public class AuthenticationPluginInjector : IAuthenticationPluginInjector, IDisposable
+    public class AuthenticationPluginInjector : IAuthenticationPluginInjector
     {
-        /// <summary>
-        /// A collection of <see cref="Assembly" /> that has been discovered
-        /// </summary>
-        private List<Assembly> discoveredAssemblies = new List<Assembly>();
-
         /// <summary>
         /// The name of the folder where all authentication modules reside.
         /// </summary>
@@ -64,7 +59,6 @@ public class AuthenticationPluginInjector : IAuthenticationPluginInjector, IDisp
         public AuthenticationPluginInjector(ILogger<AuthenticationPluginInjector> logger)
         {
             this.logger = logger;
-            AppDomain.CurrentDomain.AssemblyResolve += this.OnAssemblyResolve;
 
             this.Plugins = this.LoadPlugins();
 
@@ -109,7 +103,6 @@ private static string[] GetFolders()
         /// <returns>The <see cref="List{T}"/> of <see cref="IAuthenticatorPlugin"/> modules</returns>
         private ReadOnlyCollection<IAuthenticatorPlugin> LoadPlugins()
         {
-            this.discoveredAssemblies.Clear();
             var sw = Stopwatch.StartNew();
 
             var result = new List<IAuthenticatorPlugin>();
@@ -123,11 +116,8 @@ private ReadOnlyCollection<IAuthenticatorPlugin> LoadPlugins()
             // load all assemblies types encountered in the plugin folders that implement the IAuthenticatorPlugin interface
             foreach (var pluginFolder in pluginFolders)
             {
-                var assemblies = new DirectoryInfo(pluginFolder).GetFiles().Where(file => file.Extension == ".dll")
-                    .Select(file => Assembly.LoadFile(file.FullName))
-                    .ToList();
-
-                foreach (var assembly in assemblies)
+                foreach (var assembly in new DirectoryInfo(pluginFolder).GetFiles().Where(file => file.Extension == ".dll")
+                    .Select(file => Assembly.LoadFile(file.FullName)))
                 {
                     builder.RegisterAssemblyTypes(assembly)
                         .Where(x => typeof(IAuthenticatorPlugin).IsAssignableFrom(x))
@@ -135,8 +125,6 @@ private ReadOnlyCollection<IAuthenticatorPlugin> LoadPlugins()
                         .PropertiesAutowired()
                         .SingleInstance();
                 }
-
-                this.discoveredAssemblies.AddRange(assemblies);
             }
 
             var container = builder.Build();
@@ -150,25 +138,5 @@ private ReadOnlyCollection<IAuthenticatorPlugin> LoadPlugins()
 
             return result.AsReadOnly();
         }
-        
-        /// <summary>
-        /// Helps resolving assemblies that may be required for loaded plugins
-        /// </summary>
-        /// <param name="sender">The sender object</param>
-        /// <param name="args">The <see cref="ResolveEventArgs"/></param>
-        /// <returns>The resolved assemblies, if found</returns>
-        private Assembly OnAssemblyResolve(object sender, ResolveEventArgs args)
-        {
-            return this.discoveredAssemblies.FirstOrDefault(x => x.FullName == args.Name);
-        }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            AppDomain.CurrentDomain.AssemblyResolve -= this.OnAssemblyResolve;
-        }
     }
 }
-