Flow return url in register confirmation (#15075)

HaoK · web-flow · commit 5dfb923c68fe · 2019-10-17T13:04:13.000-07:00
diff --git a/src/Identity/UI/ref/Microsoft.AspNetCore.Identity.UI.netcoreapp.cs b/src/Identity/UI/ref/Microsoft.AspNetCore.Identity.UI.netcoreapp.cs
@@ -177,7 +177,7 @@ public RegisterConfirmationModel() { }
         public bool DisplayConfirmAccountLink { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         public string EmailConfirmationUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public virtual System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.IActionResult> OnGetAsync(string email) { throw null; }
+        public virtual System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.IActionResult> OnGetAsync(string email, string returnUrl = null) { throw null; }
     }
     [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute]
     public abstract partial class RegisterModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel
@@ -627,7 +627,7 @@ public RegisterConfirmationModel() { }
         public bool DisplayConfirmAccountLink { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         public string EmailConfirmationUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public virtual System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.IActionResult> OnGetAsync(string email) { throw null; }
+        public virtual System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.IActionResult> OnGetAsync(string email, string returnUrl = null) { throw null; }
     }
     [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute]
     public abstract partial class RegisterModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Register.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Register.cshtml.cs
@@ -147,15 +147,15 @@ public override async Task<IActionResult> OnPostAsync(string returnUrl = null)
                     var callbackUrl = Url.Page(
                         "/Account/ConfirmEmail",
                         pageHandler: null,
-                        values: new { area = "Identity", userId = userId, code = code },
+                        values: new { area = "Identity", userId = userId, code = code, returnUrl = returnUrl },
                         protocol: Request.Scheme);
 
                     await _emailSender.SendEmailAsync(Input.Email, "Confirm your email",
                         $"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
 
                     if (_userManager.Options.SignIn.RequireConfirmedAccount)
                     {
-                        return RedirectToPage("RegisterConfirmation", new { email = Input.Email });
+                        return RedirectToPage("RegisterConfirmation", new { email = Input.Email, returnUrl = returnUrl });
                     }
                     else
                     {
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/RegisterConfirmation.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/RegisterConfirmation.cshtml.cs
@@ -43,7 +43,7 @@ public class RegisterConfirmationModel : PageModel
         ///     This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual Task<IActionResult> OnGetAsync(string email) => throw new NotImplementedException();
+        public virtual Task<IActionResult> OnGetAsync(string email, string returnUrl = null) => throw new NotImplementedException();
     }
 
     internal class RegisterConfirmationModel<TUser> : RegisterConfirmationModel where TUser : class
@@ -57,12 +57,13 @@ public RegisterConfirmationModel(UserManager<TUser> userManager, IEmailSender se
             _sender = sender;
         }
 
-        public override async Task<IActionResult> OnGetAsync(string email)
+        public override async Task<IActionResult> OnGetAsync(string email, string returnUrl = null)
         {
             if (email == null)
             {
                 return RedirectToPage("/Index");
             }
+            returnUrl = returnUrl ?? Url.Content("~/");
 
             var user = await _userManager.FindByEmailAsync(email);
             if (user == null)
@@ -81,7 +82,7 @@ public override async Task<IActionResult> OnGetAsync(string email)
                 EmailConfirmationUrl = Url.Page(
                     "/Account/ConfirmEmail",
                     pageHandler: null,
-                    values: new { area = "Identity", userId = userId, code = code },
+                    values: new { area = "Identity", userId = userId, code = code, returnUrl = returnUrl },
                     protocol: Request.Scheme);
             }
 
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Register.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Register.cshtml.cs
@@ -146,15 +146,15 @@ public override async Task<IActionResult> OnPostAsync(string returnUrl = null)
                     var callbackUrl = Url.Page(
                         "/Account/ConfirmEmail",
                         pageHandler: null,
-                        values: new { area = "Identity", userId = userId, code = code },
+                        values: new { area = "Identity", userId = userId, code = code, returnUrl = returnUrl },
                         protocol: Request.Scheme);
 
                     await _emailSender.SendEmailAsync(Input.Email, "Confirm your email",
                         $"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
 
                     if (_userManager.Options.SignIn.RequireConfirmedAccount)
                     {
-                        return RedirectToPage("RegisterConfirmation", new { email = Input.Email });
+                        return RedirectToPage("RegisterConfirmation", new { email = Input.Email, returnUrl = returnUrl });
                     }
                     else
                     {
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/RegisterConfirmation.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/RegisterConfirmation.cshtml.cs
@@ -43,7 +43,7 @@ public class RegisterConfirmationModel : PageModel
         ///     This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual Task<IActionResult> OnGetAsync(string email) => throw new NotImplementedException();
+        public virtual Task<IActionResult> OnGetAsync(string email, string returnUrl = null) => throw new NotImplementedException();
     }
 
     internal class RegisterConfirmationModel<TUser> : RegisterConfirmationModel where TUser : class
@@ -57,12 +57,13 @@ public RegisterConfirmationModel(UserManager<TUser> userManager, IEmailSender se
             _sender = sender;
         }
 
-        public override async Task<IActionResult> OnGetAsync(string email)
+        public override async Task<IActionResult> OnGetAsync(string email, string returnUrl = null)
         {
             if (email == null)
             {
                 return RedirectToPage("/Index");
             }
+            returnUrl = returnUrl ?? Url.Content("~/");
 
             var user = await _userManager.FindByEmailAsync(email);
             if (user == null)
@@ -81,7 +82,7 @@ public override async Task<IActionResult> OnGetAsync(string email)
                 EmailConfirmationUrl = Url.Page(
                     "/Account/ConfirmEmail",
                     pageHandler: null,
-                    values: new { area = "Identity", userId = userId, code = code },
+                    values: new { area = "Identity", userId = userId, code = code, returnUrl = returnUrl },
                     protocol: Request.Scheme);
             }
 
diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Register.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Register.cs
@@ -64,7 +64,7 @@ public async Task<RegisterConfirmation> SubmitRegisterFormWithConfirmation(strin
             });
 
             var registeredLocation = ResponseAssert.IsRedirect(registered);
-            Assert.Equal(RegisterConfirmation.Path + "?email="+userName, registeredLocation.ToString());
+            Assert.Equal(RegisterConfirmation.Path + "?email="+userName+"&returnUrl=%2F", registeredLocation.ToString());
             var registerResponse = await Client.GetAsync(registeredLocation);
             var register = await ResponseAssert.IsHtmlDocumentAsync(registerResponse);
 

Original file line number	Diff line number	Diff line change
`@@ -147,15 +147,15 @@ public override async Task<IActionResult> OnPostAsync(string returnUrl = null)`
`147`	`147`	`var callbackUrl = Url.Page(`
`148`	`148`	`"/Account/ConfirmEmail",`
`149`	`149`	`pageHandler: null,`
`150`		`- values: new { area = "Identity", userId = userId, code = code },`
	`150`	`+ values: new { area = "Identity", userId = userId, code = code, returnUrl = returnUrl },`
`151`	`151`	`protocol: Request.Scheme);`
`152`	`152`
`153`	`153`	`await _emailSender.SendEmailAsync(Input.Email, "Confirm your email",`
`154`	`154`	`$"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");`
`155`	`155`
`156`	`156`	`if (_userManager.Options.SignIn.RequireConfirmedAccount)`
`157`	`157`	`{`
`158`		`- return RedirectToPage("RegisterConfirmation", new { email = Input.Email });`
	`158`	`+ return RedirectToPage("RegisterConfirmation", new { email = Input.Email, returnUrl = returnUrl });`
`159`	`159`	`}`
`160`	`160`	`else`
`161`	`161`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public class RegisterConfirmationModel : PageModel`
`43`	`43`	`/// This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used`
`44`	`44`	`/// directly from your code. This API may change or be removed in future releases.`
`45`	`45`	`/// </summary>`
`46`		`- public virtual Task<IActionResult> OnGetAsync(string email) => throw new NotImplementedException();`
	`46`	`+ public virtual Task<IActionResult> OnGetAsync(string email, string returnUrl = null) => throw new NotImplementedException();`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`internal class RegisterConfirmationModel<TUser> : RegisterConfirmationModel where TUser : class`
`@@ -57,12 +57,13 @@ public RegisterConfirmationModel(UserManager<TUser> userManager, IEmailSender se`
`57`	`57`	`_sender = sender;`
`58`	`58`	`}`
`59`	`59`
`60`		`- public override async Task<IActionResult> OnGetAsync(string email)`
	`60`	`+ public override async Task<IActionResult> OnGetAsync(string email, string returnUrl = null)`
`61`	`61`	`{`
`62`	`62`	`if (email == null)`
`63`	`63`	`{`
`64`	`64`	`return RedirectToPage("/Index");`
`65`	`65`	`}`
	`66`	`+ returnUrl = returnUrl ?? Url.Content("~/");`
`66`	`67`
`67`	`68`	`var user = await _userManager.FindByEmailAsync(email);`
`68`	`69`	`if (user == null)`
`@@ -81,7 +82,7 @@ public override async Task<IActionResult> OnGetAsync(string email)`
`81`	`82`	`EmailConfirmationUrl = Url.Page(`
`82`	`83`	`"/Account/ConfirmEmail",`
`83`	`84`	`pageHandler: null,`
`84`		`- values: new { area = "Identity", userId = userId, code = code },`
	`85`	`+ values: new { area = "Identity", userId = userId, code = code, returnUrl = returnUrl },`
`85`	`86`	`protocol: Request.Scheme);`
`86`	`87`	`}`
`87`	`88`
Original file line number	Diff line number	Diff line change
`@@ -146,15 +146,15 @@ public override async Task<IActionResult> OnPostAsync(string returnUrl = null)`
`146`	`146`	`var callbackUrl = Url.Page(`
`147`	`147`	`"/Account/ConfirmEmail",`
`148`	`148`	`pageHandler: null,`
`149`		`- values: new { area = "Identity", userId = userId, code = code },`
	`149`	`+ values: new { area = "Identity", userId = userId, code = code, returnUrl = returnUrl },`
`150`	`150`	`protocol: Request.Scheme);`
`151`	`151`
`152`	`152`	`await _emailSender.SendEmailAsync(Input.Email, "Confirm your email",`
`153`	`153`	`$"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");`
`154`	`154`
`155`	`155`	`if (_userManager.Options.SignIn.RequireConfirmedAccount)`
`156`	`156`	`{`
`157`		`- return RedirectToPage("RegisterConfirmation", new { email = Input.Email });`
	`157`	`+ return RedirectToPage("RegisterConfirmation", new { email = Input.Email, returnUrl = returnUrl });`
`158`	`158`	`}`
`159`	`159`	`else`
`160`	`160`	`{`