Merge pull request 'Refactored AddSecurityEndpoints' (#88) from payments into master

Reviewed-on: #88

LiteCharms.Features/Extensions/Api.cs

@@ -31,9 +31,8 @@ public static class Api
 
             options.ClientId = authOptions.ClientId;
             options.ClientSecret = authOptions.ClientSecret;
-            options.SignedOutCallbackPath = "/signout-callback-oidc";
-
             options.ResponseType = "code";
+
             options.SaveTokens = true;
             options.GetClaimsFromUserInfoEndpoint = true;
 
@@ -41,16 +40,10 @@ public static class Api
             options.Scope.Add("openid");
             options.Scope.Add("profile");
             options.Scope.Add("email");
-
-            options.CorrelationCookie.SecurePolicy = CookieSecurePolicy.Always;
-            options.CorrelationCookie.SameSite = SameSiteMode.None;
-            options.CorrelationCookie.HttpOnly = true;
-
-            options.NonceCookie.SecurePolicy = CookieSecurePolicy.Always;
-            options.NonceCookie.SameSite = SameSiteMode.None;
-            options.NonceCookie.HttpOnly = true;
         });
 
+        services.AddCascadingAuthenticationState();
+
         return services;
     }
 
@@ -71,7 +64,7 @@ public static class Api
                 options.TokenValidationParameters = new TokenValidationParameters
                 {
                     ValidIssuer = authOptions.Authority,
-                    ValidateAudience = false,
+                    ValidateAudience = true,
                     ValidateIssuer = true,
                 };
             });
@@ -83,14 +76,6 @@ public static class Api
 
     public static WebApplication AddSecurityEndpoints(this WebApplication app)
     {
-        app.MapGet("/login", async (HttpContext context, string redirectUri = "/") =>
-        {
-            await context.ChallengeAsync(OpenIdConnectDefaults.AuthenticationScheme, new AuthenticationProperties
-            {
-                RedirectUri = redirectUri,                
-            });
-        });
-
         app.MapGet("/logout", async (HttpContext context, IHttpClientFactory httpClientFactory, IOptions<LiteCharmsSettings> settings) =>
         {
             await context.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
@@ -99,7 +84,7 @@ public static class Api
 
             await context.SignOutAsync(OpenIdConnectDefaults.AuthenticationScheme, new AuthenticationProperties
             {
-                RedirectUri = currentBaseUrl
+                RedirectUri = currentBaseUrl,
             });
         });