Merge pull request dotnet#1070 from dotnet/damianedwards/RazorPagesTw…

…eaks

Numerous fixes for Razor Pages project template

template_feed/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/.template.config/template.json

@@ -61,9 +61,10 @@
             "Pages/Account/ResetPasswordConfirmation.cshtml",
             "Pages/Account/ResetPasswordConfirmation.cshtml.cs",
             "Pages/Account/Manage/**",
+            "Extensions/EmailSenderExtensions.cs",
+            "Extensions/UrlHelperExtensions.cs",
             "Services/**",
-            "Data/**",
-            "Extensions/**"
+            "Data/**"
           ]
         },
         {
@@ -75,13 +76,14 @@
         {
           "condition": "(!OrganizationalAuth)",
           "exclude": [
-            "AzureAd/**"
+            "Extensions/AzureAdAuthenticationBuilderExtensions.cs",
+            "Extensions/AzureAdOptions.cs"
           ]
         },
         {
           "condition": "(!IndividualB2CAuth)",
           "exclude": [
-            "AzureAdB2C/**"
+            "Extensions/AzureAdB2C*.cs"
           ]
         }
       ]

template_feed/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/Controllers/AccountController.cs

@@ -5,41 +5,35 @@
 #if (OrganizationalAuth || IndividualB2CAuth)
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
-    #if (IndividualB2CAuth)
-using Microsoft.AspNetCore.Authentication.Extensions;
-    #endif
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 #endif
 #if (IndividualLocalAuth)
 using Microsoft.AspNetCore.Identity;
 #endif
 using Microsoft.AspNetCore.Mvc;
-    #if (IndividualLocalAuth)
+#if (IndividualLocalAuth)
 using Microsoft.Extensions.Logging;
 using Company.WebApplication1.Data;
-    #endif
+#endif
 #if (IndividualB2CAuth)
 using Microsoft.Extensions.Options;
 #endif
 
 namespace Company.WebApplication1.Controllers
 {
+    [Route("[controller]/[action]")]
     public class AccountController : Controller
     {
 #if (IndividualLocalAuth)
         private readonly SignInManager<ApplicationUser> _signInManager;
         private readonly ILogger _logger;
 
-        public AccountController(
-            SignInManager<ApplicationUser> signInManager,
-            ILoggerFactory loggerFactory)
+        public AccountController(SignInManager<ApplicationUser> signInManager, ILogger<AccountController> logger)
         {
             _signInManager = signInManager;
-            _logger = loggerFactory.CreateLogger<AccountController>();
+            _logger = logger;
         }
 
-        //
-        // POST: /Account/Logout
         [HttpPost]
         [ValidateAntiForgeryToken]
         public async Task<IActionResult> Logout()
@@ -49,93 +43,70 @@ public async Task<IActionResult> Logout()
             return RedirectToPage("/Index");
         }
 #elseif (OrganizationalAuth)
-        //
-        // GET: /Account/SignIn
         [HttpGet]
         public IActionResult SignIn()
         {
+            var redirectUrl = Url.Page("/Index");
             return Challenge(
-                new AuthenticationProperties { RedirectUri = "/" }, OpenIdConnectDefaults.AuthenticationScheme);
+                new AuthenticationProperties { RedirectUri = redirectUrl },
+                OpenIdConnectDefaults.AuthenticationScheme
+            );
         }
 
-        //
-        // GET: /Account/SignOut
         [HttpGet]
         public IActionResult SignOut()
         {
-            var callbackUrl = Url.Action(nameof(SignedOut), "Account", values: null, protocol: Request.Scheme);
-            return SignOut(new AuthenticationProperties { RedirectUri = callbackUrl },
-                CookieAuthenticationDefaults.AuthenticationScheme, OpenIdConnectDefaults.AuthenticationScheme);
-        }
-
-        //
-        // GET: /Account/SignedOut
-        [HttpGet]
-        public IActionResult SignedOut()
-        {
-            if (HttpContext.User.Identity.IsAuthenticated)
-            {
-                // Redirect to home page if the user is authenticated.
-                return RedirectToAction("Index");
-            }
-
-            return View();
+            var callbackUrl = Url.Page("/SignedOut", pageHandler: null, values: null, protocol: Request.Scheme);
+            return SignOut(
+                new AuthenticationProperties { RedirectUri = callbackUrl },
+                CookieAuthenticationDefaults.AuthenticationScheme, OpenIdConnectDefaults.AuthenticationScheme
+            );
         }
 #elseif (IndividualB2CAuth)
+        private readonly AzureAdB2COptions _options;
+
         public AccountController(IOptions<AzureAdB2COptions> b2cOptions)
         {
-            Options = b2cOptions.Value;
+            _options = b2cOptions.Value;
         }
 
-        public AzureAdB2COptions Options { get; set; }
-
-        //
-        // GET: /Account/SignIn
         [HttpGet]
         public IActionResult SignIn()
         {
+            var redirectUrl = Url.Page("/Index");
             return Challenge(
-                new AuthenticationProperties { RedirectUri = "/" }, OpenIdConnectDefaults.AuthenticationScheme);
+                new AuthenticationProperties { RedirectUri = redirectUrl },
+                OpenIdConnectDefaults.AuthenticationScheme
+            );
         }
 
         [HttpGet]
         public IActionResult ResetPassword()
         {
-            var properties = new AuthenticationProperties() { RedirectUri = "/" };
-            properties.Items[AzureAdB2COptions.PolicyAuthenticationProperty] = Options.ResetPasswordPolicyId;
+            var redirectUrl = Url.Page("/Index");
+            var properties = new AuthenticationProperties { RedirectUri = redirectUrl };
+            properties.Items[AzureAdB2COptions.PolicyAuthenticationProperty] = _options.ResetPasswordPolicyId;
             return Challenge(properties, OpenIdConnectDefaults.AuthenticationScheme);
         }
 
         [HttpGet]
         public IActionResult EditProfile()
         {
-            var properties = new AuthenticationProperties() { RedirectUri = "/" };
-            properties.Items[AzureAdB2COptions.PolicyAuthenticationProperty] = Options.EditProfilePolicyId;
+            var redirectUrl = Url.Page("/Index");
+            var properties = new AuthenticationProperties { RedirectUri = redirectUrl };
+            properties.Items[AzureAdB2COptions.PolicyAuthenticationProperty] = _options.EditProfilePolicyId;
             return Challenge(properties, OpenIdConnectDefaults.AuthenticationScheme);
         }
-
-        //
-        // GET: /Account/SignOut
-        [HttpGet]
-        public IActionResult SignOut()
-        {
-            var callbackUrl = Url.Action(nameof(SignedOut), "Account", values: null, protocol: Request.Scheme);
-            return SignOut(new AuthenticationProperties { RedirectUri = callbackUrl },
-                CookieAuthenticationDefaults.AuthenticationScheme, OpenIdConnectDefaults.AuthenticationScheme);
-        }
 
-        //
-        // GET: /Account/SignedOut
         [HttpGet]
-        public IActionResult SignedOut()
+        public IActionResult SignOut()
         {
-            if (HttpContext.User.Identity.IsAuthenticated)
-            {
-                // Redirect to home page if the user is authenticated.
-                return RedirectToPage("Index");
-            }
-
-            return View();
+            var callbackUrl = Url.Page("/SignedOut", pageHandler: null, values: null, protocol: Request.Scheme);
+            return SignOut(
+                new AuthenticationProperties { RedirectUri = callbackUrl },
+                CookieAuthenticationDefaults.AuthenticationScheme,
+                OpenIdConnectDefaults.AuthenticationScheme
+            );
         }
 #endif
     }

template_feed/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/AzureAd/AzureAdAuthenticationBuilderExtensions.cs → template_feed/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/Extensions/AzureAdAuthenticationBuilderExtensions.cs

@@ -11,7 +11,7 @@
 using Microsoft.IdentityModel.Tokens;
 #endif
 
-namespace Microsoft.AspNetCore.Authentication.Extensions
+namespace Microsoft.AspNetCore.Authentication
 {
     public static class AzureAdAuthenticationBuilderExtensions
     {
@@ -26,7 +26,7 @@ public static AuthenticationBuilder AddAzureAd(this AuthenticationBuilder builde
             return builder;
         }
 
-        private class ConfigureAzureOptions: IConfigureNamedOptions<OpenIdConnectOptions>
+        private class ConfigureAzureOptions : IConfigureNamedOptions<OpenIdConnectOptions>
         {
             private readonly AzureAdOptions _azureOptions;
 
@@ -46,8 +46,8 @@ public void Configure(string name, OpenIdConnectOptions options)
 
                 options.TokenValidationParameters = new TokenValidationParameters
                 {
-                    // Instead of using the default validation (validating against a single issuer value, as we do in line of business apps),
-                    // we inject our own multitenant validation logic
+                    // Instead of using the default validation (validating against a single issuer value, as we do in
+                    // line of business apps), we inject our own multitenant validation logic
                     ValidateIssuer = false,
 
                     // If the app is meant to be accessed by entire organizations, add your issuer validation logic here.
@@ -58,19 +58,19 @@ public void Configure(string name, OpenIdConnectOptions options)
 
                 options.Events = new OpenIdConnectEvents
                 {
-                    OnTicketReceived = (context) =>
+                    OnTicketReceived = context =>
                     {
                         // If your authentication logic is based on users then add your logic here
-                        return Task.FromResult(0);
+                        return Task.CompletedTask;
                     },
-                    OnAuthenticationFailed = (context) =>
+                    OnAuthenticationFailed = context =>
                     {
-                        context.Response.Redirect("/Home/Error");
+                        context.Response.Redirect("/Error");
                         context.HandleResponse(); // Suppress the exception
-                        return Task.FromResult(0);
+                        return Task.CompletedTask;
                     },
                     // If your application needs to do authenticate single users, add your user validation below.
-                    //OnTokenValidated = (context) =>
+                    //OnTokenValidated = context =>
                     //{
                     //    return myUserValidationLogic(context.Ticket.Principal);
                     //}

template_feed/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/AzureAdB2C/AzureAdB2CAuthenticationBuilderExtensions.cs → template_feed/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/Extensions/AzureAdB2CAuthenticationBuilderExtensions.cs

@@ -6,7 +6,7 @@
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Microsoft.IdentityModel.Tokens;
 
-namespace Microsoft.AspNetCore.Authentication.Extensions
+namespace Microsoft.AspNetCore.Authentication
 {
     public static class AzureAdB2CAuthenticationBuilderExtensions
     {
@@ -37,9 +37,9 @@ public void Configure(string name, OpenIdConnectOptions options)
                 options.UseTokenLifetime = true;
                 options.CallbackPath = _azureOptions.CallbackPath;
 
-                options.TokenValidationParameters = new TokenValidationParameters() { NameClaimType = "name" };
+                options.TokenValidationParameters = new TokenValidationParameters { NameClaimType = "name" };
 
-                options.Events = new OpenIdConnectEvents()
+                options.Events = new OpenIdConnectEvents
                 {
                     OnRedirectToIdentityProvider = OnRedirectToIdentityProvider,
                     OnRemoteFailure = OnRemoteFailure
@@ -63,7 +63,7 @@ public Task OnRedirectToIdentityProvider(RedirectContext context)
                         .Replace($"/{defaultPolicy.ToLower()}/", $"/{policy.ToLower()}/");
                     context.Properties.Items.Remove(AzureAdB2COptions.PolicyAuthenticationProperty);
                 }
-                return Task.FromResult(0);
+                return Task.CompletedTask;
             }
 
             public Task OnRemoteFailure(RemoteFailureContext context)
@@ -82,9 +82,9 @@ public Task OnRemoteFailure(RemoteFailureContext context)
                 }
                 else
                 {
-                    context.Response.Redirect("/Home/Error");
+                    context.Response.Redirect("/Error");
                 }
-                return Task.FromResult(0);
+                return Task.CompletedTask;
             }
         }
     }

template_feed/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/AzureAdB2C/AzureAdB2COptions.cs → template_feed/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/Extensions/AzureAdB2COptions.cs

@@ -1,15 +1,23 @@
-namespace Microsoft.AspNetCore.Authentication.Extensions
+namespace Microsoft.AspNetCore.Authentication
 {
     public class AzureAdB2COptions
     {
         public const string PolicyAuthenticationProperty = "Policy";
+
         public string ClientId { get; set; }
+
         public string Instance { get; set; }
+
         public string Domain { get; set; }
+
         public string EditProfilePolicyId { get; set; }
+
         public string SignUpSignInPolicyId { get; set; }
+
         public string ResetPasswordPolicyId { get; set; }
+
         public string CallbackPath { get; set; }
+
         public string DefaultPolicy => SignUpSignInPolicyId;
     }
 }

template_feed/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/AzureAd/AzureAdOptions.cs → template_feed/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/Extensions/AzureAdOptions.cs

@@ -1,12 +1,17 @@
-namespace Microsoft.AspNetCore.Authentication.Extensions
+namespace Microsoft.AspNetCore.Authentication
 {
     public class AzureAdOptions
     {
         public string ClientId { get; set; }
+
         public string ClientSecret { get; set; }
+
         public string Instance { get; set; }
+
         public string Domain { get; set; }
+
         public string TenantId { get; set; }
+
         public string CallbackPath { get; set; }
     }
 }

template_feed/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/Extensions/EmailSenderExtensions.cs

@@ -5,14 +5,20 @@
 using System.Threading.Tasks;
 using Company.WebApplication1.Services;
 
-namespace Company.WebApplication1.Extensions
+namespace Company.WebApplication1.Services
 {
     public static class EmailSenderExtensions
     {
-        public static async Task SendEmailConfirmationAsync(this IEmailSender emailSender, string email, string link)
+        public static Task SendEmailConfirmationAsync(this IEmailSender emailSender, string email, string link)
         {
-            await emailSender.SendEmailAsync(email, "Confirm your email",
-                $"Please confirm your account by clicking this link: <a href='{HtmlEncoder.Default.Encode(link)}'>link</a>");
+            return emailSender.SendEmailAsync(email, "Confirm your email",
+                $"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(link)}'>clicking here</a>.");
+        }
+
+        public static Task SendResetPasswordAsync(this IEmailSender emailSender, string email, string callbackUrl)
+        {
+            return emailSender.SendEmailAsync(email, "Reset Password",
+                $"Please reset your password by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
         }
     }
 }

template_feed/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/Extensions/UrlHelperExtensions.cs

@@ -22,7 +22,16 @@ public static string EmailConfirmationLink(this IUrlHelper urlHelper, string use
             return urlHelper.Page(
                 "/Account/ConfirmEmail",
                 pageHandler: null,
-                values: new { userId = userId, code = code },
+                values: new { userId, code },
+                protocol: scheme);
+        }
+
+        public static string ResetPasswordCallbackLink(this IUrlHelper urlHelper, string userId, string code, string scheme)
+        {
+            return urlHelper.Page(
+                "/Account/ResetPassword",
+                pageHandler: null,
+                values: new { userId, code },
                 protocol: scheme);
         }
     }