Merge pull request #13485 from abpframework/auto-merge/rel-6-0/1228

Merge branch dev with rel-6.0

modules/openiddict/app/OpenIddict.Demo.Client.Mvc/Program.cs

@@ -19,19 +19,15 @@ builder.Services.AddAuthentication(options =>
     .AddOpenIdConnect("oidc", options =>
     {
         options.Authority = "https://localhost:44301/";
+        options.RequireHttpsMetadata = true;
+        options.ResponseType = OidcConstants.ResponseTypes.Code;
 
         options.ClientId = "AbpApp";
         options.ClientSecret = "1q2w3e*";
 
-        options.RequireHttpsMetadata = true;
-        options.GetClaimsFromUserInfoEndpoint = true;
-        options.SaveTokens = true;
-
         options.UsePkce = true;
-
-        options.ResponseType = OidcConstants.ResponseTypes.Code;
-
-        options.SignOutScheme = "Cookies";
+        options.SaveTokens = true;
+        options.GetClaimsFromUserInfoEndpoint = true;
 
         options.Scope.Add("email");
         options.Scope.Add("roles");

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs

@@ -153,7 +153,6 @@ public class MyProjectNameWebModule : AbpModule
                 options.UsePkce = true;
                 options.SaveTokens = true;
                 options.GetClaimsFromUserInfoEndpoint = true;
-                options.SignOutScheme = "Cookies";
 
                 options.Scope.Add("roles");
                 options.Scope.Add("email");