Merge pull request 'Added certificate protected data protection keys' (#124) from dataprotection into master

Reviewed-on: #124

LiteCharms.Features/Extensions/Api.cs

@@ -5,6 +5,7 @@ using LiteCharms.Features.Api.Sdk;
 using LiteCharms.Features.Postgres;
 using Microsoft.AspNetCore.Hosting;
 using System.Runtime.InteropServices;
+using System.Security.Cryptography.X509Certificates;
 
 namespace LiteCharms.Features.Extensions;
 
@@ -56,7 +57,10 @@ public static class Api
 
     public static IServiceCollection AddLiteCharmsWebSecurity(this IServiceCollection services, IConfiguration configuration)
     {
+        var certificate = X509CertificateLoader.LoadPkcs12(Convert.FromBase64String(configuration["DataProtection:Certificate"]!), configuration["DataProtection:Password"]);
+
         services.AddDataProtection().PersistKeysToDbContext<DataProtectionDbContext>()
+            .ProtectKeysWithCertificate(certificate)
             .SetApplicationName("LiteCharmsApp");
 
         var configSection = configuration.GetSection(nameof(LiteCharmsSettings));

LiteCharms.Features/Extensions/Postgres.cs

@@ -9,18 +9,10 @@ public static class Postgres
 
     public static IServiceCollection AddDataProtectionDatabase(this IServiceCollection services, IConfiguration configuration)
     {
-        var connectionString = configuration.GetConnectionString(DataProtectionDbConfigName);
+        var connectionString = configuration.GetConnectionString(DataProtectionDbConfigName);        
-
-        var dataSourceBuilder = new NpgsqlDataSourceBuilder(connectionString);
-
-        dataSourceBuilder.ConfigureTypeLoading(options => { options.EnableTypeLoading(false); });
-
-        var dataSource = dataSourceBuilder.Build();
-
-        services.AddSingleton(dataSource);
 
         services.AddPooledDbContextFactory<DataProtectionDbContext>(options =>
-            options.UseNpgsql(dataSource));
+            options.UseNpgsql(connectionString));
 
         return services;
     }