Merge commit '4576b5aa2b6c6034247d3cd136fe15c82d27a6f4'

Reviewed-on: #78

LiteCharms.Features/Extensions/Api.cs

@@ -50,7 +50,8 @@ public static class Api
                     {
                         var uriBuilder = new UriBuilder(context.ProtocolMessage.RedirectUri)
                         {
-                            Scheme = "https"
+                            Scheme = "https",
+                            Port = -1,
                         };
 
                         context.ProtocolMessage.RedirectUri = uriBuilder.Uri.ToString();
@@ -105,36 +106,20 @@ public static class Api
         {
             await context.ChallengeAsync(OpenIdConnectDefaults.AuthenticationScheme, new AuthenticationProperties
             {
-                RedirectUri = redirectUri,
+                RedirectUri = redirectUri,                
             });
         });
 
         app.MapGet("/logout", async (HttpContext context, IHttpClientFactory httpClientFactory, IOptions<AuthentikSettings> settings) =>
         {
-            var authOptions = settings.Value;
-            var accessToken = await context.GetTokenAsync("access_token");
-
-            if (!string.IsNullOrEmpty(accessToken))
-            {
-                try
-                {
-                    var client = httpClientFactory.CreateClient();
-
-                    var requestContent = new FormUrlEncodedContent(new Dictionary<string, string>(StringComparer.Ordinal)
-                    {
-                        { "token", accessToken },
-                        { "client_id", authOptions.ClientId! },
-                        { "client_secret", authOptions.ClientSecret! },
-                    });
-
-                    await client.PostAsync(authOptions.RevokationEndpoint, requestContent, context.RequestAborted);
-                }
-                catch { }
-            }
-
             await context.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
 
-            return Results.Redirect($"{authOptions.Authority}end-session/");
+            string currentBaseUrl = $"https://{context.Request.Host}{context.Request.PathBase}/";
+
+            await context.SignOutAsync(OpenIdConnectDefaults.AuthenticationScheme, new AuthenticationProperties
+            {
+                RedirectUri = currentBaseUrl
+            });
         });
 
         return app;