Skip to content

Commit 52dcedf

Browse files
committed
Fix NavMenu.razor output
- Move "/Logout" endpoint
1 parent a96b2b9 commit 52dcedf

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,6 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
2121

2222
var accountGroup = endpoints.MapGroup("/Account");
2323

24-
accountGroup.MapPost("/Logout", async (
25-
ClaimsPrincipal user,
26-
SignInManager<ApplicationUser> signInManager,
27-
[FromForm] string returnUrl) =>
28-
{
29-
if (signInManager.IsSignedIn(user))
30-
{
31-
await signInManager.SignOutAsync();
32-
}
33-
34-
return TypedResults.LocalRedirect($"~/{returnUrl}");
35-
});
36-
3724
accountGroup.MapPost("/PerformExternalLogin", (
3825
HttpContext context,
3926
[FromServices] SignInManager<ApplicationUser> signInManager,
@@ -53,6 +40,19 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
5340
return TypedResults.Challenge(properties, [provider]);
5441
});
5542

43+
accountGroup.MapPost("/Logout", async (
44+
ClaimsPrincipal user,
45+
SignInManager<ApplicationUser> signInManager,
46+
[FromForm] string returnUrl) =>
47+
{
48+
if (signInManager.IsSignedIn(user))
49+
{
50+
await signInManager.SignOutAsync();
51+
}
52+
53+
return TypedResults.LocalRedirect($"~/{returnUrl}");
54+
});
55+
5656
var manageGroup = accountGroup.MapGroup("/Manage").RequireAuthorization();
5757

5858
manageGroup.MapPost("/LinkExternalLogin", async (

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,4 @@
9595
}
9696
}
9797
##endif*@
98+

0 commit comments

Comments
 (0)