diff --git a/src/Umbraco.Web/Models/ProfileModel.cs b/src/Umbraco.Web/Models/ProfileModel.cs index 7d47b24919..7ce1593c4b 100644 --- a/src/Umbraco.Web/Models/ProfileModel.cs +++ b/src/Umbraco.Web/Models/ProfileModel.cs @@ -52,6 +52,36 @@ namespace Umbraco.Web.Models [Obsolete("This is not used and will be removed from the codebase in future versions")] public string MemberTypeAlias { get; set; } + [ReadOnly(true)] + public string UserName { get; set; } + + [ReadOnly(true)] + public string PasswordQuestion { get; set; } + + [ReadOnly(true)] + public string Comment { get; set; } + + [ReadOnly(true)] + public bool IsApproved { get; set; } + + [ReadOnly(true)] + public bool IsLockedOut { get; set; } + + [ReadOnly(true)] + public DateTime LastLockoutDate { get; set; } + + [ReadOnly(true)] + public DateTime CreationDate { get; set; } + + [ReadOnly(true)] + public DateTime LastLoginDate { get; set; } + + [ReadOnly(true)] + public DateTime LastActivityDate { get; set; } + + [ReadOnly(true)] + public DateTime LastPasswordChangedDate { get; set; } + /// /// The list of member properties /// diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs index 11523cf561..fa00cb4105 100644 --- a/src/Umbraco.Web/Security/MembershipHelper.cs +++ b/src/Umbraco.Web/Security/MembershipHelper.cs @@ -204,13 +204,25 @@ namespace Umbraco.Web.Security if (Membership.Provider.IsUmbracoMembershipProvider()) { + var membershipUser = Membership.GetUser(); var member = GetCurrentMember(); //this shouldn't happen if (member == null) return null; var model = ProfileModel.CreateModel(); model.Name = member.Name; - model.Email = member.Email; + + model.Email = membershipUser.Email; + model.UserName = membershipUser.UserName; + model.PasswordQuestion = membershipUser.PasswordQuestion; + model.Comment = membershipUser.Comment; + model.IsApproved = membershipUser.IsApproved; + model.IsLockedOut = membershipUser.IsLockedOut; + model.LastLockoutDate = membershipUser.LastLockoutDate; + model.CreationDate = membershipUser.CreationDate; + model.LastLoginDate = membershipUser.LastLoginDate; + model.LastActivityDate = membershipUser.LastActivityDate; + model.LastPasswordChangedDate = membershipUser.LastPasswordChangedDate; var memberType = member.ContentType;