diff --git a/src/Umbraco.Abstractions/Configuration/IMemberPasswordConfiguration.cs b/src/Umbraco.Abstractions/Configuration/IMemberPasswordConfiguration.cs new file mode 100644 index 0000000000..a7c956a337 --- /dev/null +++ b/src/Umbraco.Abstractions/Configuration/IMemberPasswordConfiguration.cs @@ -0,0 +1,9 @@ +namespace Umbraco.Core.Configuration +{ + /// + /// The password configuration for members + /// + public interface IMemberPasswordConfiguration : IPasswordConfiguration + { + } +} diff --git a/src/Umbraco.Abstractions/Configuration/IUserPasswordConfiguration.cs b/src/Umbraco.Abstractions/Configuration/IUserPasswordConfiguration.cs index 04af69c68c..ca9a7f3271 100644 --- a/src/Umbraco.Abstractions/Configuration/IUserPasswordConfiguration.cs +++ b/src/Umbraco.Abstractions/Configuration/IUserPasswordConfiguration.cs @@ -5,6 +5,5 @@ /// public interface IUserPasswordConfiguration : IPasswordConfiguration { - } } diff --git a/src/Umbraco.Abstractions/Security/IPasswordGenerator.cs b/src/Umbraco.Abstractions/Security/IPasswordGenerator.cs deleted file mode 100644 index 3977ec3cf6..0000000000 --- a/src/Umbraco.Abstractions/Security/IPasswordGenerator.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Umbraco.Core.Configuration; - -namespace Umbraco.Core.Security -{ - /// - /// Generates a password - /// - public interface IPasswordGenerator - { - /// - /// Generates a password - /// - /// - /// - string GeneratePassword(IPasswordConfiguration passwordConfiguration); - } -} diff --git a/src/Umbraco.Abstractions/Security/PasswordGenerator.cs b/src/Umbraco.Abstractions/Security/PasswordGenerator.cs index 2dca396384..d8e18a8146 100644 --- a/src/Umbraco.Abstractions/Security/PasswordGenerator.cs +++ b/src/Umbraco.Abstractions/Security/PasswordGenerator.cs @@ -11,28 +11,34 @@ namespace Umbraco.Core.Security /// /// This uses logic copied from the old MembershipProvider.GeneratePassword logic /// - public class PasswordGenerator : IPasswordGenerator + public class PasswordGenerator { - public string GeneratePassword(IPasswordConfiguration passwordConfiguration) + private readonly IPasswordConfiguration _passwordConfiguration; + + public PasswordGenerator(IPasswordConfiguration passwordConfiguration) + { + _passwordConfiguration = passwordConfiguration; + } + public string GeneratePassword() { var password = PasswordStore.GeneratePassword( - passwordConfiguration.RequiredLength, - passwordConfiguration.RequireNonLetterOrDigit ? 2 : 0); + _passwordConfiguration.RequiredLength, + _passwordConfiguration.RequireNonLetterOrDigit ? 2 : 0); var random = new Random(); var passwordChars = password.ToCharArray(); - if (passwordConfiguration.RequireDigit && passwordChars.ContainsAny(Enumerable.Range(48, 58).Select(x => (char)x))) + if (_passwordConfiguration.RequireDigit && passwordChars.ContainsAny(Enumerable.Range(48, 58).Select(x => (char)x))) password += Convert.ToChar(random.Next(48, 58)); // 0-9 - if (passwordConfiguration.RequireLowercase && passwordChars.ContainsAny(Enumerable.Range(97, 123).Select(x => (char)x))) + if (_passwordConfiguration.RequireLowercase && passwordChars.ContainsAny(Enumerable.Range(97, 123).Select(x => (char)x))) password += Convert.ToChar(random.Next(97, 123)); // a-z - if (passwordConfiguration.RequireUppercase && passwordChars.ContainsAny(Enumerable.Range(65, 91).Select(x => (char)x))) + if (_passwordConfiguration.RequireUppercase && passwordChars.ContainsAny(Enumerable.Range(65, 91).Select(x => (char)x))) password += Convert.ToChar(random.Next(65, 91)); // A-Z - if (passwordConfiguration.RequireNonLetterOrDigit && passwordChars.ContainsAny(Enumerable.Range(33, 48).Select(x => (char)x))) + if (_passwordConfiguration.RequireNonLetterOrDigit && passwordChars.ContainsAny(Enumerable.Range(33, 48).Select(x => (char)x))) password += Convert.ToChar(random.Next(33, 48)); // symbols !"#$%&'()*+,-./ return password; diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs index cc68549412..ceef2f8f5a 100644 --- a/src/Umbraco.Configuration/ConfigsFactory.cs +++ b/src/Umbraco.Configuration/ConfigsFactory.cs @@ -25,7 +25,8 @@ namespace Umbraco.Core.Configuration configs.Add("umbracoConfiguration/settings"); configs.Add("umbracoConfiguration/HealthChecks"); - configs.Add(() => new DefaultUserPasswordConfig()); + configs.Add(() => new DefaultPasswordConfig()); + configs.Add(() => new DefaultPasswordConfig()); configs.Add(() => new CoreDebug()); configs.Add(() => new ConnectionStrings()); configs.AddCoreConfigs(_ioHelper); @@ -34,9 +35,10 @@ namespace Umbraco.Core.Configuration } // Default/static user password configs - // TODO: Make this configurable somewhere - we've removed membership providers, so could be a section in the umbracosettings.config file? - // keeping in mind that we will also be removing the members membership provider so there will be 2x the same/similar configuration - internal class DefaultUserPasswordConfig : IUserPasswordConfiguration + // TODO: Make this configurable somewhere - we've removed membership providers for users, so could be a section in the umbracosettings.config file? + // keeping in mind that we will also be removing the members membership provider so there will be 2x the same/similar configuration. + // TODO: Currently it doesn't actually seem possible to replace any sub-configuration unless totally replacing the IConfigsFactory?? + internal class DefaultPasswordConfig : IUserPasswordConfiguration, IMemberPasswordConfiguration { public int RequiredLength => 12; public bool RequireNonLetterOrDigit => false; diff --git a/src/Umbraco.Configuration/ConnectionStrings.cs b/src/Umbraco.Configuration/ConnectionStrings.cs index 1842ff6627..707f58c7b7 100644 --- a/src/Umbraco.Configuration/ConnectionStrings.cs +++ b/src/Umbraco.Configuration/ConnectionStrings.cs @@ -13,7 +13,7 @@ namespace Umbraco.Core.Configuration get { var settings = ConfigurationManager.ConnectionStrings[key]; - + if (settings == null) return null; return new ConfigConnectionString(settings.ConnectionString, settings.ProviderName, settings.Name); } } diff --git a/src/Umbraco.Core/Composing/Current.cs b/src/Umbraco.Core/Composing/Current.cs index e1d7c270ce..4eba166020 100644 --- a/src/Umbraco.Core/Composing/Current.cs +++ b/src/Umbraco.Core/Composing/Current.cs @@ -129,9 +129,6 @@ namespace Umbraco.Core.Composing public static IRuntimeState RuntimeState => Factory.GetInstance(); - public static IPasswordGenerator PasswordGenerator - => Factory.GetInstance(); - public static TypeLoader TypeLoader => Factory.GetInstance(); diff --git a/src/Umbraco.Core/Runtime/CoreInitialComposer.cs b/src/Umbraco.Core/Runtime/CoreInitialComposer.cs index 6a2a897999..9373f7b70c 100644 --- a/src/Umbraco.Core/Runtime/CoreInitialComposer.cs +++ b/src/Umbraco.Core/Runtime/CoreInitialComposer.cs @@ -136,7 +136,6 @@ namespace Umbraco.Core.Runtime composition.SetCultureDictionaryFactory(); composition.Register(f => f.GetInstance().CreateDictionary(), Lifetime.Singleton); - composition.RegisterUnique(); } } } diff --git a/src/Umbraco.Core/Security/IUmbracoMemberTypeMembershipProvider.cs b/src/Umbraco.Core/Security/IUmbracoMemberTypeMembershipProvider.cs deleted file mode 100644 index bd165334f1..0000000000 --- a/src/Umbraco.Core/Security/IUmbracoMemberTypeMembershipProvider.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections.Specialized; - -namespace Umbraco.Core.Security -{ - /// - /// An interface for exposing the content type properties for storing membership data in when - /// a membership provider's data is backed by an Umbraco content type. - /// - public interface IUmbracoMemberTypeMembershipProvider - { - - string LockPropertyTypeAlias { get; } - string LastLockedOutPropertyTypeAlias { get; } - string FailedPasswordAttemptsPropertyTypeAlias { get; } - string ApprovedPropertyTypeAlias { get; } - string CommentPropertyTypeAlias { get; } - string LastLoginPropertyTypeAlias { get; } - string LastPasswordChangedPropertyTypeAlias { get; } - - } -} diff --git a/src/Umbraco.Core/Security/PasswordSecurity.cs b/src/Umbraco.Core/Security/PasswordSecurity.cs index 6ffcff67de..3e5d65dfd7 100644 --- a/src/Umbraco.Core/Security/PasswordSecurity.cs +++ b/src/Umbraco.Core/Security/PasswordSecurity.cs @@ -1,54 +1,96 @@ using System; +using System.Collections.Generic; using System.Security.Cryptography; using System.Text; +using System.Threading.Tasks; using Umbraco.Core.Configuration; namespace Umbraco.Core.Security { + /// + /// Handles password hashing and formatting + /// public class PasswordSecurity { - private readonly IPasswordConfiguration _passwordConfiguration; + public IPasswordConfiguration PasswordConfiguration { get; } + public PasswordGenerator _generator; + public ConfiguredPasswordValidator _validator; + /// + /// Constructor + /// + /// public PasswordSecurity(IPasswordConfiguration passwordConfiguration) { - _passwordConfiguration = passwordConfiguration; + PasswordConfiguration = passwordConfiguration; } + /// + /// Checks if the password passes validation rules + /// + /// + /// + public async Task>> IsValidPasswordAsync(string password) + { + if (_validator == null) + _validator = new ConfiguredPasswordValidator(PasswordConfiguration); + var result = await _validator.ValidateAsync(password); + if (result.Succeeded) + return Attempt>.Succeed(); + + return Attempt>.Fail(result.Errors); + } + + public string GeneratePassword() + { + if (_generator == null) + _generator = new PasswordGenerator(PasswordConfiguration); + return _generator.GeneratePassword(); + } + + /// + /// Returns a hashed password value used to store in a data store + /// + /// + /// public string HashPasswordForStorage(string password) { + if (string.IsNullOrWhiteSpace(password)) + throw new ArgumentException("password cannot be empty", nameof(password)); + string salt; var hashed = HashNewPassword(password, out salt); return FormatPasswordForStorage(hashed, salt); } - public bool VerifyPassword(string password, string hashedPassword) - { - if (string.IsNullOrWhiteSpace(hashedPassword)) throw new ArgumentException("Value cannot be null or whitespace.", "hashedPassword"); - return CheckPassword(password, hashedPassword); - } - /// /// If the password format is a hashed keyed algorithm then we will pre-pend the salt used to hash the password /// to the hashed password itself. /// + /// + /// + /// + public string FormatPasswordForStorage(string hashedPassword, string salt) + { + if (PasswordConfiguration.UseLegacyEncoding) + { + return hashedPassword; + } + + return salt + hashedPassword; + } + + /// + /// Hashes a password with a given salt + /// /// /// /// - public string FormatPasswordForStorage(string pass, string salt) - { - if (_passwordConfiguration.UseLegacyEncoding) - { - return pass; - } - - return salt + pass; - } - public string HashPassword(string pass, string salt) { //if we are doing it the old way - if (_passwordConfiguration.UseLegacyEncoding) + if (PasswordConfiguration.UseLegacyEncoding) { return LegacyEncodePassword(pass); } @@ -103,21 +145,25 @@ namespace Umbraco.Core.Security } /// - /// Checks the password. + /// Verifies if the password matches the expected hash+salt of the stored password string /// /// The password. - /// The dbPassword. + /// The value of the password stored in a data store. /// - public bool CheckPassword(string password, string dbPassword) + public bool VerifyPassword(string password, string dbPassword) { if (string.IsNullOrWhiteSpace(dbPassword)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(dbPassword)); - var storedHashedPass = StoredPassword(dbPassword, out var salt); + + if (dbPassword.StartsWith(Constants.Security.EmptyPasswordPrefix)) + return false; + + var storedHashedPass = ParseStoredHashPassword(dbPassword, out var salt); var hashed = HashPassword(password, salt); return storedHashedPass == hashed; } /// - /// hash a new password with a new salt + /// Create a new password hash and a new salt /// /// /// @@ -129,15 +175,15 @@ namespace Umbraco.Core.Security } /// - /// Returns the hashed password without the salt if it is hashed + /// Parses out the hashed password and the salt from the stored password string value /// /// /// returns the salt /// - public string StoredPassword(string storedString, out string salt) + public string ParseStoredHashPassword(string storedString, out string salt) { if (string.IsNullOrWhiteSpace(storedString)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(storedString)); - if (_passwordConfiguration.UseLegacyEncoding) + if (PasswordConfiguration.UseLegacyEncoding) { salt = string.Empty; return storedString; @@ -155,9 +201,14 @@ namespace Umbraco.Core.Security return Convert.ToBase64String(numArray); } + /// + /// Return the hash algorithm to use + /// + /// + /// public HashAlgorithm GetHashAlgorithm(string password) { - if (_passwordConfiguration.UseLegacyEncoding) + if (PasswordConfiguration.UseLegacyEncoding) { return new HMACSHA1 { @@ -166,12 +217,12 @@ namespace Umbraco.Core.Security }; } - if (_passwordConfiguration.HashAlgorithmType.IsNullOrWhiteSpace()) + if (PasswordConfiguration.HashAlgorithmType.IsNullOrWhiteSpace()) throw new InvalidOperationException("No hash algorithm type specified"); - var alg = HashAlgorithm.Create(_passwordConfiguration.HashAlgorithmType); + var alg = HashAlgorithm.Create(PasswordConfiguration.HashAlgorithmType); if (alg == null) - throw new InvalidOperationException($"The hash algorithm specified {_passwordConfiguration.HashAlgorithmType} cannot be resolved"); + throw new InvalidOperationException($"The hash algorithm specified {PasswordConfiguration.HashAlgorithmType} cannot be resolved"); return alg; } @@ -183,9 +234,8 @@ namespace Umbraco.Core.Security /// The encoded password. private string LegacyEncodePassword(string password) { - string encodedPassword = password; var hashAlgorith = GetHashAlgorithm(password); - encodedPassword = Convert.ToBase64String(hashAlgorith.ComputeHash(Encoding.Unicode.GetBytes(password))); + var encodedPassword = Convert.ToBase64String(hashAlgorith.ComputeHash(Encoding.Unicode.GetBytes(password))); return encodedPassword; } diff --git a/src/Umbraco.Core/Services/Implement/MemberService.cs b/src/Umbraco.Core/Services/Implement/MemberService.cs index a716cf57cc..8295d3ee55 100644 --- a/src/Umbraco.Core/Services/Implement/MemberService.cs +++ b/src/Umbraco.Core/Services/Implement/MemberService.cs @@ -1120,77 +1120,6 @@ namespace Umbraco.Core.Services.Implement #region Membership - /// - /// A helper method that will create a basic/generic member for use with a generic membership provider - /// - /// - internal static IMember CreateGenericMembershipProviderMember(string name, string email, string username, string password) - { - var identity = int.MaxValue; - - var memType = new MemberType(-1); - var propGroup = new PropertyGroup(MemberType.SupportsPublishingConst) - { - Name = "Membership", - Id = --identity - }; - propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, Constants.Conventions.Member.Comments) - { - Name = Constants.Conventions.Member.CommentsLabel, - SortOrder = 0, - Id = --identity, - Key = identity.ToGuid() - }); - propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.Aliases.Boolean, ValueStorageType.Integer, Constants.Conventions.Member.IsApproved) - { - Name = Constants.Conventions.Member.IsApprovedLabel, - SortOrder = 3, - Id = --identity, - Key = identity.ToGuid() - }); - propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.Aliases.Boolean, ValueStorageType.Integer, Constants.Conventions.Member.IsLockedOut) - { - Name = Constants.Conventions.Member.IsLockedOutLabel, - SortOrder = 4, - Id = --identity, - Key = identity.ToGuid() - }); - propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.Aliases.Label, ValueStorageType.Date, Constants.Conventions.Member.LastLockoutDate) - { - Name = Constants.Conventions.Member.LastLockoutDateLabel, - SortOrder = 5, - Id = --identity, - Key = identity.ToGuid() - }); - propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.Aliases.Label, ValueStorageType.Date, Constants.Conventions.Member.LastLoginDate) - { - Name = Constants.Conventions.Member.LastLoginDateLabel, - SortOrder = 6, - Id = --identity, - Key = identity.ToGuid() - }); - propGroup.PropertyTypes.Add(new PropertyType(Constants.PropertyEditors.Aliases.Label, ValueStorageType.Date, Constants.Conventions.Member.LastPasswordChangeDate) - { - Name = Constants.Conventions.Member.LastPasswordChangeDateLabel, - SortOrder = 7, - Id = --identity, - Key = identity.ToGuid() - }); - - memType.PropertyGroups.Add(propGroup); - - // should we "create member"? - var member = new Member(name, email, username, password, memType); - - //we've assigned ids to the property types and groups but we also need to assign fake ids to the properties themselves. - foreach (var property in member.Properties) - { - property.Id = --identity; - } - - return member; - } - /// /// Exports a member. /// diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index b870a6a54e..4d3bf9ebc0 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -735,7 +735,6 @@ - diff --git a/src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs b/src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs index 7005bab984..1dc261714c 100644 --- a/src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs +++ b/src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs @@ -17,28 +17,6 @@ namespace Umbraco.Tests.Membership [UmbracoTest(WithApplication = true)] public class MembershipProviderBaseTests : UmbracoTestBase { - [Test] - public void Change_Password_Without_AllowManuallyChangingPassword_And_No_Pass_Validation() - { - var providerMock = new Mock(TestHelper.GetHostingEnvironment()) { CallBase = true }; - providerMock.Setup(@base => @base.AllowManuallyChangingPassword).Returns(false); - var provider = providerMock.Object; - - Assert.Throws(() => provider.ChangePassword("test", "", "test")); - } - - [Test] - public void Change_Password_With_AllowManuallyChangingPassword_And_Invalid_Creds() - { - var providerMock = new Mock(TestHelper.GetHostingEnvironment()) { CallBase = true }; - providerMock.Setup(@base => @base.AllowManuallyChangingPassword).Returns(false); - providerMock.Setup(@base => @base.ValidateUser("test", "test")).Returns(false); - var provider = providerMock.Object; - - Assert.IsFalse(provider.ChangePassword("test", "test", "test")); - - } - [Test] public void ChangePasswordQuestionAndAnswer_Without_RequiresQuestionAndAnswer() { @@ -49,18 +27,6 @@ namespace Umbraco.Tests.Membership Assert.Throws(() => provider.ChangePasswordQuestionAndAnswer("test", "test", "test", "test")); } - [Test] - public void ChangePasswordQuestionAndAnswer_Without_AllowManuallyChangingPassword_And_Invalid_Creds() - { - var providerMock = new Mock(TestHelper.GetHostingEnvironment()) { CallBase = true }; - providerMock.Setup(@base => @base.RequiresQuestionAndAnswer).Returns(true); - providerMock.Setup(@base => @base.AllowManuallyChangingPassword).Returns(false); - providerMock.Setup(@base => @base.ValidateUser("test", "test")).Returns(false); - var provider = providerMock.Object; - - Assert.IsFalse(provider.ChangePasswordQuestionAndAnswer("test", "test", "test", "test")); - } - [Test] public void CreateUser_Not_Whitespace() { diff --git a/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs b/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs index 3759bc50aa..85f57e3103 100644 --- a/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs +++ b/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs @@ -106,7 +106,7 @@ namespace Umbraco.Tests.Membership Assert.AreNotEqual("test", createdMember.RawPasswordValue); string salt; - var storedPassword = provider.PasswordSecurity.StoredPassword(createdMember.RawPasswordValue, out salt); + var storedPassword = provider.PasswordSecurity.ParseStoredHashPassword(createdMember.RawPasswordValue, out salt); var hashedPassword = provider.PasswordSecurity.HashPassword("testtest$1", salt); Assert.AreEqual(hashedPassword, storedPassword); } diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs index 63506b0004..06c4b5be6d 100644 --- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs +++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs @@ -148,7 +148,7 @@ namespace Umbraco.Tests.Routing var handler = new RenderRouteHandler(umbracoContext, new TestControllerFactory(umbracoContextAccessor, Mock.Of(), context => { var membershipHelper = new MembershipHelper( - umbracoContext.HttpContext, Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), AppCaches.Disabled, Mock.Of()); + umbracoContext.HttpContext, Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), AppCaches.Disabled, Mock.Of()); return new CustomDocumentController(Factory.GetInstance(), umbracoContextAccessor, Factory.GetInstance(), diff --git a/src/Umbraco.Tests/Security/PasswordSecurityTests.cs b/src/Umbraco.Tests/Security/PasswordSecurityTests.cs index 6c4d700f74..9ed130a62b 100644 --- a/src/Umbraco.Tests/Security/PasswordSecurityTests.cs +++ b/src/Umbraco.Tests/Security/PasswordSecurityTests.cs @@ -40,7 +40,7 @@ namespace Umbraco.Tests.Security var hashed = passwordSecurity.HashNewPassword(pass, out salt); var storedPassword = passwordSecurity.FormatPasswordForStorage(hashed, salt); - var result = passwordSecurity.CheckPassword("ThisIsAHashedPassword", storedPassword); + var result = passwordSecurity.VerifyPassword("ThisIsAHashedPassword", storedPassword); Assert.IsTrue(result); } @@ -55,7 +55,7 @@ namespace Umbraco.Tests.Security var hashed = passwordSecurity.HashNewPassword(pass, out salt); var storedPassword = passwordSecurity.FormatPasswordForStorage(hashed, salt); - var result = passwordSecurity.CheckPassword("ThisIsAHashedPassword", storedPassword); + var result = passwordSecurity.VerifyPassword("ThisIsAHashedPassword", storedPassword); Assert.IsTrue(result); } @@ -82,7 +82,7 @@ namespace Umbraco.Tests.Security var stored = salt + "ThisIsAHashedPassword"; string initSalt; - var result = passwordSecurity.StoredPassword(stored, out initSalt); + var result = passwordSecurity.ParseStoredHashPassword(stored, out initSalt); Assert.AreEqual("ThisIsAHashedPassword", result); } diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs index 3dc3cefeef..1b48e83ab9 100644 --- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs +++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs @@ -151,7 +151,7 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting urlHelper.Setup(provider => provider.GetUrl(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) .Returns(UrlInfo.Url("/hello/world/1234")); - var membershipHelper = new MembershipHelper(umbCtx.HttpContext, Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), AppCaches.Disabled, Mock.Of()); + var membershipHelper = new MembershipHelper(umbCtx.HttpContext, Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), AppCaches.Disabled, Mock.Of()); var umbHelper = new UmbracoHelper(Mock.Of(), Mock.Of(), diff --git a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs index 8171bbb175..1b1d3172d3 100644 --- a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs +++ b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs @@ -71,7 +71,7 @@ namespace Umbraco.Tests.Testing.TestingTests Mock.Of(), Mock.Of(), Mock.Of(), - new MembershipHelper(umbracoContext.HttpContext, Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), AppCaches.Disabled, Mock.Of())); + new MembershipHelper(umbracoContext.HttpContext, Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), AppCaches.Disabled, Mock.Of())); Assert.Pass(); } @@ -103,7 +103,7 @@ namespace Umbraco.Tests.Testing.TestingTests var memberService = Mock.Of(); var memberTypeService = Mock.Of(); var membershipProvider = new MembersMembershipProvider(memberService, memberTypeService, Mock.Of(), TestHelper.GetHostingEnvironment(), TestHelper.GetIpResolver()); - var membershipHelper = new MembershipHelper(umbracoContext.HttpContext, Mock.Of(), membershipProvider, Mock.Of(), memberService, memberTypeService, Mock.Of(), Mock.Of(), AppCaches.Disabled, logger); + var membershipHelper = new MembershipHelper(umbracoContext.HttpContext, Mock.Of(), membershipProvider, Mock.Of(), memberService, memberTypeService, Mock.Of(), AppCaches.Disabled, logger); var umbracoHelper = new UmbracoHelper(Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), membershipHelper); var umbracoMapper = new UmbracoMapper(new MapDefinitionCollection(new[] { Mock.Of() })); diff --git a/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs index 139b559d7f..4d7815b991 100644 --- a/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs +++ b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs @@ -76,7 +76,7 @@ namespace Umbraco.Tests.Web.Controllers } IOHelper.ForceNotHosted = true; var usersController = new AuthenticationController( - new DefaultUserPasswordConfig(), + new DefaultPasswordConfig(), Factory.GetInstance(), umbracoContextAccessor, Factory.GetInstance(), diff --git a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs index c5d904fa24..0d8e9693d9 100644 --- a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs +++ b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs @@ -121,7 +121,7 @@ namespace Umbraco.Tests.Web.Mvc Mock.Of(), Mock.Of(), Mock.Of(query => query.Content(2) == content.Object), - new MembershipHelper(umbracoContext.HttpContext, Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), AppCaches.Disabled, Mock.Of())); + new MembershipHelper(umbracoContext.HttpContext, Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), Mock.Of(), AppCaches.Disabled, Mock.Of())); var ctrl = new TestSurfaceController(umbracoContextAccessor, helper); var result = ctrl.GetContent(2) as PublishedContentResult; diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js index c86b32a101..b106f35efb 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js @@ -90,7 +90,7 @@ $location.search('invite', null); }), //get the membership provider config for password policies - authResource.getPasswordConfig().then(function (data) { + authResource.getPasswordConfig(0).then(function (data) { vm.invitedUserPasswordModel.passwordPolicies = data; //localize the text diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js index 97eb2bf708..0512abe579 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js @@ -15,21 +15,14 @@ var unsubscribe = []; function resetModel(isNew) { - //the model config will contain an object, if it does not we'll create defaults - //NOTE: We will not support doing the password regex on the client side because the regex on the server side - //based on the membership provider cannot always be ported to js from .net directly. + //the model config will contain an object, if it does not we'll create defaults /* { hasPassword: true/false, - requiresQuestionAnswer: true/false, - enableReset: true/false, - enablePasswordRetrieval: true/false, minPasswordLength: 10 } */ - vm.showReset = false; - //set defaults if they are not available if (vm.config.disableToggle === undefined) { vm.config.disableToggle = false; @@ -37,20 +30,6 @@ if (vm.config.hasPassword === undefined) { vm.config.hasPassword = false; } - if (vm.config.enablePasswordRetrieval === undefined) { - vm.config.enablePasswordRetrieval = true; - } - if (vm.config.requiresQuestionAnswer === undefined) { - vm.config.requiresQuestionAnswer = false; - } - //don't enable reset if it is new - that doesn't make sense - if (isNew === "true") { - vm.config.enableReset = false; - } - else if (vm.config.enableReset === undefined) { - vm.config.enableReset = true; - } - if (vm.config.minPasswordLength === undefined) { vm.config.minPasswordLength = 0; } @@ -60,9 +39,7 @@ //if it's not an object then just create a new one vm.passwordValues = { newPassword: null, - oldPassword: null, - reset: null, - answer: null + oldPassword: null }; } else { @@ -73,8 +50,6 @@ vm.passwordValues.newPassword = null; vm.passwordValues.oldPassword = null; } - vm.passwordValues.reset = null; - vm.passwordValues.answer = null; } //the value to compare to match passwords @@ -105,11 +80,7 @@ })); unsubscribe.push($scope.$on("formSubmitting", function () { - //if there was a previously generated password displaying, clear it - if (vm.changing && vm.passwordValues) { - vm.passwordValues.generatedPassword = null; - } - else if (!vm.changing) { + if (!vm.changing) { //we are not changing, so the model needs to be null vm.passwordValues = null; } @@ -130,8 +101,6 @@ function doChange() { resetModel(); vm.changing = true; - //if there was a previously generated password displaying, clear it - vm.passwordValues.generatedPassword = null; vm.passwordValues.confirm = null; }; @@ -143,8 +112,7 @@ function showOldPass() { return vm.config.hasPassword && - !vm.config.allowManuallyChangingPassword && - !vm.config.enablePasswordRetrieval && !vm.showReset; + !vm.config.allowManuallyChangingPassword; }; // TODO: I don't think we need this or the cancel button, this can be up to the editor rendering this component diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js index a088b8fc73..cc9da4dbef 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js @@ -204,13 +204,13 @@ function authResource($q, $http, umbRequestHelper, angularHelper) { * @description * Gets the configuration of the user membership provider which is used to configure the change password form */ - getPasswordConfig: function () { - return umbRequestHelper.resourcePromise( - $http.get( - umbRequestHelper.getApiUrl( - "authenticationApiBaseUrl", - "GetPasswordConfig")), - 'Failed to retrieve membership provider config'); + getPasswordConfig: function (userId) { + return umbRequestHelper.resourcePromise( + $http.get( + umbRequestHelper.getApiUrl( + "authenticationApiBaseUrl", + "GetPasswordConfig", { userId: userId })), + 'Failed to retrieve membership provider config'); }, /** diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js index a03a71febe..a3017548a4 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js @@ -41,7 +41,7 @@ if (!model) { return null; } - var trimmed = _.omit(model, ["confirm", "generatedPassword"]); + var trimmed = _.omit(model, ["confirm"]); //ensure that the pass value is null if all child properties are null var allNull = true; @@ -304,33 +304,6 @@ } saveModel.memberGroups = selectedGroups; - //turn the dictionary into an array of pairs - var memberProviderPropAliases = _.pairs(displayModel.fieldConfig); - _.each(displayModel.tabs, function (tab) { - _.each(tab.properties, function (prop) { - var foundAlias = _.find(memberProviderPropAliases, function (item) { - return prop.alias === item[1]; - }); - if (foundAlias) { - //we know the current property matches an alias, now we need to determine which membership provider property it was for - // by looking at the key - switch (foundAlias[0]) { - case "umbracoMemberLockedOut": - saveModel.isLockedOut = Object.toBoolean(prop.value); - break; - case "umbracoMemberApproved": - saveModel.isApproved = Object.toBoolean(prop.value); - break; - case "umbracoMemberComments": - saveModel.comments = prop.value; - break; - } - } - }); - }); - - - return saveModel; }, diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js index d098d3dd7c..060ef77a5d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js @@ -87,6 +87,17 @@ angular.module("umbraco") } } }); + + //go get the config for the membership provider and add it to the model + authResource.getPasswordConfig(user.id).then(function (data) { + $scope.changePasswordModel.config = data; + //ensure the hasPassword config option is set to true (the user of course has a password already assigned) + //this will ensure the oldPassword is shown so they can change it + // disable reset password functionality beacuse it does not make sense inside the backoffice + $scope.changePasswordModel.config.hasPassword = true; + $scope.changePasswordModel.config.disableToggle = true; + }); + } }); } @@ -103,6 +114,12 @@ angular.module("umbraco") }); } + //create the initial model for change password + $scope.changePasswordModel = { + config: {}, + value: {} + }; + updateUserInfo(); //remove all event handlers @@ -113,25 +130,6 @@ angular.module("umbraco") }); - /* ---------- UPDATE PASSWORD ---------- */ - - //create the initial model for change password - $scope.changePasswordModel = { - config: {}, - value: {} - }; - - //go get the config for the membership provider and add it to the model - authResource.getPasswordConfig().then(function(data) { - $scope.changePasswordModel.config = data; - //ensure the hasPassword config option is set to true (the user of course has a password already assigned) - //this will ensure the oldPassword is shown so they can change it - // disable reset password functionality beacuse it does not make sense inside the backoffice - $scope.changePasswordModel.config.hasPassword = true; - $scope.changePasswordModel.config.disableToggle = true; - $scope.changePasswordModel.config.enableReset = false; - }); - $scope.changePassword = function() { if (formHelper.submitForm({ scope: $scope })) { @@ -143,11 +141,6 @@ angular.module("umbraco") //reset old data clearPasswordFields(); - //if the password has been reset, then update our model - if (data.value) { - $scope.changePasswordModel.value.generatedPassword = data.value; - } - formHelper.resetForm({ scope: $scope }); $scope.changePasswordButtonState = "success"; diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html index b7b8ec12c7..6ef4378106 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html @@ -1,9 +1,4 @@
-
- Password has been reset to: -
- {{vm.passwordValues.generatedPassword}} -