PR tweaks

HaoK · HaoK · commit 0c68be0eb5ce · 2019-03-25T16:51:09.000-07:00
diff --git a/src/Identity/UI/ref/Microsoft.AspNetCore.Identity.UI.netcoreapp3.0.cs b/src/Identity/UI/ref/Microsoft.AspNetCore.Identity.UI.netcoreapp3.0.cs
@@ -177,7 +177,7 @@ public partial class RegisterConfirmationModel : Microsoft.AspNetCore.Mvc.RazorP
         public RegisterConfirmationModel() { }
         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 bool IsDevelopment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool DisplayConfirmAccountLink { [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; }
     }
     [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute]
@@ -623,7 +623,7 @@ public partial class RegisterConfirmationModel : Microsoft.AspNetCore.Mvc.RazorP
         public RegisterConfirmationModel() { }
         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 bool IsDevelopment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool DisplayConfirmAccountLink { [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; }
     }
     [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute]
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Email.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Email.cshtml.cs
@@ -144,7 +144,7 @@ await _emailSender.SendEmailAsync(
                     "Confirm your email",
                     $"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
 
-                StatusMessage = "Confirmation link to change email sent. Please check your email." + callbackUrl;
+                StatusMessage = "Confirmation link to change email sent. Please check your email.";
                 return RedirectToPage();
             }
 
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/RegisterConfirmation.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/RegisterConfirmation.cshtml
@@ -6,11 +6,11 @@
 
 <h2>@ViewData["Title"]</h2>
 @{
-    if (@Model.IsDevelopment)
+    if (@Model.DisplayConfirmAccountLink)
     {
 <p>
-    In development we provide an inline email confirmation link, see <a href="https://docs.microsoft.com/en-us/aspnet/core/security/authentication/accconfirm">these docs</a> for how to configure a real email provider.
-    <a href="@Model.EmailConfirmationUrl">Click here to confirm your account</a>
+    This app does not currently have a real email sender registered, see <a href="https://docs.microsoft.com/en-us/aspnet/core/security/authentication/accconfirm">these docs</a> for how to configure a real email sender.
+    Normally this would be emailed: <a href="@Model.EmailConfirmationUrl">Click here to confirm your account</a>
 </p>
     }
     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
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Hosting;
@@ -30,7 +31,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 bool IsDevelopment { get; set; }
+        public bool DisplayConfirmAccountLink { get; set; }
 
         /// <summary>
         ///     This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used
@@ -49,11 +50,13 @@ internal class RegisterConfirmationModel<TUser> : RegisterConfirmationModel wher
     {
         private readonly UserManager<TUser> _userManager;
         private readonly IWebHostEnvironment _hostingEnv;
+        private readonly IEmailSender _sender;
 
-        public RegisterConfirmationModel(UserManager<TUser> userManager, IWebHostEnvironment hostingEnv)
+        public RegisterConfirmationModel(UserManager<TUser> userManager, IWebHostEnvironment hostingEnv, IEmailSender sender)
         {
             _userManager = userManager;
             _hostingEnv = hostingEnv;
+            _sender = sender;
         }
 
         public override async Task<IActionResult> OnGetAsync(string email)
@@ -70,9 +73,9 @@ public override async Task<IActionResult> OnGetAsync(string email)
             }
 
             Email = email;
-            IsDevelopment = _hostingEnv.IsDevelopment();
-
-            if (IsDevelopment)
+            // This sender is a no-op, so we should auto confirm the account
+            DisplayConfirmAccountLink = _sender is EmailSender;
+            if (DisplayConfirmAccountLink)
             {
                 var userId = await _userManager.GetUserIdAsync(user);
                 var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmailChange.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmailChange.cshtml.cs
@@ -8,7 +8,6 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal
-
 {
     /// <summary>
     ///     This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used
@@ -52,7 +51,8 @@ public override async Task<IActionResult> OnGetAsync(string userId, string email
             var result = await _userManager.ChangeEmailAsync(user, email, code);
             if (!result.Succeeded)
             {
-                throw new InvalidOperationException($"Error changing email for user with ID '{userId}':");
+                ModelState.AddModelError(string.Empty, "Change email failed.");
+                return Page();
             }
 
             // In our UI email and user name are one and the same, so when we update the email
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Email.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Email.cshtml.cs
@@ -144,7 +144,7 @@ await _emailSender.SendEmailAsync(
                     "Confirm your email",
                     $"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
 
-                StatusMessage = "Confirmation link to change email sent. Please check your email." + callbackUrl;
+                StatusMessage = "Confirmation link to change email sent. Please check your email.";
                 return RedirectToPage();
             }
 
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/RegisterConfirmation.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/RegisterConfirmation.cshtml
@@ -6,11 +6,11 @@
 
 <h2>@ViewData["Title"]</h2>
 @{
-    if (@Model.IsDevelopment)
+    if (@Model.DisplayConfirmAccountLink)
     {
 <p>
-    In development we provide an inline email confirmation link, see <a href="https://docs.microsoft.com/en-us/aspnet/core/security/authentication/accconfirm">these docs</a> for how to configure a real email provider.
-    <a href="@Model.EmailConfirmationUrl">Click here to confirm your account</a>
+    This app does not currently have a real email sender registered, see <a href="https://docs.microsoft.com/en-us/aspnet/core/security/authentication/accconfirm">these docs</a> for how to configure a real email sender.
+    Normally this would be emailed: <a href="@Model.EmailConfirmationUrl">Click here to confirm your account</a>
 </p>
     }
     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
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Hosting;
@@ -30,7 +31,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 bool IsDevelopment { get; set; }
+        public bool DisplayConfirmAccountLink { get; set; }
 
         /// <summary>
         ///     This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used
@@ -49,11 +50,13 @@ internal class RegisterConfirmationModel<TUser> : RegisterConfirmationModel wher
     {
         private readonly UserManager<TUser> _userManager;
         private readonly IWebHostEnvironment _hostingEnv;
+        private readonly IEmailSender _sender;
 
-        public RegisterConfirmationModel(UserManager<TUser> userManager, IWebHostEnvironment hostingEnv)
+        public RegisterConfirmationModel(UserManager<TUser> userManager, IWebHostEnvironment hostingEnv, IEmailSender sender)
         {
             _userManager = userManager;
             _hostingEnv = hostingEnv;
+            _sender = sender;
         }
 
         public override async Task<IActionResult> OnGetAsync(string email)
@@ -70,9 +73,9 @@ public override async Task<IActionResult> OnGetAsync(string email)
             }
 
             Email = email;
-            IsDevelopment = _hostingEnv.IsDevelopment();
-
-            if (IsDevelopment)
+            // This sender is a no-op, so we should auto confirm the account
+            DisplayConfirmAccountLink = _sender is EmailSender;
+            if (DisplayConfirmAccountLink)
             {
                 var userId = await _userManager.GetUserIdAsync(user);
                 var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Startup.cs b/src/Identity/samples/IdentitySample.DefaultUI/Startup.cs
@@ -49,8 +49,6 @@ public void ConfigureServices(IServiceCollection services)
             services.AddDefaultIdentity<ApplicationUser>(o => o.SignIn.RequireConfirmedAccount = true)
                  .AddRoles<IdentityRole>()
                  .AddEntityFrameworkStores<ApplicationDbContext>();
-
-            //services.AddSingleton<IUserConfirmation<ApplicationUser>, BadDude>();
         }
 
 

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ await _emailSender.SendEmailAsync(`
`144`	`144`	`"Confirm your email",`
`145`	`145`	`$"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");`
`146`	`146`
`147`		`- StatusMessage = "Confirmation link to change email sent. Please check your email." + callbackUrl;`
	`147`	`+ StatusMessage = "Confirmation link to change email sent. Please check your email.";`
`148`	`148`	`return RedirectToPage();`
`149`	`149`	`}`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@`
`6`	`6`
`7`	`7`	`<h2>@ViewData["Title"]</h2>`
`8`	`8`	`@{`
`9`		`- if (@Model.IsDevelopment)`
	`9`	`+ if (@Model.DisplayConfirmAccountLink)`
`10`	`10`	`{`
`11`	`11`	`<p>`
`12`		`- In development we provide an inline email confirmation link, see <a href="https://docs.microsoft.com/en-us/aspnet/core/security/authentication/accconfirm">these docs</a> for how to configure a real email provider.`
`13`		`- <a href="@Model.EmailConfirmationUrl">Click here to confirm your account</a>`
	`12`	`+ This app does not currently have a real email sender registered, see <a href="https://docs.microsoft.com/en-us/aspnet/core/security/authentication/accconfirm">these docs</a> for how to configure a real email sender.`
	`13`	`+ Normally this would be emailed: <a href="@Model.EmailConfirmationUrl">Click here to confirm your account</a>`
`14`	`14`	`</p>`
`15`	`15`	`}`
`16`	`16`	`else`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`using Microsoft.AspNetCore.Mvc.RazorPages;`
`9`	`9`
`10`	`10`	`namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal`
`11`		`-`
`12`	`11`	`{`
`13`	`12`	`/// <summary>`
`14`	`13`	`/// This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used`
`@@ -52,7 +51,8 @@ public override async Task<IActionResult> OnGetAsync(string userId, string email`
`52`	`51`	`var result = await _userManager.ChangeEmailAsync(user, email, code);`
`53`	`52`	`if (!result.Succeeded)`
`54`	`53`	`{`
`55`		`- throw new InvalidOperationException($"Error changing email for user with ID '{userId}':");`
	`54`	`+ ModelState.AddModelError(string.Empty, "Change email failed.");`
	`55`	`+ return Page();`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`// In our UI email and user name are one and the same, so when we update the email`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,6 @@ public void ConfigureServices(IServiceCollection services)`
`49`	`49`	`services.AddDefaultIdentity<ApplicationUser>(o => o.SignIn.RequireConfirmedAccount = true)`
`50`	`50`	`.AddRoles<IdentityRole>()`
`51`	`51`	`.AddEntityFrameworkStores<ApplicationDbContext>();`
`52`		`-`
`53`		`- //services.AddSingleton<IUserConfirmation<ApplicationUser>, BadDude>();`
`54`	`52`	`}`
`55`	`53`
`56`	`54`