From 7459f057482fe0a8660a60413304870989a0e8e1 Mon Sep 17 00:00:00 2001
From: Developer 02 <developer02@didaloghe.onmicrosoft.com>
Date: Fri, 13 Dec 2024 13:47:44 +0100
Subject: [PATCH] =?UTF-8?q?refactor(RSAFactory):=20Schaffung=20einer=20nic?=
 =?UTF-8?q?ht-generischen,=20getrennten=20Schnittstelle,=20um=20eine=20sta?=
 =?UTF-8?q?tische=20Standardinstanz=20erstellen=20zu=20k=C3=B6nnen.=20=20-?=
 =?UTF-8?q?=20Statische=20Instanzklasse=20erstellt.=20=20-=20Geordnete=20D?=
 =?UTF-8?q?I-Registrierungsmethoden.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Security/IRSAFactory.cs                   |  4 +-
 .../Cryptographer/RSAFactory.cs               |  4 --
 DigitalData.Core.Security/DIExtensions.cs     | 42 ++++++++++++++++---
 DigitalData.Core.Security/Instance.cs         | 14 +++++++
 4 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100644 DigitalData.Core.Security/Instance.cs

diff --git a/DigitalData.Core.Abstractions/Security/IRSAFactory.cs b/DigitalData.Core.Abstractions/Security/IRSAFactory.cs
index 7ff812e..96ece10 100644
--- a/DigitalData.Core.Abstractions/Security/IRSAFactory.cs
+++ b/DigitalData.Core.Abstractions/Security/IRSAFactory.cs
@@ -2,7 +2,7 @@
 
 namespace DigitalData.Core.Abstractions.Security
 {
-    public interface IRSAFactory<TParams>
+    public interface IRSAFactory
     {
         string CreateRSAPrivateKeyPem(int? keySizeInBits = null);
 
@@ -13,4 +13,6 @@ namespace DigitalData.Core.Abstractions.Security
             HashAlgorithmName? hashAlgorithmName = null,
             int? iterationCount = null);
     }
+
+    public interface IRSAFactory<TParams> : IRSAFactory { }
 }
\ No newline at end of file
diff --git a/DigitalData.Core.Security/Cryptographer/RSAFactory.cs b/DigitalData.Core.Security/Cryptographer/RSAFactory.cs
index ee4cca9..a6a4a88 100644
--- a/DigitalData.Core.Security/Cryptographer/RSAFactory.cs
+++ b/DigitalData.Core.Security/Cryptographer/RSAFactory.cs
@@ -7,10 +7,6 @@ namespace DigitalData.Core.Security.Cryptographer
 {
     public class RSAFactory<TRSAFactoryParams> : IRSAFactory<TRSAFactoryParams> where TRSAFactoryParams : RSAFactoryParams
     {
-        private static readonly Lazy<RSAFactory<RSAFactoryParams>> LazyInstance = new(() => new(Options.Create<RSAFactoryParams>(new())));
-
-        public static RSAFactory<RSAFactoryParams> Static => LazyInstance.Value;
-
         protected readonly TRSAFactoryParams _params;
 
         public RSAFactory(IOptions<TRSAFactoryParams> options) => _params = options.Value;
diff --git a/DigitalData.Core.Security/DIExtensions.cs b/DigitalData.Core.Security/DIExtensions.cs
index 652394d..bc7688b 100644
--- a/DigitalData.Core.Security/DIExtensions.cs
+++ b/DigitalData.Core.Security/DIExtensions.cs
@@ -37,19 +37,49 @@ namespace DigitalData.Core.Security
             where TAsymCryptParams : AsymCryptParams
                 => services.AddSingleton(Options.Create(param)).AddAsymCryptService<TAsymCryptParams>();
 
-        private static IServiceCollection AddRSAFactory<TRSAFactoryParams>(this IServiceCollection services)
-            where TRSAFactoryParams : RSAFactoryParams
+        /// <summary>
+        /// Registers default RSA Factory instance with default params
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddRSAFactory(this IServiceCollection services)
         {
-            services.TryAddScoped<IRSAFactory<TRSAFactoryParams>, RSAFactory<TRSAFactoryParams>>();
+            services.TryAddScoped(_ => Instance.RSAFactory);
             return services;
         }
 
+        /// <summary>
+        /// Registers a custom RSA Factory instance with specified parameters from the given configuration section.
+        /// </summary>
+        /// <typeparam name="TRSAFactoryParams"></typeparam>
+        /// <param name="services"></param>
+        /// <param name="section"></param>
+        /// <returns></returns>
         public static IServiceCollection AddRSAFactory<TRSAFactoryParams>(this IServiceCollection services, IConfigurationSection section)
             where TRSAFactoryParams : RSAFactoryParams
-                => services.Configure<TRSAFactoryParams>(section).AddRSAFactory<TRSAFactoryParams>();
+        {
+            services.Configure<TRSAFactoryParams>(section);
+            services.TryAddSingleton<IRSAFactory<TRSAFactoryParams>, RSAFactory<TRSAFactoryParams>>();
+            return services;
+        }
 
-        public static IServiceCollection AddRSAFactory<TRSAFactoryParams>(this IServiceCollection services, TRSAFactoryParams param)
+        /// <summary>
+        /// Registers an RSA Factory with the specified parameters from the given instance. Optionally, sets it as the default factory.
+        /// </summary>
+        /// <typeparam name="TRSAFactoryParams">The type of the RSA factory parameters.</typeparam>
+        /// <param name="services"></param>
+        /// <param name="rsaParams"></param>
+        /// <param name="setAsDefault">If true, the factory is registered as the default <see cref="IRSAFactory"/>. Otherwise, it is registered as <see cref="IRSAFactory{TRSAFactoryParams}"/>.</param>
+        /// <returns>The updated <see cref="IServiceCollection"/> with the RSA Factory registered.</returns>
+        public static IServiceCollection AddRSAFactory<TRSAFactoryParams>(this IServiceCollection services, TRSAFactoryParams rsaParams, bool setAsDefault = false)
             where TRSAFactoryParams : RSAFactoryParams
-                => services.AddSingleton(Options.Create(param)).AddRSAFactory<TRSAFactoryParams>();
+        {
+            services.TryAddSingleton(Options.Create(rsaParams));
+            if (setAsDefault)
+                services.TryAddSingleton<IRSAFactory, RSAFactory<TRSAFactoryParams>>();
+            else
+                services.TryAddSingleton<IRSAFactory<TRSAFactoryParams>, RSAFactory<TRSAFactoryParams>>();
+            return services;
+        }
     }
 }
\ No newline at end of file
diff --git a/DigitalData.Core.Security/Instance.cs b/DigitalData.Core.Security/Instance.cs
new file mode 100644
index 0000000..e71f5a5
--- /dev/null
+++ b/DigitalData.Core.Security/Instance.cs
@@ -0,0 +1,14 @@
+using DigitalData.Core.Abstractions.Security;
+using DigitalData.Core.Security.Config;
+using DigitalData.Core.Security.Cryptographer;
+using Microsoft.Extensions.Options;
+
+namespace DigitalData.Core.Security
+{
+    public static class Instance
+    {
+        private static readonly Lazy<RSAFactory<RSAFactoryParams>> LazyInstance = new(() => new(Options.Create<RSAFactoryParams>(new())));
+
+        public static IRSAFactory RSAFactory => LazyInstance.Value;
+    }
+}
\ No newline at end of file