OIDC Blazor re-use existing schemes (dotnet#259)

Author: damienbod

8.0/BlazorWebAppOidc/BlazorWebAppOidc/LoginLogoutEndpointRouteBuilderExtensions.cs

@@ -18,7 +18,7 @@ internal static IEndpointConventionBuilder MapLoginAndLogout(this IEndpointRoute
         // the user will automatically be signed back in the next time they visit a page that requires authentication
         // without being able to choose another account.
         group.MapPost("/logout", ([FromForm] string? returnUrl) => TypedResults.SignOut(GetAuthProperties(returnUrl),
-            ["Cookies", "MicrosoftOidc"]));
+            [CookieAuthenticationDefaults.AuthenticationScheme, "MicrosoftOidc"]));
 
         return group;
     }

8.0/BlazorWebAppOidc/BlazorWebAppOidc/Program.cs

@@ -7,12 +7,14 @@
 using Microsoft.AspNetCore.Mvc;
 using BlazorWebAppOidc.Weather;
 using BlazorWebAppOidc.Client.Weather;
+
+const string MS_OIDC_SCHEME = "MicrosoftOidc";
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
-builder.Services.AddAuthentication("MicrosoftOidc")
-    .AddOpenIdConnect("MicrosoftOidc", oidcOptions =>
+builder.Services.AddAuthentication(MS_OIDC_SCHEME)
+    .AddOpenIdConnect(MS_OIDC_SCHEME, oidcOptions =>
     {
         // For the following OIDC settings, any line that's commented out
         // represents a DEFAULT setting. If you adopt the default, you can
@@ -133,14 +135,14 @@
         // expiration.
         // ........................................................................
     })
-    .AddCookie("Cookies");
+    .AddCookie(CookieAuthenticationDefaults.AuthenticationScheme);
 
 // ConfigureCookieOidcRefresh attaches a cookie OnValidatePrincipal callback to get
 // a new access token when the current one expires, and reissue a cookie with the
 // new access token saved inside. If the refresh fails, the user will be signed
 // out. OIDC connect options are set for saving tokens and the offline access
 // scope.
-builder.Services.ConfigureCookieOidcRefresh("Cookies", "MicrosoftOidc");
+builder.Services.ConfigureCookieOidcRefresh(CookieAuthenticationDefaults.AuthenticationScheme, MS_OIDC_SCHEME);
 
 builder.Services.AddAuthorization();
 

8.0/BlazorWebAppOidcBff/BlazorWebAppOidc/LoginLogoutEndpointRouteBuilderExtensions.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Microsoft.AspNetCore.Routing;
@@ -18,7 +17,7 @@ internal static IEndpointConventionBuilder MapLoginAndLogout(this IEndpointRoute
         // the user will automatically be signed back in the next time they visit a page that requires authentication
         // without being able to choose another account.
         group.MapPost("/logout", ([FromForm] string? returnUrl) => TypedResults.SignOut(GetAuthProperties(returnUrl),
-            ["Cookies", "MicrosoftOidc"]));
+            [CookieAuthenticationDefaults.AuthenticationScheme, "MicrosoftOidc"]));
 
         return group;
     }

8.0/BlazorWebAppOidcBff/BlazorWebAppOidc/Program.cs

@@ -7,15 +7,17 @@
 using BlazorWebAppOidc.Components;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Microsoft.AspNetCore.Authentication.Cookies;
+
+const string MS_OIDC_SCHEME = "MicrosoftOidc";
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add service defaults & Aspire components.
 builder.AddServiceDefaults();
 
 // Add services to the container.
-builder.Services.AddAuthentication("MicrosoftOidc")
-    .AddOpenIdConnect("MicrosoftOidc", oidcOptions =>
+builder.Services.AddAuthentication(MS_OIDC_SCHEME)
+    .AddOpenIdConnect(MS_OIDC_SCHEME, oidcOptions =>
     {
         // For the following OIDC settings, any line that's commented out
         // represents a DEFAULT setting. If you adopt the default, you can
@@ -151,14 +153,14 @@
         // expiration.
         // ........................................................................
     })
-    .AddCookie("Cookies");
+    .AddCookie(CookieAuthenticationDefaults.AuthenticationScheme);
 
 // ConfigureCookieOidcRefresh attaches a cookie OnValidatePrincipal callback to get
 // a new access token when the current one expires, and reissue a cookie with the
 // new access token saved inside. If the refresh fails, the user will be signed
 // out. OIDC connect options are set for saving tokens and the offline access
 // scope.
-builder.Services.ConfigureCookieOidcRefresh("Cookies", "MicrosoftOidc");
+builder.Services.ConfigureCookieOidcRefresh(CookieAuthenticationDefaults.AuthenticationScheme, MS_OIDC_SCHEME);
 
 builder.Services.AddAuthorization();