From 3511f866c1f8e1eaaff48d466f44ce1263b1089e Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Wed, 23 Dec 2020 17:18:13 +0800
Subject: [PATCH] Set returnUrl for blazor account manage button

---
 .../Menus/MyProjectNameMenuContributor.cs                    | 5 ++---
 .../wwwroot/appsettings.json                                 | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs
index 8b5aebacce..c42223526a 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs
@@ -59,11 +59,10 @@ namespace MyCompanyName.MyProjectName.Blazor.Menus
                 context.Menu.AddItem(new ApplicationMenuItem(
                     "Account.Manage",
                     accountStringLocalizer["ManageYourProfile"],
-                    $"{identityServerUrl.EnsureEndsWith('/')}Account/Manage",
+                    $"{identityServerUrl.EnsureEndsWith('/')}Account/Manage?returnUrl={_configuration["App:SelfUrl"]}",
                     icon: "fa fa-cog",
                     order: 1000,
-                    null,
-                    "_blank"));
+                    null));
             }
 
             return Task.CompletedTask;
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/appsettings.json
index 997cf89e64..4349de1480 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/appsettings.json
@@ -1,4 +1,7 @@
 {
+  "App": {
+    "SelfUrl": "https://localhost:44307"
+  },
   "AuthServer": {
     "Authority": "https://localhost:44305",
     "ClientId": "MyProjectName_Blazor",