Merge pull request 'Refactored AddLiteCharmsWebSecurity to be OS aware when it handles data protection keys' (#121) from dataprotection into master

Reviewed-on: #121

LiteCharms.Features/Extensions/Api.cs

@@ -2,6 +2,8 @@
 using LiteCharms.Features.Api;
 using LiteCharms.Features.Api.Configuration;
 using LiteCharms.Features.Api.Sdk;
+using Microsoft.AspNetCore.Hosting;
+using System.Runtime.InteropServices;
 
 namespace LiteCharms.Features.Extensions;
 
@@ -51,8 +53,21 @@ public static class Api
         return services;
     }
 
-    public static IServiceCollection AddLiteCharmsWebSecurity(this IServiceCollection services, IConfiguration configuration)
+    public static IServiceCollection AddLiteCharmsWebSecurity(this IServiceCollection services, IConfiguration configuration, IWebHostEnvironment environment)
     {
+        string keysFolderPath;
+
+        if (OperatingSystem.IsLinux()) 
+            keysFolderPath = "/app/shared-keys";
+        else
+            keysFolderPath = Path.Combine(environment.ContentRootPath, "obj", "DeveloperDataProtectionKeys");
+
+        if (!Directory.Exists(keysFolderPath)) Directory.CreateDirectory(keysFolderPath);
+
+        services.AddDataProtection()
+            .PersistKeysToFileSystem(new DirectoryInfo(keysFolderPath))
+            .SetApplicationName("MidrandBookshop");
+
         var configSection = configuration.GetSection(nameof(LiteCharmsSettings));
 
         var authOptions = new LiteCharmsSettings();
@@ -77,6 +92,8 @@ public static class Api
             options.SaveTokens = true;
             options.GetClaimsFromUserInfoEndpoint = true;
 
+            options.ForwardSignOut = CookieAuthenticationDefaults.AuthenticationScheme;
+
             options.Scope.Clear();
             options.Scope.Add("openid");
             options.Scope.Add("profile");
@@ -143,17 +160,22 @@ public static class Api
             });
         });
 
-        app.MapGet("/logout", async (HttpContext context) =>
+        app.MapGet("/logout", async (HttpContext context, string? redirectUri = null) =>
         {
             var idToken = await context.GetTokenAsync("id_token");
 
-            var authProperties = new AuthenticationProperties { RedirectUri = "/", };
+            if (string.IsNullOrWhiteSpace(redirectUri))
+            {
+                var host = context.Request.Host.ToUriComponent();
+                redirectUri = $"https://{host}/";
+            }
+
+            var authProperties = new AuthenticationProperties { RedirectUri = redirectUri, };
 
             if (!string.IsNullOrEmpty(idToken))
                 authProperties.Parameters.Add("id_token_hint", idToken);
 
             await context.SignOutAsync(OpenIdConnectDefaults.AuthenticationScheme, authProperties);
-            await context.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
         });
 
         return app;

LiteCharms.Features/LiteCharms.Features.csproj

@@ -194,6 +194,7 @@
 
   <!-- Shared Usings -->
   <ItemGroup>
+    <Using Include="Microsoft.AspNetCore.DataProtection" />
     <Using Include="Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage" />
     <Using Include="System.Text.Json.Serialization" />
     <Using Include="System.Reflection" />