Merge pull request 'Forcing https' (#14) from notifications into master

Reviewed-on: #14

ShopAdmin/Program.cs

@@ -1,6 +1,5 @@
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.Mediator;
-using Microsoft.AspNetCore.Authentication;
 using ShopAdmin.Components;
 using static LiteCharms.Features.Email.Extensions.Constants;
 
@@ -66,20 +65,21 @@ builder.Services.AddAuthentication(options =>
         RoleClaimType = "groups"
     };
 
-    options.Events = new OpenIdConnectEvents
+    builder.Services.AddOptions<OpenIdConnectOptions>(OpenIdConnectDefaults.AuthenticationScheme).Configure(options =>
     {
-        OnRedirectToIdentityProviderForSignOut = async callbackContext =>
+        options.Events.OnRedirectToIdentityProvider = context =>
         {
-            var request = callbackContext.Request;
-            string currentBaseUrl = $"{request.Scheme}://{request.Host}{request.PathBase}/";
+            context.ProtocolMessage.RedirectUri = context.ProtocolMessage.RedirectUri.Replace("http://", "https://");
+            
+            return Task.CompletedTask;
+         };
+    });
+});
 
-            callbackContext.ProtocolMessage.PostLogoutRedirectUri = currentBaseUrl;
-
-            var idToken = await callbackContext.HttpContext.GetTokenAsync("id_token");
-
-            if (!string.IsNullOrEmpty(idToken)) callbackContext.ProtocolMessage.IdTokenHint = idToken;
-        }
-    };
+builder.Services.Configure<ForwardedHeadersOptions>(options =>
+{
+    options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
+    options.KnownProxies.Clear();
 });
 
 var app = builder.Build();
@@ -105,6 +105,7 @@ app.UseStatusCodePagesWithReExecute("/not-found", createScopeForStatusCodePages:
 
 app.UseHttpsRedirection();
 app.UseAntiforgery();
+app.UseForwardedHeaders();
 
 app.UseAuthentication();
 app.UseAuthorization();
@@ -117,7 +118,7 @@ app.MapGet("/auth/logout", async (HttpContext context) =>
 {
     await context.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
 
-    string currentBaseUrl = $"{context.Request.Scheme}://{context.Request.Host}{context.Request.PathBase}/";
+    string currentBaseUrl = $"https://{context.Request.Host}{context.Request.PathBase}/";
 
     await context.SignOutAsync(OpenIdConnectDefaults.AuthenticationScheme, new AuthenticationProperties
     {

ShopAdmin/ShopAdmin.csproj

@@ -57,6 +57,8 @@
 
   <!-- Shared Global Usings -->
   <ItemGroup>
+    <Using Include="Microsoft.AspNetCore.HttpOverrides" />
+    <Using Include="Microsoft.AspNetCore.Authentication" />
     <Using Include="Blazored.Toast" />
     <Using Include="Quartz" />
     <Using Include="Mediator" />