diff --git a/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.netcoreapp3.0.cs b/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.netcoreapp3.0.cs index 5975369b8999..d2a9cf133809 100644 --- a/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.netcoreapp3.0.cs +++ b/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.netcoreapp3.0.cs @@ -106,7 +106,7 @@ public SecurityStampValidator(Microsoft.Extensions.Options.IOptions where TUser : class { - public SignInManager(Microsoft.AspNetCore.Identity.UserManager userManager, Microsoft.AspNetCore.Http.IHttpContextAccessor contextAccessor, Microsoft.AspNetCore.Identity.IUserClaimsPrincipalFactory claimsFactory, Microsoft.Extensions.Options.IOptions optionsAccessor, Microsoft.Extensions.Logging.ILogger> logger, Microsoft.AspNetCore.Authentication.IAuthenticationSchemeProvider schemes) { } + public SignInManager(Microsoft.AspNetCore.Identity.UserManager userManager, Microsoft.AspNetCore.Http.IHttpContextAccessor contextAccessor, Microsoft.AspNetCore.Identity.IUserClaimsPrincipalFactory claimsFactory, Microsoft.Extensions.Options.IOptions optionsAccessor, Microsoft.Extensions.Logging.ILogger> logger, Microsoft.AspNetCore.Authentication.IAuthenticationSchemeProvider schemes, Microsoft.AspNetCore.Identity.IUserConfirmation confirmation) { } public Microsoft.AspNetCore.Identity.IUserClaimsPrincipalFactory ClaimsFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public Microsoft.AspNetCore.Http.HttpContext Context { get { throw null; } set { } } public virtual Microsoft.Extensions.Logging.ILogger Logger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } diff --git a/src/Identity/Core/src/IdentityServiceCollectionExtensions.cs b/src/Identity/Core/src/IdentityServiceCollectionExtensions.cs index b0d60defd9a1..45e3d567eb09 100644 --- a/src/Identity/Core/src/IdentityServiceCollectionExtensions.cs +++ b/src/Identity/Core/src/IdentityServiceCollectionExtensions.cs @@ -88,6 +88,7 @@ public static IdentityBuilder AddIdentity( services.TryAddScoped>(); services.TryAddScoped>(); services.TryAddScoped, UserClaimsPrincipalFactory>(); + services.TryAddScoped, DefaultUserConfirmation>(); services.TryAddScoped>(); services.TryAddScoped>(); services.TryAddScoped>(); diff --git a/src/Identity/Core/src/SignInManager.cs b/src/Identity/Core/src/SignInManager.cs index f805e596ab06..2711de0333ab 100644 --- a/src/Identity/Core/src/SignInManager.cs +++ b/src/Identity/Core/src/SignInManager.cs @@ -31,12 +31,14 @@ public class SignInManager where TUser : class /// The accessor used to access the . /// The logger used to log messages, warnings and errors. /// The scheme provider that is used enumerate the authentication schemes. + /// The used check whether a user account is confirmed. public SignInManager(UserManager userManager, IHttpContextAccessor contextAccessor, IUserClaimsPrincipalFactory claimsFactory, IOptions optionsAccessor, ILogger> logger, - IAuthenticationSchemeProvider schemes) + IAuthenticationSchemeProvider schemes, + IUserConfirmation confirmation) { if (userManager == null) { @@ -57,11 +59,13 @@ public SignInManager(UserManager userManager, Options = optionsAccessor?.Value ?? new IdentityOptions(); Logger = logger; _schemes = schemes; + _confirmation = confirmation; } private readonly IHttpContextAccessor _contextAccessor; private HttpContext _context; private IAuthenticationSchemeProvider _schemes; + private IUserConfirmation _confirmation; /// /// Gets the used to log messages from the manager. @@ -148,7 +152,11 @@ public virtual async Task CanSignInAsync(TUser user) Logger.LogWarning(1, "User {userId} cannot sign in without a confirmed phone number.", await UserManager.GetUserIdAsync(user)); return false; } - + if (Options.SignIn.RequireConfirmedAccount && !(await _confirmation.IsConfirmedAsync(UserManager, user))) + { + Logger.LogWarning(4, "User {userId} cannot sign in without a confirmed account.", await UserManager.GetUserIdAsync(user)); + return false; + } return true; } diff --git a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.netcoreapp3.0.cs b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.netcoreapp3.0.cs index fce3a8894fc8..f934eb8db2b7 100644 --- a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.netcoreapp3.0.cs +++ b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.netcoreapp3.0.cs @@ -26,6 +26,12 @@ public DefaultPersonalDataProtector(Microsoft.AspNetCore.Identity.ILookupProtect public virtual string Protect(string data) { throw null; } public virtual string Unprotect(string data) { throw null; } } + public partial class DefaultUserConfirmation : Microsoft.AspNetCore.Identity.IUserConfirmation where TUser : class + { + public DefaultUserConfirmation() { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public virtual System.Threading.Tasks.Task IsConfirmedAsync(Microsoft.AspNetCore.Identity.UserManager manager, TUser user) { throw null; } + } public partial class EmailTokenProvider : Microsoft.AspNetCore.Identity.TotpSecurityStampBasedTokenProvider where TUser : class { public EmailTokenProvider() { } @@ -194,6 +200,10 @@ public partial interface IUserClaimStore : Microsoft.AspNetCore.Identity. System.Threading.Tasks.Task RemoveClaimsAsync(TUser user, System.Collections.Generic.IEnumerable claims, System.Threading.CancellationToken cancellationToken); System.Threading.Tasks.Task ReplaceClaimAsync(TUser user, System.Security.Claims.Claim claim, System.Security.Claims.Claim newClaim, System.Threading.CancellationToken cancellationToken); } + public partial interface IUserConfirmation where TUser : class + { + System.Threading.Tasks.Task IsConfirmedAsync(Microsoft.AspNetCore.Identity.UserManager manager, TUser user); + } public partial interface IUserEmailStore : Microsoft.AspNetCore.Identity.IUserStore, System.IDisposable where TUser : class { System.Threading.Tasks.Task FindByEmailAsync(string normalizedEmail, System.Threading.CancellationToken cancellationToken); @@ -396,6 +406,7 @@ public RoleValidator(Microsoft.AspNetCore.Identity.IdentityErrorDescriber errors public partial class SignInOptions { public SignInOptions() { } + public bool RequireConfirmedAccount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public bool RequireConfirmedEmail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public bool RequireConfirmedPhoneNumber { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } } diff --git a/src/Identity/Extensions.Core/src/DefaultUserConfirmation.cs b/src/Identity/Extensions.Core/src/DefaultUserConfirmation.cs new file mode 100644 index 000000000000..3e624b1e02f9 --- /dev/null +++ b/src/Identity/Extensions.Core/src/DefaultUserConfirmation.cs @@ -0,0 +1,29 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Threading.Tasks; + +namespace Microsoft.AspNetCore.Identity +{ + /// + /// Default implementation of . + /// + /// The type encapsulating a user. + public class DefaultUserConfirmation : IUserConfirmation where TUser : class + { + /// + /// Determines whether the specified is confirmed. + /// + /// The that can be used to retrieve user properties. + /// The user. + /// The that represents the asynchronous operation, containing the of the confirmation operation. + public async virtual Task IsConfirmedAsync(UserManager manager, TUser user) + { + if (!await manager.IsEmailConfirmedAsync(user)) + { + return false; + } + return true; + } + } +} diff --git a/src/Identity/Extensions.Core/src/IUserConfirmation.cs b/src/Identity/Extensions.Core/src/IUserConfirmation.cs new file mode 100644 index 000000000000..ccd1d6b3d16d --- /dev/null +++ b/src/Identity/Extensions.Core/src/IUserConfirmation.cs @@ -0,0 +1,22 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Threading.Tasks; + +namespace Microsoft.AspNetCore.Identity +{ + /// + /// Provides an abstraction for confirmation of user accounts. + /// + /// The type encapsulating a user. + public interface IUserConfirmation where TUser : class + { + /// + /// Determines whether the specified is confirmed. + /// + /// The that can be used to retrieve user properties. + /// The user. + /// Whether the user is confirmed. + Task IsConfirmedAsync(UserManager manager, TUser user); + } +} diff --git a/src/Identity/Extensions.Core/src/IdentityServiceCollectionExtensions.cs b/src/Identity/Extensions.Core/src/IdentityServiceCollectionExtensions.cs index 3dcbd68119a3..568628a3cc87 100644 --- a/src/Identity/Extensions.Core/src/IdentityServiceCollectionExtensions.cs +++ b/src/Identity/Extensions.Core/src/IdentityServiceCollectionExtensions.cs @@ -41,6 +41,7 @@ public static IdentityBuilder AddIdentityCore(this IServiceCollection ser services.TryAddScoped, PasswordValidator>(); services.TryAddScoped, PasswordHasher>(); services.TryAddScoped(); + services.TryAddScoped, DefaultUserConfirmation>(); // No interface for the error describer so we can add errors without rev'ing the interface services.TryAddScoped(); services.TryAddScoped, UserClaimsPrincipalFactory>(); diff --git a/src/Identity/Extensions.Core/src/SignInOptions.cs b/src/Identity/Extensions.Core/src/SignInOptions.cs index 3ae19eb8a399..38244cdd66bd 100644 --- a/src/Identity/Extensions.Core/src/SignInOptions.cs +++ b/src/Identity/Extensions.Core/src/SignInOptions.cs @@ -19,5 +19,11 @@ public class SignInOptions /// /// True if a user must have a confirmed telephone number before they can sign in, otherwise false. public bool RequireConfirmedPhoneNumber { get; set; } + + /// + /// Gets or sets a flag indicating whether a confirmed account is required to sign in. Defaults to false. + /// + /// True if a user must have a confirmed account before they can sign in, otherwise false. + public bool RequireConfirmedAccount { get; set; } } -} \ No newline at end of file +} diff --git a/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs index 82d352c93181..6681c524b1c3 100644 --- a/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs +++ b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs @@ -1710,6 +1710,34 @@ public async Task CanChangeEmail() Assert.NotEqual(stamp, await manager.GetSecurityStampAsync(user)); } + /// + /// Test. + /// + /// Task + [Fact] + public async Task CanChangeEmailOnlyIfEmailSame() + { + if (ShouldSkipDbTests()) + { + return; + } + var manager = CreateManager(); + var user = CreateTestUser("foouser"); + IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); + var email = await manager.GetUserNameAsync(user) + "@diddly.bop"; + IdentityResultAssert.IsSuccess(await manager.SetEmailAsync(user, email)); + Assert.False(await manager.IsEmailConfirmedAsync(user)); + var stamp = await manager.GetSecurityStampAsync(user); + var newEmail = await manager.GetUserNameAsync(user) + "@en.vec"; + var token1 = await manager.GenerateChangeEmailTokenAsync(user, newEmail); + var token2 = await manager.GenerateChangeEmailTokenAsync(user, "should@fail.com"); + IdentityResultAssert.IsSuccess(await manager.ChangeEmailAsync(user, newEmail, token1)); + Assert.True(await manager.IsEmailConfirmedAsync(user)); + Assert.Equal(await manager.GetEmailAsync(user), newEmail); + Assert.NotEqual(stamp, await manager.GetSecurityStampAsync(user)); + IdentityResultAssert.IsFailure(await manager.ChangeEmailAsync(user, "should@fail.com", token2)); + } + /// /// Test. /// 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 index 462e9f8800b4..dbff0d0dea5e 100644 --- a/src/Identity/UI/ref/Microsoft.AspNetCore.Identity.UI.netcoreapp3.0.cs +++ b/src/Identity/UI/ref/Microsoft.AspNetCore.Identity.UI.netcoreapp3.0.cs @@ -37,9 +37,19 @@ public AccessDeniedModel() { } public void OnGet() { } } [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] + public abstract partial class ConfirmEmailChangeModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel + { + protected ConfirmEmailChangeModel() { } + [Microsoft.AspNetCore.Mvc.TempDataAttribute] + public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual System.Threading.Tasks.Task OnGetAsync(string userId, string email, string code) { throw null; } + } + [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] public abstract partial class ConfirmEmailModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel { protected ConfirmEmailModel() { } + [Microsoft.AspNetCore.Mvc.TempDataAttribute] + public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public virtual System.Threading.Tasks.Task OnGetAsync(string userId, string code) { throw null; } } [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] @@ -103,6 +113,7 @@ protected LoginModel() { } public string ReturnUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public virtual System.Threading.Tasks.Task OnGetAsync(string returnUrl = null) { throw null; } public virtual System.Threading.Tasks.Task OnPostAsync(string returnUrl = null) { throw null; } + public virtual System.Threading.Tasks.Task OnPostSendVerificationEmailAsync() { throw null; } public partial class InputModel { public InputModel() { } @@ -165,6 +176,15 @@ public void OnGet() { } public virtual System.Threading.Tasks.Task OnPost(string returnUrl = null) { throw null; } } [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] + public partial class RegisterConfirmationModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel + { + 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 OnGetAsync(string email) { throw null; } + } + [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] public abstract partial class RegisterModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel { protected RegisterModel() { } @@ -284,6 +304,27 @@ protected DownloadPersonalDataModel() { } public virtual Microsoft.AspNetCore.Mvc.IActionResult OnGet() { throw null; } public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } } + public abstract partial class EmailModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel + { + protected EmailModel() { } + public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] + public Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Manage.Internal.EmailModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool IsEmailConfirmed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + [Microsoft.AspNetCore.Mvc.TempDataAttribute] + public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } + public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } + public virtual System.Threading.Tasks.Task OnPostSendVerificationEmailAsync() { throw null; } + public partial class InputModel + { + public InputModel() { } + [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="New email")] + [System.ComponentModel.DataAnnotations.EmailAddressAttribute] + [System.ComponentModel.DataAnnotations.RequiredAttribute] + public string NewEmail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + } public partial class EnableAuthenticatorModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel { public EnableAuthenticatorModel() { } @@ -335,19 +376,14 @@ public abstract partial class IndexModel : Microsoft.AspNetCore.Mvc.RazorPages.P protected IndexModel() { } [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] public Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Manage.Internal.IndexModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsEmailConfirmed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } [Microsoft.AspNetCore.Mvc.TempDataAttribute] public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public string Username { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostSendVerificationEmailAsync() { throw null; } public partial class InputModel { public InputModel() { } - [System.ComponentModel.DataAnnotations.EmailAddressAttribute] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Phone number")] [System.ComponentModel.DataAnnotations.PhoneAttribute] public string PhoneNumber { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } @@ -358,6 +394,7 @@ public static partial class ManageNavPages public static string ChangePassword { get { throw null; } } public static string DeletePersonalData { get { throw null; } } public static string DownloadPersonalData { get { throw null; } } + public static string Email { get { throw null; } } public static string ExternalLogins { get { throw null; } } public static string Index { get { throw null; } } public static string PersonalData { get { throw null; } } @@ -365,6 +402,7 @@ public static partial class ManageNavPages public static string ChangePasswordNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } public static string DeletePersonalDataNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } public static string DownloadPersonalDataNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } + public static string EmailNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } public static string ExternalLoginsNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } public static string IndexNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } public static string PageNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext, string page) { throw null; } @@ -450,9 +488,19 @@ public AccessDeniedModel() { } public void OnGet() { } } [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] + public abstract partial class ConfirmEmailChangeModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel + { + protected ConfirmEmailChangeModel() { } + [Microsoft.AspNetCore.Mvc.TempDataAttribute] + public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual System.Threading.Tasks.Task OnGetAsync(string userId, string email, string code) { throw null; } + } + [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] public abstract partial class ConfirmEmailModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel { protected ConfirmEmailModel() { } + [Microsoft.AspNetCore.Mvc.TempDataAttribute] + public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public virtual System.Threading.Tasks.Task OnGetAsync(string userId, string code) { throw null; } } [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] @@ -578,6 +626,15 @@ public void OnGet() { } public virtual System.Threading.Tasks.Task OnPost(string returnUrl = null) { throw null; } } [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] + public partial class RegisterConfirmationModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel + { + 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 OnGetAsync(string email) { throw null; } + } + [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] public abstract partial class RegisterModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel { protected RegisterModel() { } @@ -697,6 +754,27 @@ protected DownloadPersonalDataModel() { } public virtual Microsoft.AspNetCore.Mvc.IActionResult OnGet() { throw null; } public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } } + public abstract partial class EmailModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel + { + protected EmailModel() { } + public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] + public Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Manage.Internal.EmailModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool IsEmailConfirmed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + [Microsoft.AspNetCore.Mvc.TempDataAttribute] + public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } + public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } + public virtual System.Threading.Tasks.Task OnPostSendVerificationEmailAsync() { throw null; } + public partial class InputModel + { + public InputModel() { } + [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="New email")] + [System.ComponentModel.DataAnnotations.EmailAddressAttribute] + [System.ComponentModel.DataAnnotations.RequiredAttribute] + public string NewEmail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + } public partial class EnableAuthenticatorModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel { public EnableAuthenticatorModel() { } @@ -748,19 +826,14 @@ public abstract partial class IndexModel : Microsoft.AspNetCore.Mvc.RazorPages.P protected IndexModel() { } [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] public Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Manage.Internal.IndexModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsEmailConfirmed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } [Microsoft.AspNetCore.Mvc.TempDataAttribute] public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public string Username { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostSendVerificationEmailAsync() { throw null; } public partial class InputModel { public InputModel() { } - [System.ComponentModel.DataAnnotations.EmailAddressAttribute] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Phone number")] [System.ComponentModel.DataAnnotations.PhoneAttribute] public string PhoneNumber { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } @@ -771,6 +844,7 @@ public static partial class ManageNavPages public static string ChangePassword { get { throw null; } } public static string DeletePersonalData { get { throw null; } } public static string DownloadPersonalData { get { throw null; } } + public static string Email { get { throw null; } } public static string ExternalLogins { get { throw null; } } public static string Index { get { throw null; } } public static string PersonalData { get { throw null; } } @@ -778,6 +852,7 @@ public static partial class ManageNavPages public static string ChangePasswordNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } public static string DeletePersonalDataNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } public static string DownloadPersonalDataNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } + public static string EmailNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } public static string ExternalLoginsNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } public static string IndexNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } public static string PageNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext, string page) { throw null; } diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml index 903896477cb7..b257bd30be8e 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml @@ -5,8 +5,4 @@ }

@ViewData["Title"]

-
-

- Thank you for confirming your email. -

-
+ diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml.cs index 2579c5a17b53..4477c39fa476 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml.cs +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml.cs @@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Mvc.RazorPages; namespace Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal - { /// /// This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used @@ -18,6 +17,13 @@ namespace Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal [IdentityDefaultUI(typeof(ConfirmEmailModel<>))] public abstract class ConfirmEmailModel : 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. + /// + [TempData] + public string StatusMessage { get; set; } + /// /// 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. @@ -48,11 +54,7 @@ public override async Task OnGetAsync(string userId, string code) } var result = await _userManager.ConfirmEmailAsync(user, code); - if (!result.Succeeded) - { - throw new InvalidOperationException($"Error confirming email for user with ID '{userId}':"); - } - + StatusMessage = result.Succeeded ? "Thank you for confirming your email." : "Error confirming your email."; return Page(); } } diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmailChange.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmailChange.cshtml new file mode 100644 index 000000000000..83b1df7254cc --- /dev/null +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmailChange.cshtml @@ -0,0 +1,8 @@ +@page +@model ConfirmEmailChangeModel +@{ + ViewData["Title"] = "Confirm email change"; +} + +

@ViewData["Title"]

+ diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmailChange.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmailChange.cshtml.cs new file mode 100644 index 000000000000..ee24b30fd13b --- /dev/null +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmailChange.cshtml.cs @@ -0,0 +1,80 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal + +{ + /// + /// 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. + /// + [AllowAnonymous] + [IdentityDefaultUI(typeof(ConfirmEmailChangeModel<>))] + public abstract class ConfirmEmailChangeModel : 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. + /// + [TempData] + public string StatusMessage { get; set; } + + /// + /// 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. + /// + public virtual Task OnGetAsync(string userId, string email, string code) => throw new NotImplementedException(); + } + + internal class ConfirmEmailChangeModel : ConfirmEmailChangeModel where TUser : class + { + private readonly UserManager _userManager; + private readonly SignInManager _signInManager; + + public ConfirmEmailChangeModel(UserManager userManager, SignInManager signInManager) + { + _userManager = userManager; + _signInManager = signInManager; + } + + public override async Task OnGetAsync(string userId, string email, string code) + { + if (userId == null || email == null || code == null) + { + return RedirectToPage("/Index"); + } + + var user = await _userManager.FindByIdAsync(userId); + if (user == null) + { + return NotFound($"Unable to load user with ID '{userId}'."); + } + + var result = await _userManager.ChangeEmailAsync(user, email, code); + if (!result.Succeeded) + { + StatusMessage = "Error changing email."; + return Page(); + } + + // In our UI email and user name are one and the same, so when we update the email + // we need to update the user name. + var setUserNameResult = await _userManager.SetUserNameAsync(user, email); + if (!setUserNameResult.Succeeded) + { + StatusMessage = "Error changing user name."; + return Page(); + } + + await _signInManager.RefreshSignInAsync(user); + StatusMessage = "Thank you for confirming your email change."; + return Page(); + } + } +} diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml index 875fe3ee7f36..a58edae8a87a 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml @@ -32,7 +32,7 @@
- +

@@ -41,6 +41,9 @@

Register as a new user

+

+ +

diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml.cs index 9f5dc83c5e61..74ec7bb1cd89 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml.cs +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml.cs @@ -5,9 +5,11 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; +using System.Text.Encodings.Web; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; @@ -90,16 +92,28 @@ public class InputModel /// directly from your code. This API may change or be removed in future releases. /// public virtual Task OnPostAsync(string returnUrl = null) => throw new NotImplementedException(); + + /// + /// 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. + /// + public virtual Task OnPostSendVerificationEmailAsync() => throw new NotImplementedException(); } internal class LoginModel : LoginModel where TUser : class { + private readonly UserManager _userManager; private readonly SignInManager _signInManager; private readonly ILogger _logger; + private readonly IEmailSender _emailSender; - public LoginModel(SignInManager signInManager, ILogger logger) + public LoginModel(SignInManager signInManager, ILogger logger, + UserManager userManager, + IEmailSender emailSender) { + _userManager = userManager; _signInManager = signInManager; + _emailSender = emailSender; _logger = logger; } @@ -155,5 +169,34 @@ public override async Task OnPostAsync(string returnUrl = null) // If we got this far, something failed, redisplay form return Page(); } + + public override async Task OnPostSendVerificationEmailAsync() + { + if (!ModelState.IsValid) + { + return Page(); + } + + var user = await _userManager.FindByEmailAsync(Input.Email); + if (user == null) + { + ModelState.AddModelError(string.Empty, "Verification email sent. Please check your email."); + } + + var userId = await _userManager.GetUserIdAsync(user); + var code = await _userManager.GenerateEmailConfirmationTokenAsync(user); + var callbackUrl = Url.Page( + "/Account/ConfirmEmail", + pageHandler: null, + values: new { userId = userId, code = code }, + protocol: Request.Scheme); + await _emailSender.SendEmailAsync( + Input.Email, + "Confirm your email", + $"Please confirm your account by clicking here."); + + ModelState.AddModelError(string.Empty, "Verification email sent. Please check your email."); + return Page(); + } } } diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Email.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Email.cshtml new file mode 100644 index 000000000000..e291749562fc --- /dev/null +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Email.cshtml @@ -0,0 +1,41 @@ +@page +@model EmailModel +@{ + ViewData["Title"] = "Manage Email"; + ViewData["ActivePage"] = ManageNavPages.Email; +} + +

@ViewData["Title"]

+ +
+
+
+
+
+ + @if (Model.IsEmailConfirmed) + { +
+ + +
+ } + else + { + + + } +
+
+ + + +
+ +
+
+
+ +@section Scripts { + +} 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 new file mode 100644 index 000000000000..0ff0ca11bf0f --- /dev/null +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Email.cshtml.cs @@ -0,0 +1,185 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.ComponentModel.DataAnnotations; +using System.Text.Encodings.Web; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Identity.UI.Services; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Manage.Internal +{ + /// + /// 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. + /// + [IdentityDefaultUI(typeof(EmailModel<>))] + public abstract class EmailModel : 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. + /// + public string Email { get; set; } + + /// + /// 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. + /// + public bool IsEmailConfirmed { get; set; } + + /// + /// 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. + /// + [TempData] + public string StatusMessage { get; set; } + + /// + /// 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. + /// + [BindProperty] + public InputModel Input { get; set; } + + /// + /// 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. + /// + public class InputModel + { + /// + /// 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. + /// + [Required] + [EmailAddress] + [Display(Name = "New email")] + public string NewEmail { get; set; } + } + + /// + /// 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. + /// + public virtual Task OnGetAsync() => throw new NotImplementedException(); + + /// + /// 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. + /// + public virtual Task OnPostAsync() => throw new NotImplementedException(); + + /// + /// 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. + /// + public virtual Task OnPostSendVerificationEmailAsync() => throw new NotImplementedException(); + } + + internal class EmailModel : EmailModel where TUser : class + { + private readonly UserManager _userManager; + private readonly SignInManager _signInManager; + private readonly IEmailSender _emailSender; + + public EmailModel( + UserManager userManager, + SignInManager signInManager, + IEmailSender emailSender) + { + _userManager = userManager; + _signInManager = signInManager; + _emailSender = emailSender; + } + + public override async Task OnGetAsync() + { + var user = await _userManager.GetUserAsync(User); + if (user == null) + { + return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); + } + var email = await _userManager.GetEmailAsync(user); + + Email = email; + + Input = new InputModel + { + NewEmail = email, + }; + + IsEmailConfirmed = await _userManager.IsEmailConfirmedAsync(user); + + return Page(); + } + + public override async Task OnPostAsync() + { + if (!ModelState.IsValid) + { + return Page(); + } + + var user = await _userManager.GetUserAsync(User); + if (user == null) + { + return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); + } + + var email = await _userManager.GetEmailAsync(user); + if (Input.NewEmail != email) + { + var userId = await _userManager.GetUserIdAsync(user); + var code = await _userManager.GenerateChangeEmailTokenAsync(user, Input.NewEmail); + var callbackUrl = Url.Page( + "/Account/ConfirmEmailChange", + pageHandler: null, + values: new { userId = userId, email = Input.NewEmail, code = code }, + protocol: Request.Scheme); + await _emailSender.SendEmailAsync( + Input.NewEmail, + "Confirm your email", + $"Please confirm your account by clicking here."); + + StatusMessage = "Confirmation link to change email sent. Please check your email."; + return RedirectToPage(); + } + + StatusMessage = "Your email is unchanged."; + return RedirectToPage(); + } + + public override async Task OnPostSendVerificationEmailAsync() + { + if (!ModelState.IsValid) + { + return Page(); + } + + var user = await _userManager.GetUserAsync(User); + if (user == null) + { + return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); + } + + var userId = await _userManager.GetUserIdAsync(user); + var email = await _userManager.GetEmailAsync(user); + var code = await _userManager.GenerateEmailConfirmationTokenAsync(user); + var callbackUrl = Url.Page( + "/Account/ConfirmEmail", + pageHandler: null, + values: new { userId = userId, code = code }, + protocol: Request.Scheme); + await _emailSender.SendEmailAsync( + email, + "Confirm your email", + $"Please confirm your account by clicking here."); + + StatusMessage = "Verification email sent. Please check your email."; + return RedirectToPage(); + } + } +} diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml index 13b1cf8e547f..19ac1a296e23 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml @@ -15,22 +15,6 @@ -
- - @if (Model.IsEmailConfirmed) - { -
- - -
- } - else - { - - - } - -
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml.cs index d536d587e15b..a95594f70234 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml.cs +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml.cs @@ -3,9 +3,7 @@ using System; using System.ComponentModel.DataAnnotations; -using System.Text.Encodings.Web; using System.Threading.Tasks; -using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; @@ -24,12 +22,6 @@ public abstract class IndexModel : PageModel ///
public string Username { get; set; } - /// - /// 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. - /// - public bool IsEmailConfirmed { get; set; } - /// /// 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. @@ -50,14 +42,6 @@ public abstract class IndexModel : PageModel /// public class InputModel { - /// - /// 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. - /// - [Required] - [EmailAddress] - public string Email { get; set; } - /// /// 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. @@ -78,28 +62,19 @@ public class InputModel /// directly from your code. This API may change or be removed in future releases. /// public virtual Task OnPostAsync() => throw new NotImplementedException(); - - /// - /// 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. - /// - public virtual Task OnPostSendVerificationEmailAsync() => throw new NotImplementedException(); } internal class IndexModel : IndexModel where TUser : class { private readonly UserManager _userManager; private readonly SignInManager _signInManager; - private readonly IEmailSender _emailSender; public IndexModel( UserManager userManager, - SignInManager signInManager, - IEmailSender emailSender) + SignInManager signInManager) { _userManager = userManager; _signInManager = signInManager; - _emailSender = emailSender; } public override async Task OnGetAsync() @@ -110,19 +85,15 @@ public override async Task OnGetAsync() return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); } var userName = await _userManager.GetUserNameAsync(user); - var email = await _userManager.GetEmailAsync(user); var phoneNumber = await _userManager.GetPhoneNumberAsync(user); Username = userName; Input = new InputModel { - Email = email, PhoneNumber = phoneNumber }; - IsEmailConfirmed = await _userManager.IsEmailConfirmedAsync(user); - return Page(); } @@ -139,26 +110,6 @@ public override async Task OnPostAsync() return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); } - var email = await _userManager.GetEmailAsync(user); - if (Input.Email != email) - { - var setEmailResult = await _userManager.SetEmailAsync(user, Input.Email); - if (!setEmailResult.Succeeded) - { - var userId = await _userManager.GetUserIdAsync(user); - throw new InvalidOperationException($"Unexpected error occurred setting email for user with ID '{userId}'."); - } - - // In our UI email and user name are one and the same, so when we update the email - // we need to update the user name. - var setUserNameResult = await _userManager.SetUserNameAsync(user, Input.Email); - if (!setUserNameResult.Succeeded) - { - var userId = await _userManager.GetUserIdAsync(user); - throw new InvalidOperationException($"Unexpected error occurred setting name for user with ID '{userId}'."); - } - } - var phoneNumber = await _userManager.GetPhoneNumberAsync(user); if (Input.PhoneNumber != phoneNumber) { @@ -174,36 +125,5 @@ public override async Task OnPostAsync() StatusMessage = "Your profile has been updated"; return RedirectToPage(); } - - public override async Task OnPostSendVerificationEmailAsync() - { - if (!ModelState.IsValid) - { - return Page(); - } - - var user = await _userManager.GetUserAsync(User); - if (user == null) - { - return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); - } - - - var userId = await _userManager.GetUserIdAsync(user); - var email = await _userManager.GetEmailAsync(user); - var code = await _userManager.GenerateEmailConfirmationTokenAsync(user); - var callbackUrl = Url.Page( - "/Account/ConfirmEmail", - pageHandler: null, - values: new { userId = userId, code = code }, - protocol: Request.Scheme); - await _emailSender.SendEmailAsync( - email, - "Confirm your email", - $"Please confirm your account by clicking here."); - - StatusMessage = "Verification email sent. Please check your email."; - return RedirectToPage(); - } } } diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ManageNavPages.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ManageNavPages.cs index e449a0221c4a..289e0ebf33df 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ManageNavPages.cs +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ManageNavPages.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -18,6 +18,12 @@ public static class ManageNavPages /// public static string Index => "Index"; + /// + /// 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. + /// + public static string Email => "Email"; + /// /// 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. @@ -60,6 +66,12 @@ public static class ManageNavPages /// public static string IndexNavClass(ViewContext viewContext) => PageNavClass(viewContext, Index); + /// + /// 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. + /// + public static string EmailNavClass(ViewContext viewContext) => PageNavClass(viewContext, Email); + /// /// 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. diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ManageNav.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ManageNav.cshtml index 69fcc8f7b8e6..cfd16bb22b5d 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ManageNav.cshtml +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ManageNav.cshtml @@ -1,5 +1,6 @@ -
    +
    • Profile
      • +
    • Email
    • Password
      • @if ((bool)ViewData["ManageNav.HasExternalLogins"]) { 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 index 3f66acc20073..68407af5a1c2 100644 --- 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 @@ -150,8 +150,15 @@ public override async Task OnPostAsync(string returnUrl = null) await _emailSender.SendEmailAsync(Input.Email, "Confirm your email", $"Please confirm your account by clicking here."); - await _signInManager.SignInAsync(user, isPersistent: false); - return LocalRedirect(returnUrl); + if (_userManager.Options.SignIn.RequireConfirmedAccount) + { + return RedirectToPage("RegisterConfirmation", new { email = Input.Email }); + } + else + { + await _signInManager.SignInAsync(user, isPersistent: false); + return LocalRedirect(returnUrl); + } } foreach (var error in result.Errors) { 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 new file mode 100644 index 000000000000..a8a27df01226 --- /dev/null +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/RegisterConfirmation.cshtml @@ -0,0 +1,23 @@ +@page +@model RegisterConfirmationModel +@{ + ViewData["Title"] = "Register confirmation"; +} + +

      @ViewData["Title"]

      +@{ + if (@Model.DisplayConfirmAccountLink) + { +

      + This app does not currently have a real email sender registered, see these docs for how to configure a real email sender. + Normally this would be emailed: Click here to confirm your account +

      + } + else + { +

      + Please check your email to confirm your account. +

      + } +} + 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 new file mode 100644 index 000000000000..5d3b254a8499 --- /dev/null +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/RegisterConfirmation.cshtml.cs @@ -0,0 +1,92 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +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; + +namespace Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal + +{ + /// + /// 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. + /// + [AllowAnonymous] + [IdentityDefaultUI(typeof(RegisterConfirmationModel<>))] + 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. + /// + public string Email { get; set; } + + /// + /// 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. + /// + public bool DisplayConfirmAccountLink { get; set; } + + /// + /// 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. + /// + public string EmailConfirmationUrl { get; set; } + + /// + /// 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. + /// + public virtual Task OnGetAsync(string email) => throw new NotImplementedException(); + } + + internal class RegisterConfirmationModel : RegisterConfirmationModel where TUser : class + { + private readonly UserManager _userManager; + private readonly IWebHostEnvironment _hostingEnv; + private readonly IEmailSender _sender; + + public RegisterConfirmationModel(UserManager userManager, IWebHostEnvironment hostingEnv, IEmailSender sender) + { + _userManager = userManager; + _hostingEnv = hostingEnv; + _sender = sender; + } + + public override async Task OnGetAsync(string email) + { + if (email == null) + { + return RedirectToPage("/Index"); + } + + var user = await _userManager.FindByEmailAsync(email); + if (user == null) + { + return NotFound($"Unable to load user with email '{email}'."); + } + + Email = email; + // If the email sender is a no-op, display the confirm link in the page + DisplayConfirmAccountLink = _sender is EmailSender; + if (DisplayConfirmAccountLink) + { + var userId = await _userManager.GetUserIdAsync(user); + var code = await _userManager.GenerateEmailConfirmationTokenAsync(user); + EmailConfirmationUrl = Url.Page( + "/Account/ConfirmEmail", + pageHandler: null, + values: new { userId = userId, code = code }, + protocol: Request.Scheme); + } + + return Page(); + } + } +} diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/_StatusMessage.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/_StatusMessage.cshtml new file mode 100644 index 000000000000..e996841309e2 --- /dev/null +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/_StatusMessage.cshtml @@ -0,0 +1,10 @@ +@model string + +@if (!String.IsNullOrEmpty(Model)) +{ + var statusMessageClass = Model.StartsWith("Error") ? "danger" : "success"; + +} diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml index 7644f84c284e..0102681e756b 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml @@ -5,8 +5,3 @@ }

      @ViewData["Title"]

      -
      -

      - Thank you for confirming your email. -

      -
      diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml.cs index d0b4a7afce1e..ff143f81d20c 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml.cs +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml.cs @@ -17,6 +17,13 @@ namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal [IdentityDefaultUI(typeof(ConfirmEmailModel<>))] public abstract class ConfirmEmailModel : 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. + /// + [TempData] + public string StatusMessage { get; set; } + /// /// 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. @@ -47,11 +54,7 @@ public override async Task OnGetAsync(string userId, string code) } var result = await _userManager.ConfirmEmailAsync(user, code); - if (!result.Succeeded) - { - throw new InvalidOperationException($"Error confirming email for user with ID '{userId}':"); - } - + StatusMessage = result.Succeeded ? "Thank you for confirming your email." : "Error confirming your email."; return Page(); } } diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmailChange.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmailChange.cshtml new file mode 100644 index 000000000000..83b1df7254cc --- /dev/null +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmailChange.cshtml @@ -0,0 +1,8 @@ +@page +@model ConfirmEmailChangeModel +@{ + ViewData["Title"] = "Confirm email change"; +} + +

      @ViewData["Title"]

      + 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 new file mode 100644 index 000000000000..ea28d658da73 --- /dev/null +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmailChange.cshtml.cs @@ -0,0 +1,79 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal +{ + /// + /// 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. + /// + [AllowAnonymous] + [IdentityDefaultUI(typeof(ConfirmEmailChangeModel<>))] + public abstract class ConfirmEmailChangeModel : 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. + /// + [TempData] + public string StatusMessage { get; set; } + + /// + /// 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. + /// + public virtual Task OnGetAsync(string userId, string email, string code) => throw new NotImplementedException(); + } + + internal class ConfirmEmailChangeModel : ConfirmEmailChangeModel where TUser : class + { + private readonly UserManager _userManager; + private readonly SignInManager _signInManager; + + public ConfirmEmailChangeModel(UserManager userManager, SignInManager signInManager) + { + _userManager = userManager; + _signInManager = signInManager; + } + + public override async Task OnGetAsync(string userId, string email, string code) + { + if (userId == null || email == null || code == null) + { + return RedirectToPage("/Index"); + } + + var user = await _userManager.FindByIdAsync(userId); + if (user == null) + { + return NotFound($"Unable to load user with ID '{userId}'."); + } + + var result = await _userManager.ChangeEmailAsync(user, email, code); + if (!result.Succeeded) + { + StatusMessage = "Error changing email."; + return Page(); + } + + // In our UI email and user name are one and the same, so when we update the email + // we need to update the user name. + var setUserNameResult = await _userManager.SetUserNameAsync(user, email); + if (!setUserNameResult.Succeeded) + { + StatusMessage = "Error changing user name."; + return Page(); + } + + await _signInManager.RefreshSignInAsync(user); + StatusMessage = "Thank you for confirming your email change."; + return Page(); + } + } +} diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml index b63e8533bcff..b98655e0f629 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml @@ -32,7 +32,7 @@
      - +

      diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Email.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Email.cshtml new file mode 100644 index 000000000000..bc4e8d8ecf15 --- /dev/null +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Email.cshtml @@ -0,0 +1,41 @@ +@page +@model EmailModel +@{ + ViewData["Title"] = "Manage Email"; + ViewData["ActivePage"] = ManageNavPages.Email; +} + +

      @ViewData["Title"]

      + +
      +
      +
      +
      +
      + + @if (Model.IsEmailConfirmed) + { +
      + + +
      + } + else + { + + + } +
      +
      + + + +
      + +
      +
      +
      + +@section Scripts { + +} 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 new file mode 100644 index 000000000000..533e2a1e6e7d --- /dev/null +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Email.cshtml.cs @@ -0,0 +1,185 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.ComponentModel.DataAnnotations; +using System.Text.Encodings.Web; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Identity.UI.Services; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Manage.Internal +{ + /// + /// 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. + /// + [IdentityDefaultUI(typeof(EmailModel<>))] + public abstract class EmailModel : 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. + /// + public string Email { get; set; } + + /// + /// 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. + /// + public bool IsEmailConfirmed { get; set; } + + /// + /// 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. + /// + [TempData] + public string StatusMessage { get; set; } + + /// + /// 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. + /// + [BindProperty] + public InputModel Input { get; set; } + + /// + /// 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. + /// + public class InputModel + { + /// + /// 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. + /// + [Required] + [EmailAddress] + [Display(Name = "New email")] + public string NewEmail { get; set; } + } + + /// + /// 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. + /// + public virtual Task OnGetAsync() => throw new NotImplementedException(); + + /// + /// 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. + /// + public virtual Task OnPostAsync() => throw new NotImplementedException(); + + /// + /// 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. + /// + public virtual Task OnPostSendVerificationEmailAsync() => throw new NotImplementedException(); + } + + internal class EmailModel : EmailModel where TUser : class + { + private readonly UserManager _userManager; + private readonly SignInManager _signInManager; + private readonly IEmailSender _emailSender; + + public EmailModel( + UserManager userManager, + SignInManager signInManager, + IEmailSender emailSender) + { + _userManager = userManager; + _signInManager = signInManager; + _emailSender = emailSender; + } + + public override async Task OnGetAsync() + { + var user = await _userManager.GetUserAsync(User); + if (user == null) + { + return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); + } + var email = await _userManager.GetEmailAsync(user); + + Email = email; + + Input = new InputModel + { + NewEmail = email, + }; + + IsEmailConfirmed = await _userManager.IsEmailConfirmedAsync(user); + + return Page(); + } + + public override async Task OnPostAsync() + { + if (!ModelState.IsValid) + { + return Page(); + } + + var user = await _userManager.GetUserAsync(User); + if (user == null) + { + return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); + } + + var email = await _userManager.GetEmailAsync(user); + if (Input.NewEmail != email) + { + var userId = await _userManager.GetUserIdAsync(user); + var code = await _userManager.GenerateChangeEmailTokenAsync(user, Input.NewEmail); + var callbackUrl = Url.Page( + "/Account/ConfirmEmailChange", + pageHandler: null, + values: new { userId = userId, email = Input.NewEmail, code = code }, + protocol: Request.Scheme); + await _emailSender.SendEmailAsync( + Input.NewEmail, + "Confirm your email", + $"Please confirm your account by clicking here."); + + StatusMessage = "Confirmation link to change email sent. Please check your email."; + return RedirectToPage(); + } + + StatusMessage = "Your email is unchanged."; + return RedirectToPage(); + } + + public override async Task OnPostSendVerificationEmailAsync() + { + if (!ModelState.IsValid) + { + return Page(); + } + + var user = await _userManager.GetUserAsync(User); + if (user == null) + { + return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); + } + + var userId = await _userManager.GetUserIdAsync(user); + var email = await _userManager.GetEmailAsync(user); + var code = await _userManager.GenerateEmailConfirmationTokenAsync(user); + var callbackUrl = Url.Page( + "/Account/ConfirmEmail", + pageHandler: null, + values: new { userId = userId, code = code }, + protocol: Request.Scheme); + await _emailSender.SendEmailAsync( + email, + "Confirm your email", + $"Please confirm your account by clicking here."); + + StatusMessage = "Verification email sent. Please check your email."; + return RedirectToPage(); + } + } +} diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml index 1452ea5af1b9..dd2595981774 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml @@ -15,22 +15,6 @@
      -
      - - @if (Model.IsEmailConfirmed) - { -
      - - -
      - } - else - { - - - } - -
      diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml.cs index 655bbacc7235..ef8b4fa44cac 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml.cs +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml.cs @@ -24,12 +24,6 @@ public abstract class IndexModel : PageModel ///
      public string Username { get; set; } - /// - /// 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. - /// - public bool IsEmailConfirmed { get; set; } - /// /// 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. @@ -50,14 +44,6 @@ public abstract class IndexModel : PageModel /// public class InputModel { - /// - /// 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. - /// - [Required] - [EmailAddress] - public string Email { get; set; } - /// /// 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. @@ -78,28 +64,19 @@ public class InputModel /// directly from your code. This API may change or be removed in future releases. /// public virtual Task OnPostAsync() => throw new NotImplementedException(); - - /// - /// 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. - /// - public virtual Task OnPostSendVerificationEmailAsync() => throw new NotImplementedException(); } internal class IndexModel : IndexModel where TUser : class { private readonly UserManager _userManager; private readonly SignInManager _signInManager; - private readonly IEmailSender _emailSender; public IndexModel( UserManager userManager, - SignInManager signInManager, - IEmailSender emailSender) + SignInManager signInManager) { _userManager = userManager; _signInManager = signInManager; - _emailSender = emailSender; } public override async Task OnGetAsync() @@ -110,19 +87,15 @@ public override async Task OnGetAsync() return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); } var userName = await _userManager.GetUserNameAsync(user); - var email = await _userManager.GetEmailAsync(user); var phoneNumber = await _userManager.GetPhoneNumberAsync(user); Username = userName; Input = new InputModel { - Email = email, PhoneNumber = phoneNumber }; - IsEmailConfirmed = await _userManager.IsEmailConfirmedAsync(user); - return Page(); } @@ -139,26 +112,6 @@ public override async Task OnPostAsync() return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); } - var email = await _userManager.GetEmailAsync(user); - if (Input.Email != email) - { - var setEmailResult = await _userManager.SetEmailAsync(user, Input.Email); - if (!setEmailResult.Succeeded) - { - var userId = await _userManager.GetUserIdAsync(user); - throw new InvalidOperationException($"Unexpected error occurred setting email for user with ID '{userId}'."); - } - - // In our UI email and user name are one and the same, so when we update the email - // we need to update the user name. - var setUserNameResult = await _userManager.SetUserNameAsync(user, Input.Email); - if (!setUserNameResult.Succeeded) - { - var userId = await _userManager.GetUserIdAsync(user); - throw new InvalidOperationException($"Unexpected error occurred setting name for user with ID '{userId}'."); - } - } - var phoneNumber = await _userManager.GetPhoneNumberAsync(user); if (Input.PhoneNumber != phoneNumber) { @@ -174,36 +127,5 @@ public override async Task OnPostAsync() StatusMessage = "Your profile has been updated"; return RedirectToPage(); } - - public override async Task OnPostSendVerificationEmailAsync() - { - if (!ModelState.IsValid) - { - return Page(); - } - - var user = await _userManager.GetUserAsync(User); - if (user == null) - { - return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); - } - - - var userId = await _userManager.GetUserIdAsync(user); - var email = await _userManager.GetEmailAsync(user); - var code = await _userManager.GenerateEmailConfirmationTokenAsync(user); - var callbackUrl = Url.Page( - "/Account/ConfirmEmail", - pageHandler: null, - values: new { userId = userId, code = code }, - protocol: Request.Scheme); - await _emailSender.SendEmailAsync( - email, - "Confirm your email", - $"Please confirm your account by clicking here."); - - StatusMessage = "Verification email sent. Please check your email."; - return RedirectToPage(); - } } } diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ManageNavPages.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ManageNavPages.cs index 136aa5c7d13a..4923e2045da4 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ManageNavPages.cs +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ManageNavPages.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -18,6 +18,12 @@ public static class ManageNavPages ///
public static string Index => "Index"; + /// + /// 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. + /// + public static string Email => "Email"; + /// /// 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. @@ -60,6 +66,12 @@ public static class ManageNavPages /// public static string IndexNavClass(ViewContext viewContext) => PageNavClass(viewContext, Index); + /// + /// 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. + /// + public static string EmailNavClass(ViewContext viewContext) => PageNavClass(viewContext, Email); + /// /// 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. diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ManageNav.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ManageNav.cshtml index de285c8b7447..eb79b4001f18 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ManageNav.cshtml +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ManageNav.cshtml @@ -1,5 +1,6 @@ -
    +
    • Profile
      • +
    • Email
    • Password
      • @if ((bool)ViewData["ManageNav.HasExternalLogins"]) { 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 index 04d3d034db46..165bcc025689 100644 --- 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 @@ -149,8 +149,15 @@ public override async Task OnPostAsync(string returnUrl = null) await _emailSender.SendEmailAsync(Input.Email, "Confirm your email", $"Please confirm your account by clicking here."); - await _signInManager.SignInAsync(user, isPersistent: false); - return LocalRedirect(returnUrl); + if (_userManager.Options.SignIn.RequireConfirmedAccount) + { + return RedirectToPage("RegisterConfirmation", new { email = Input.Email }); + } + else + { + await _signInManager.SignInAsync(user, isPersistent: false); + return LocalRedirect(returnUrl); + } } foreach (var error in result.Errors) { 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 new file mode 100644 index 000000000000..a8a27df01226 --- /dev/null +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/RegisterConfirmation.cshtml @@ -0,0 +1,23 @@ +@page +@model RegisterConfirmationModel +@{ + ViewData["Title"] = "Register confirmation"; +} + +

      @ViewData["Title"]

      +@{ + if (@Model.DisplayConfirmAccountLink) + { +

      + This app does not currently have a real email sender registered, see these docs for how to configure a real email sender. + Normally this would be emailed: Click here to confirm your account +

      + } + else + { +

      + Please check your email to confirm your account. +

      + } +} + 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 new file mode 100644 index 000000000000..d4a57633058e --- /dev/null +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/RegisterConfirmation.cshtml.cs @@ -0,0 +1,93 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +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; + +namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal + +{ + /// + /// 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. + /// + [AllowAnonymous] + [IdentityDefaultUI(typeof(RegisterConfirmationModel<>))] + 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. + /// + public string Email { get; set; } + + /// + /// 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. + /// + public bool DisplayConfirmAccountLink { get; set; } + + /// + /// 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. + /// + public string EmailConfirmationUrl { get; set; } + + /// + /// 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. + /// + public virtual Task OnGetAsync(string email) => throw new NotImplementedException(); + } + + internal class RegisterConfirmationModel : RegisterConfirmationModel where TUser : class + { + private readonly UserManager _userManager; + private readonly IWebHostEnvironment _hostingEnv; + private readonly IEmailSender _sender; + + public RegisterConfirmationModel(UserManager userManager, IWebHostEnvironment hostingEnv, IEmailSender sender) + { + _userManager = userManager; + _hostingEnv = hostingEnv; + _sender = sender; + } + + public override async Task OnGetAsync(string email) + { + if (email == null) + { + return RedirectToPage("/Index"); + } + + var user = await _userManager.FindByEmailAsync(email); + if (user == null) + { + return NotFound($"Unable to load user with email '{email}'."); + } + + Email = email; + // 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); + EmailConfirmationUrl = Url.Page( + "/Account/ConfirmEmail", + pageHandler: null, + values: new { userId = userId, code = code }, + protocol: Request.Scheme); + + } + + return Page(); + } + } +} diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/_StatusMessage.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/_StatusMessage.cshtml new file mode 100644 index 000000000000..e996841309e2 --- /dev/null +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/_StatusMessage.cshtml @@ -0,0 +1,10 @@ +@model string + +@if (!String.IsNullOrEmpty(Model)) +{ + var statusMessageClass = Model.StartsWith("Error") ? "danger" : "success"; + +} diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml index 404159724942..6b2de21b4324 100644 --- a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml +++ b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml @@ -22,22 +22,6 @@ -
      - - @if (Model.IsEmailConfirmed) - { -
      - - -
      -} -else -{ - - -} - -
      diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs index 23303774f06a..c6b49e501009 100644 --- a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs +++ b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs @@ -3,11 +3,9 @@ using System; using System.ComponentModel.DataAnnotations; -using System.Text.Encodings.Web; using System.Threading.Tasks; using IdentitySample.DefaultUI.Data; using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; @@ -17,22 +15,17 @@ public class IndexModel : PageModel { private readonly UserManager _userManager; private readonly SignInManager _signInManager; - private readonly IEmailSender _emailSender; public IndexModel( UserManager userManager, - SignInManager signInManager, - IEmailSender emailSender) + SignInManager signInManager) { _userManager = userManager; _signInManager = signInManager; - _emailSender = emailSender; } public string Username { get; set; } - public bool IsEmailConfirmed { get; set; } - [TempData] public string StatusMessage { get; set; } @@ -41,10 +34,6 @@ public IndexModel( public class InputModel { - [Required] - [EmailAddress] - public string Email { get; set; } - [Phone] [Display(Name = "Phone number")] public string PhoneNumber { get; set; } @@ -73,12 +62,9 @@ public async Task OnGetAsync() { Name = user.Name, Age = user.Age, - Email = user.Email, PhoneNumber = user.PhoneNumber }; - IsEmailConfirmed = await _userManager.IsEmailConfirmedAsync(user); - return Page(); } @@ -111,15 +97,6 @@ public async Task OnPostAsync() throw new InvalidOperationException($"Unexpected error ocurred updating the profile for user with ID '{user.Id}'"); } - if (Input.Email != user.Email) - { - var setEmailResult = await _userManager.SetEmailAsync(user, Input.Email); - if (!setEmailResult.Succeeded) - { - throw new InvalidOperationException($"Unexpected error occurred setting email for user with ID '{user.Id}'."); - } - } - if (Input.PhoneNumber != user.PhoneNumber) { var setPhoneResult = await _userManager.SetPhoneNumberAsync(user, Input.PhoneNumber); @@ -133,33 +110,5 @@ public async Task OnPostAsync() StatusMessage = "Your profile has been updated"; return RedirectToPage(); } - - public async Task OnPostSendVerificationEmailAsync() - { - if (!ModelState.IsValid) - { - return Page(); - } - - var user = await _userManager.GetUserAsync(User); - if (user == null) - { - return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); - } - - var code = await _userManager.GenerateEmailConfirmationTokenAsync(user); - var callbackUrl = Url.Page( - "/Account/ConfirmEmail", - pageHandler: null, - values: new { user.Id, code }, - protocol: Request.Scheme); - await _emailSender.SendEmailAsync( - user.Email, - "Confirm your email", - $"Please confirm your account by clicking here."); - - StatusMessage = "Verification email sent. Please check your email."; - return RedirectToPage(); - } } } diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml.cs b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml.cs index bbe8394abbab..6ff8f2b211c5 100644 --- a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml.cs +++ b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml.cs @@ -106,8 +106,15 @@ public async Task OnPostAsync(string returnUrl = null) await _emailSender.SendEmailAsync(Input.Email, "Confirm your email", $"Please confirm your account by clicking here."); - await _signInManager.SignInAsync(user, isPersistent: false); - return LocalRedirect(returnUrl); + if (_userManager.Options.SignIn.RequireConfirmedAccount) + { + return RedirectToPage("RegisterConfirmation", new { email = Input.Email }); + } + else + { + await _signInManager.SignInAsync(user, isPersistent: false); + return LocalRedirect(returnUrl); + } } foreach (var error in result.Errors) { diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Startup.cs b/src/Identity/samples/IdentitySample.DefaultUI/Startup.cs index 6549d0416a5c..d42d4b90f9d4 100644 --- a/src/Identity/samples/IdentitySample.DefaultUI/Startup.cs +++ b/src/Identity/samples/IdentitySample.DefaultUI/Startup.cs @@ -1,3 +1,4 @@ +using System.Threading.Tasks; using IdentitySample.DefaultUI.Data; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; @@ -11,6 +12,14 @@ namespace IdentitySample.DefaultUI { + public class BadDude : IUserConfirmation + { + public Task IsConfirmedAsync(UserManager manager, ApplicationUser user) + { + return Task.FromResult(false); + } + } + public class Startup { public Startup(IWebHostEnvironment env) @@ -37,7 +46,7 @@ public void ConfigureServices(IServiceCollection services) services.AddMvc().AddNewtonsoftJson(); - services.AddDefaultIdentity() + services.AddDefaultIdentity(o => o.SignIn.RequireConfirmedAccount = true) .AddRoles() .AddEntityFrameworkStores(); } diff --git a/src/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIContext.cs b/src/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIContext.cs index 71380d8a861e..45aa3bca5cbb 100644 --- a/src/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIContext.cs +++ b/src/Identity/test/Identity.FunctionalTests/Infrastructure/DefaultUIContext.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -35,6 +35,9 @@ internal DefaultUIContext WithPasswordLogin() => internal DefaultUIContext WithCookieConsent() => new DefaultUIContext(this) { CookiePolicyAccepted = true }; + internal DefaultUIContext WithRealEmailSender() => + new DefaultUIContext(this) { HasRealEmailSender = true }; + public string AuthenticatorKey { get => GetValue(nameof(AuthenticatorKey)); @@ -93,5 +96,11 @@ public bool CookiePolicyAccepted get => GetValue(nameof(CookiePolicyAccepted)); set => SetValue(nameof(CookiePolicyAccepted), value); } + + public bool HasRealEmailSender + { + get => GetValue(nameof(HasRealEmailSender)); + set => SetValue(nameof(HasRealEmailSender), value); + } } } diff --git a/src/Identity/test/Identity.FunctionalTests/ManagementTests.cs b/src/Identity/test/Identity.FunctionalTests/ManagementTests.cs index b2faff4f04f3..6bb5c8e64d32 100644 --- a/src/Identity/test/Identity.FunctionalTests/ManagementTests.cs +++ b/src/Identity/test/Identity.FunctionalTests/ManagementTests.cs @@ -70,9 +70,9 @@ public async Task CanConfirmEmail() void ConfigureTestServices(IServiceCollection services) => services.SetupTestEmailSender(emails); - var client = ServerFactory - .WithWebHostBuilder(whb => whb.ConfigureServices(ConfigureTestServices)) - .CreateClient(); + var server = ServerFactory + .WithWebHostBuilder(whb => whb.ConfigureServices(ConfigureTestServices)); + var client = server.CreateClient(); var userName = $"{Guid.NewGuid()}@example.com"; var password = $"!Test.Password1$"; @@ -91,21 +91,30 @@ public async Task CanChangeEmail() { // Arrange var emails = new ContosoEmailSender(); - var client = ServerFactory - .CreateClient(); + void ConfigureTestServices(IServiceCollection services) => + services.SetupTestEmailSender(emails); + + var server = ServerFactory + .WithWebHostBuilder(whb => whb.ConfigureServices(ConfigureTestServices)); + var client = server.CreateClient(); + var newClient = server.CreateClient(); + var failedClient = server.CreateClient(); var userName = $"{Guid.NewGuid()}@example.com"; var password = $"!Test.Password1$"; var newEmail = "updatedEmail@example.com"; var index = await UserStories.RegisterNewUserAsync(client, userName, password); - var manageIndex = await UserStories.SendUpdateProfileAsync(index, newEmail); + var email = await UserStories.SendUpdateEmailAsync(index, newEmail); // Act & Assert - var pageUserName = manageIndex.GetUserName(); - Assert.Equal(newEmail, pageUserName); - var pageEmail = manageIndex.GetEmail(); - Assert.Equal(newEmail, pageEmail); + Assert.Equal(2, emails.SentEmails.Count); + await UserStories.ConfirmEmailAsync(emails.SentEmails[1], client); + + // Verify can login with new email, fails with old + await UserStories.LoginExistingUserAsync(newClient, newEmail, password); + await UserStories.LoginFailsWithWrongPasswordAsync(failedClient, userName, password); + } [Fact] diff --git a/src/Identity/test/Identity.FunctionalTests/NoIdentityAddedTests.cs b/src/Identity/test/Identity.FunctionalTests/NoIdentityAddedTests.cs index 466a9da5387a..5aaafba7b6b0 100644 --- a/src/Identity/test/Identity.FunctionalTests/NoIdentityAddedTests.cs +++ b/src/Identity/test/Identity.FunctionalTests/NoIdentityAddedTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Net; @@ -6,9 +6,7 @@ using Identity.DefaultUI.WebSite; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging.Testing; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AspNetCore.Identity.FunctionalTests { diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Login.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Login.cs index 1600daa98521..7db145000fa5 100644 --- a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Login.cs +++ b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Login.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; @@ -15,6 +15,7 @@ public class Login : DefaultUIPage private readonly IHtmlAnchorElement _forgotPasswordLink; private readonly IHtmlFormElement _externalLoginForm; private readonly IHtmlElement _contosoButton; + private readonly IHtmlElement _loginButton; public Login( HttpClient client, @@ -23,6 +24,7 @@ public Login( : base(client, login, context) { _loginForm = HtmlAssert.HasForm("#account", login); + _loginButton = HtmlAssert.HasElement("#login-submit", login); _forgotPasswordLink = HtmlAssert.HasLink("#forgot-password", login); if (Context.ContosoLoginEnabled) { @@ -87,7 +89,7 @@ public async Task LockoutUserAsync(string userName, string passwo private async Task SendLoginForm(string userName, string password) { - return await Client.SendAsync(_loginForm, new Dictionary() + return await Client.SendAsync(_loginForm, _loginButton, new Dictionary() { ["Input_Email"] = userName, ["Input_Password"] = password diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/Email.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/Email.cs new file mode 100644 index 000000000000..2c21a678e29a --- /dev/null +++ b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/Email.cs @@ -0,0 +1,67 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Net.Http; +using System.Threading.Tasks; +using AngleSharp.Dom.Html; +using Xunit; + +namespace Microsoft.AspNetCore.Identity.FunctionalTests.Account.Manage +{ + public class Email : DefaultUIPage + { + private readonly IHtmlElement _emailInput; + private readonly IHtmlElement _newEmailInput; + private readonly IHtmlElement _confirmEmailButton; + private readonly IHtmlFormElement _changeEmailForm; + private readonly IHtmlElement _changeEmailButton; + + public static readonly string Path = "/"; + + public Email(HttpClient client, IHtmlDocument manage, DefaultUIContext context) + : base(client, manage, context) + { + Assert.True(Context.UserAuthenticated); + + _changeEmailForm = HtmlAssert.HasForm("#email-form", manage); + _emailInput = HtmlAssert.HasElement("#Email", manage); + _newEmailInput = HtmlAssert.HasElement("#Input_NewEmail", manage); + _changeEmailButton = HtmlAssert.HasElement("#change-email-button", manage); + if (!Context.EmailConfirmed) + { + _confirmEmailButton = HtmlAssert.HasElement("button#email-verification", manage); + } + } + + internal async Task SendConfirmationEmailAsync() + { + Assert.False(Context.EmailConfirmed); + + var response = await Client.SendAsync(_changeEmailForm, _confirmEmailButton); + var goToManage = ResponseAssert.IsRedirect(response); + var manageResponse = await Client.GetAsync(goToManage); + var manage = await ResponseAssert.IsHtmlDocumentAsync(manageResponse); + + return new Email(Client, manage, Context); + } + + internal async Task SendUpdateEmailAsync(string newEmail) + { + var response = await Client.SendAsync(_changeEmailForm, _changeEmailButton, new Dictionary + { + ["Input_NewEmail"] = newEmail + }); + var goToManage = ResponseAssert.IsRedirect(response); + var manageResponse = await Client.GetAsync(goToManage); + var manage = await ResponseAssert.IsHtmlDocumentAsync(manageResponse); + + return new Email(Client, manage, Context); + } + + internal object GetEmail() => _emailInput.GetAttribute("value"); + + internal object GetNewEmail() => _newEmailInput.GetAttribute("value"); + } +} diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/Index.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/Index.cs index 6e3a14971346..6aafa609d2ac 100644 --- a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/Index.cs +++ b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Manage/Index.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -13,15 +13,14 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests.Account.Manage public class Index : DefaultUIPage { private readonly IHtmlAnchorElement _profileLink; + private readonly IHtmlAnchorElement _emailLink; private readonly IHtmlAnchorElement _changePasswordLink; private readonly IHtmlAnchorElement _twoFactorLink; private readonly IHtmlAnchorElement _externalLoginLink; private readonly IHtmlAnchorElement _personalDataLink; private readonly IHtmlFormElement _updateProfileForm; - private readonly IHtmlElement _emailInput; private readonly IHtmlElement _userNameInput; private readonly IHtmlElement _updateProfileButton; - private readonly IHtmlElement _confirmEmailButton; public static readonly string Path = "/"; public Index(HttpClient client, IHtmlDocument manage, DefaultUIContext context) @@ -30,6 +29,7 @@ public Index(HttpClient client, IHtmlDocument manage, DefaultUIContext context) Assert.True(Context.UserAuthenticated); _profileLink = HtmlAssert.HasLink("#profile", manage); + _emailLink = HtmlAssert.HasLink("#email", manage); _changePasswordLink = HtmlAssert.HasLink("#change-password", manage); _twoFactorLink = HtmlAssert.HasLink("#two-factor", manage); if (Context.ContosoLoginEnabled) @@ -38,13 +38,8 @@ public Index(HttpClient client, IHtmlDocument manage, DefaultUIContext context) } _personalDataLink = HtmlAssert.HasLink("#personal-data", manage); _updateProfileForm = HtmlAssert.HasForm("#profile-form", manage); - _emailInput = HtmlAssert.HasElement("#Input_Email", manage); _userNameInput = HtmlAssert.HasElement("#Username", manage); _updateProfileButton = HtmlAssert.HasElement("#update-profile-button", manage); - if (!Context.EmailConfirmed) - { - _confirmEmailButton = HtmlAssert.HasElement("button#email-verification", manage); - } } public async Task ClickTwoFactorLinkAsync(bool consent = true) @@ -71,31 +66,6 @@ public async Task ClickTwoFactorEnabledLinkAsync() return new TwoFactorAuthentication(Client, twoFactor, Context); } - internal async Task SendConfirmationEmailAsync() - { - Assert.False(Context.EmailConfirmed); - - var response = await Client.SendAsync(_updateProfileForm, _confirmEmailButton); - var goToManage = ResponseAssert.IsRedirect(response); - var manageResponse = await Client.GetAsync(goToManage); - var manage = await ResponseAssert.IsHtmlDocumentAsync(manageResponse); - - return new Index(Client, manage, Context); - } - - internal async Task SendUpdateProfileAsync(string newEmail) - { - var response = await Client.SendAsync(_updateProfileForm, _updateProfileButton, new Dictionary - { - ["Input_Email"] = newEmail - }); - var goToManage = ResponseAssert.IsRedirect(response); - var manageResponse = await Client.GetAsync(goToManage); - var manage = await ResponseAssert.IsHtmlDocumentAsync(manageResponse); - - return new Index(Client, manage, Context); - } - public async Task ClickChangePasswordLinkAsync() { var goToChangePassword = await Client.GetAsync(_changePasswordLink.Href); @@ -103,8 +73,6 @@ public async Task ClickChangePasswordLinkAsync() return new ChangePassword(Client, changePasswordDocument, Context); } - internal string GetEmail() => _emailInput.GetAttribute("value"); - internal object GetUserName() => _userNameInput.GetAttribute("value"); public async Task ClickChangePasswordLinkExternalLoginAsync() @@ -123,6 +91,13 @@ public async Task ClickPersonalDataLinkAsync() return new PersonalData(Client, personalData, Context); } + public async Task ClickEmailLinkAsync() + { + var goToEmail = await Client.GetAsync(_emailLink.Href); + var email = await ResponseAssert.IsHtmlDocumentAsync(goToEmail); + return new Email(Client, email, Context); + } + public async Task ClickLinkLoginAsync() { var goToExternalLogin = await Client.GetAsync(_externalLoginLink.Href); diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Register.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Register.cs index e4a846781c30..cbddb15df44b 100644 --- a/src/Identity/test/Identity.FunctionalTests/Pages/Account/Register.cs +++ b/src/Identity/test/Identity.FunctionalTests/Pages/Account/Register.cs @@ -53,5 +53,22 @@ public async Task SubmitRegisterFormForValidUserAsync(string userName, st return new Index(Client, index, Context.WithAuthenticatedUser()); } + + public async Task SubmitRegisterFormWithConfirmation(string userName, string password, bool hasRealEmail = false) + { + var registered = await Client.SendAsync(_registerForm, new Dictionary() + { + ["Input_Email"] = userName, + ["Input_Password"] = password, + ["Input_ConfirmPassword"] = password + }); + + var registeredLocation = ResponseAssert.IsRedirect(registered); + Assert.Equal(RegisterConfirmation.Path + "?email="+userName, registeredLocation.ToString()); + var registerResponse = await Client.GetAsync(registeredLocation); + var register = await ResponseAssert.IsHtmlDocumentAsync(registerResponse); + + return new RegisterConfirmation(Client, register, hasRealEmail ? Context.WithRealEmailSender() : Context); + } } } diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/Index.cs b/src/Identity/test/Identity.FunctionalTests/Pages/Index.cs index cbbe0d730092..b87ef086ee4c 100644 --- a/src/Identity/test/Identity.FunctionalTests/Pages/Index.cs +++ b/src/Identity/test/Identity.FunctionalTests/Pages/Index.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Net.Http; diff --git a/src/Identity/test/Identity.FunctionalTests/Pages/RegisterConfirmation.cs b/src/Identity/test/Identity.FunctionalTests/Pages/RegisterConfirmation.cs new file mode 100644 index 000000000000..d40611025328 --- /dev/null +++ b/src/Identity/test/Identity.FunctionalTests/Pages/RegisterConfirmation.cs @@ -0,0 +1,41 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Net.Http; +using System.Threading.Tasks; +using AngleSharp.Dom.Html; +using Microsoft.AspNetCore.Identity.FunctionalTests.Account; +using Xunit; + +namespace Microsoft.AspNetCore.Identity.FunctionalTests +{ + public class RegisterConfirmation : DefaultUIPage + { + private readonly IHtmlAnchorElement _confirmLink; + public static readonly string Path = "/Identity/Account/RegisterConfirmation"; + + public RegisterConfirmation( + HttpClient client, + IHtmlDocument register, + DefaultUIContext context) + : base(client, register, context) + { + if (Context.HasRealEmailSender) + { + Assert.Empty(Document.QuerySelectorAll("#confirm-link")); + } + else + { + _confirmLink = HtmlAssert.HasLink("#confirm-link", Document); + } + } + + public async Task ClickConfirmLinkAsync() + { + var goToConfirm = await Client.GetAsync(_confirmLink.Href); + var confirm = await ResponseAssert.IsHtmlDocumentAsync(goToConfirm); + + return await ConfirmEmail.Create(_confirmLink, Client, Context); + } + } +} diff --git a/src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs b/src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs index 242ba5de6fec..dc07c1799259 100644 --- a/src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs +++ b/src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Xunit; @@ -37,6 +38,59 @@ public async Task CanRegisterAUser() await UserStories.RegisterNewUserAsync(client, userName, password); } + [Fact] + public async Task CanRegisterAUserWithRequiredConfirmation() + { + // Arrange + void ConfigureTestServices(IServiceCollection services) { services.Configure(o => o.SignIn.RequireConfirmedAccount = true); }; + + var server = ServerFactory + .WithWebHostBuilder(whb => whb.ConfigureServices(ConfigureTestServices)); + var client = server.CreateClient(); + var client2 = server.CreateClient(); + + var userName = $"{Guid.NewGuid()}@example.com"; + var password = $"!Test.Password1$"; + + // Act & Assert + var register = await UserStories.RegisterNewUserAsyncWithConfirmation(client, userName, password); + + // Since we aren't confirmed yet, login should fail until we confirm + await UserStories.LoginFailsWithWrongPasswordAsync(client, userName, password); + await register.ClickConfirmLinkAsync(); + await UserStories.LoginExistingUserAsync(client, userName, password); + } + + private class FakeEmailSender : IEmailSender + { + public Task SendEmailAsync(string email, string subject, string htmlMessage) + => Task.CompletedTask; + } + + [Fact] + public async Task RegisterWithRealConfirmationDoesNotShowLink() + { + // Arrange + void ConfigureTestServices(IServiceCollection services) { + services.Configure(o => o.SignIn.RequireConfirmedAccount = true); + services.AddSingleton(); + }; + + var server = ServerFactory + .WithWebHostBuilder(whb => whb.ConfigureServices(ConfigureTestServices)); + var client = server.CreateClient(); + var client2 = server.CreateClient(); + + var userName = $"{Guid.NewGuid()}@example.com"; + var password = $"!Test.Password1$"; + + // Act & Assert + var register = await UserStories.RegisterNewUserAsyncWithConfirmation(client, userName, password, hasRealEmailSender: true); + + // Since we aren't confirmed yet, login should fail until we confirm + await UserStories.LoginFailsWithWrongPasswordAsync(client, userName, password); + } + [Fact] public async Task CanRegisterAUser_WithGlobalAuthorizeFilter() { diff --git a/src/Identity/test/Identity.FunctionalTests/UserStories.cs b/src/Identity/test/Identity.FunctionalTests/UserStories.cs index a225cec1b617..9944168a2b1a 100644 --- a/src/Identity/test/Identity.FunctionalTests/UserStories.cs +++ b/src/Identity/test/Identity.FunctionalTests/UserStories.cs @@ -27,6 +27,17 @@ internal static async Task RegisterNewUserAsync(HttpClient client, string return await register.SubmitRegisterFormForValidUserAsync(userName, password); } + internal static async Task RegisterNewUserAsyncWithConfirmation(HttpClient client, string userName = null, string password = null, bool hasRealEmailSender = false) + { + userName = userName ?? $"{Guid.NewGuid()}@example.com"; + password = password ?? $"!Test.Password1$"; + + var index = await Index.CreateAsync(client); + var register = await index.ClickRegisterLinkAsync(); + + return await register.SubmitRegisterFormWithConfirmation(userName, password, hasRealEmailSender); + } + internal static async Task LoginExistingUserAsync(HttpClient client, string userName, string password) { @@ -82,16 +93,18 @@ internal static async Task RegisterNewUserWithSocialLoginAsyncViaRegister return await externalLogin.SendEmailAsync(email); } - internal static async Task SendEmailConfirmationLinkAsync(Index index) + internal static async Task SendEmailConfirmationLinkAsync(Index index) { var manage = await index.ClickManageLinkAsync(); - return await manage.SendConfirmationEmailAsync(); + var email = await manage.ClickEmailLinkAsync(); + return await email.SendConfirmationEmailAsync(); } - internal static async Task SendUpdateProfileAsync(Index index, string newEmail) + internal static async Task SendUpdateEmailAsync(Index index, string newEmail) { var manage = await index.ClickManageLinkAsync(); - return await manage.SendUpdateProfileAsync(newEmail); + var email = await manage.ClickEmailLinkAsync(); + return await email.SendUpdateEmailAsync(newEmail); } internal static async Task LoginWithSocialLoginAsync(HttpClient client, string userName) diff --git a/src/Identity/test/Identity.Test/IdentityBuilderTest.cs b/src/Identity/test/Identity.Test/IdentityBuilderTest.cs index e5bc2004ec2f..492727ef049e 100644 --- a/src/Identity/test/Identity.Test/IdentityBuilderTest.cs +++ b/src/Identity/test/Identity.Test/IdentityBuilderTest.cs @@ -333,7 +333,7 @@ Task IRoleStore.FindByNameAsync(string roleName, Cancellatio private class MySignInManager : SignInManager { - public MySignInManager(UserManager manager, IHttpContextAccessor context, IUserClaimsPrincipalFactory claimsFactory) : base(manager, context, claimsFactory, null, null, null) { } + public MySignInManager(UserManager manager, IHttpContextAccessor context, IUserClaimsPrincipalFactory claimsFactory) : base(manager, context, claimsFactory, null, null, null, null) { } } private class MyUserManager : UserManager @@ -357,4 +357,4 @@ public MyRoleManager(IRoleStore store, } } } -} \ No newline at end of file +} diff --git a/src/Identity/test/Identity.Test/SecurityStampValidatorTest.cs b/src/Identity/test/Identity.Test/SecurityStampValidatorTest.cs index 8bcf985540de..539fe3679e36 100644 --- a/src/Identity/test/Identity.Test/SecurityStampValidatorTest.cs +++ b/src/Identity/test/Identity.Test/SecurityStampValidatorTest.cs @@ -103,7 +103,7 @@ private async Task RunApplicationCookieTest(PocoUser user, Mock htt var contextAccessor = new Mock(); contextAccessor.Setup(a => a.HttpContext).Returns(httpContext.Object); var signInManager = new Mock>(userManager.Object, - contextAccessor.Object, claimsManager.Object, identityOptions.Object, null, new Mock().Object); + contextAccessor.Object, claimsManager.Object, identityOptions.Object, null, new Mock().Object, new DefaultUserConfirmation()); signInManager.Setup(s => s.ValidateSecurityStampAsync(It.IsAny())).ReturnsAsync(shouldStampValidate ? user : default).Verifiable(); if (shouldStampValidate) @@ -164,7 +164,7 @@ public async Task OnValidateIdentityAcceptsWhenStoreDoesNotSupportSecurityStamp( var contextAccessor = new Mock(); contextAccessor.Setup(a => a.HttpContext).Returns(httpContext.Object); var signInManager = new SignInManager(userManager.Object, - contextAccessor.Object, claimsManager.Object, identityOptions.Object, null, new Mock().Object); + contextAccessor.Object, claimsManager.Object, identityOptions.Object, null, new Mock().Object, new DefaultUserConfirmation()); userManager.Setup(u => u.GetUserAsync(It.IsAny())).ReturnsAsync(user).Verifiable(); claimsManager.Setup(c => c.CreateAsync(user)).ReturnsAsync(new ClaimsPrincipal()).Verifiable(); @@ -205,7 +205,7 @@ public async Task OnValidateIdentityRejectsWhenNoIssuedUtc() var contextAccessor = new Mock(); contextAccessor.Setup(a => a.HttpContext).Returns(httpContext.Object); var signInManager = new Mock>(userManager.Object, - contextAccessor.Object, claimsManager.Object, identityOptions.Object, null, new Mock().Object); + contextAccessor.Object, claimsManager.Object, identityOptions.Object, null, new Mock().Object, new DefaultUserConfirmation()); signInManager.Setup(s => s.ValidateSecurityStampAsync(It.IsAny())).ReturnsAsync(default(PocoUser)).Verifiable(); var services = new ServiceCollection(); services.AddSingleton(options.Object); @@ -241,7 +241,7 @@ public async Task OnValidateIdentityDoesNotRejectsWhenNotExpired() var contextAccessor = new Mock(); contextAccessor.Setup(a => a.HttpContext).Returns(httpContext.Object); var signInManager = new Mock>(userManager.Object, - contextAccessor.Object, claimsManager.Object, identityOptions.Object, null, new Mock().Object); + contextAccessor.Object, claimsManager.Object, identityOptions.Object, null, new Mock().Object, new DefaultUserConfirmation()); signInManager.Setup(s => s.ValidateSecurityStampAsync(It.IsAny())).Throws(new Exception("Shouldn't be called")); signInManager.Setup(s => s.SignInAsync(user, false, null)).Throws(new Exception("Shouldn't be called")); var services = new ServiceCollection(); @@ -277,7 +277,7 @@ private async Task RunRememberClientCookieTest(bool shouldStampValidate, bool va var contextAccessor = new Mock(); contextAccessor.Setup(a => a.HttpContext).Returns(httpContext.Object); var signInManager = new Mock>(userManager.Object, - contextAccessor.Object, claimsManager.Object, identityOptions.Object, null, new Mock().Object); + contextAccessor.Object, claimsManager.Object, identityOptions.Object, null, new Mock().Object, new DefaultUserConfirmation()); signInManager.Setup(s => s.ValidateTwoFactorSecurityStampAsync(It.IsAny())).ReturnsAsync(shouldStampValidate ? user : default).Verifiable(); var services = new ServiceCollection(); @@ -309,4 +309,4 @@ public Task TwoFactorRememberClientOnValidatePrincipalTestSuccess() public Task TwoFactorRememberClientOnValidatePrincipalRejectsWhenValidateSecurityStampFails() => RunRememberClientCookieTest(shouldStampValidate: false, validationSuccess: false); } -} \ No newline at end of file +} diff --git a/src/Identity/test/Identity.Test/SignInManagerTest.cs b/src/Identity/test/Identity.Test/SignInManagerTest.cs index cc840112dc59..636df0e3f823 100644 --- a/src/Identity/test/Identity.Test/SignInManagerTest.cs +++ b/src/Identity/test/Identity.Test/SignInManagerTest.cs @@ -69,13 +69,13 @@ public class SignInManagerTest [Fact] public void ConstructorNullChecks() { - Assert.Throws("userManager", () => new SignInManager(null, null, null, null, null, null)); + Assert.Throws("userManager", () => new SignInManager(null, null, null, null, null, null, null)); var userManager = MockHelpers.MockUserManager().Object; - Assert.Throws("contextAccessor", () => new SignInManager(userManager, null, null, null, null, null)); + Assert.Throws("contextAccessor", () => new SignInManager(userManager, null, null, null, null, null, null)); var contextAccessor = new Mock(); var context = new Mock(); contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); - Assert.Throws("claimsFactory", () => new SignInManager(userManager, contextAccessor.Object, null, null, null, null)); + Assert.Throws("claimsFactory", () => new SignInManager(userManager, contextAccessor.Object, null, null, null, null, null)); } //[Fact] @@ -124,7 +124,7 @@ public async Task PasswordSignInReturnsLockedOutWhenLockedOut() options.Setup(a => a.Value).Returns(identityOptions); var claimsFactory = new UserClaimsPrincipalFactory(manager.Object, roleManager.Object, options.Object); var logger = new TestLogger>(); - var helper = new SignInManager(manager.Object, contextAccessor.Object, claimsFactory, options.Object, logger, new Mock().Object); + var helper = new SignInManager(manager.Object, contextAccessor.Object, claimsFactory, options.Object, logger, new Mock().Object, new DefaultUserConfirmation()); // Act var result = await helper.PasswordSignInAsync(user.UserName, "bogus", false, false); @@ -154,7 +154,7 @@ public async Task CheckPasswordSignInReturnsLockedOutWhenLockedOut() options.Setup(a => a.Value).Returns(identityOptions); var claimsFactory = new UserClaimsPrincipalFactory(manager.Object, roleManager.Object, options.Object); var logger = new TestLogger>(); - var helper = new SignInManager(manager.Object, contextAccessor.Object, claimsFactory, options.Object, logger, new Mock().Object); + var helper = new SignInManager(manager.Object, contextAccessor.Object, claimsFactory, options.Object, logger, new Mock().Object, new DefaultUserConfirmation()); // Act var result = await helper.CheckPasswordSignInAsync(user, "bogus", false); @@ -186,7 +186,7 @@ private static SignInManager SetupSignInManager(UserManager options.Setup(a => a.Value).Returns(identityOptions); var claimsFactory = new UserClaimsPrincipalFactory(manager, roleManager.Object, options.Object); schemeProvider = schemeProvider ?? new Mock().Object; - var sm = new SignInManager(manager, contextAccessor.Object, claimsFactory, options.Object, null, schemeProvider); + var sm = new SignInManager(manager, contextAccessor.Object, claimsFactory, options.Object, null, schemeProvider, new DefaultUserConfirmation()); sm.Logger = logger ?? NullLogger>.Instance; return sm; } @@ -575,7 +575,7 @@ public async Task CanResignIn( var signInManager = new Mock>(manager.Object, new HttpContextAccessor { HttpContext = context }, new Mock>().Object, - null, null, new Mock().Object) + null, null, new Mock().Object, null) { CallBase = true }; //signInManager.Setup(s => s.SignInAsync(user, It.Is(p => p.IsPersistent == isPersistent), //externalLogin? loginProvider : null)).Returns(Task.FromResult(0)).Verifiable();