diff --git a/src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs b/src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs index 947d76413e..dd7d8d9277 100644 --- a/src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs @@ -25,7 +25,7 @@ namespace Umbraco.Core.Persistence.Factories CreateDate = dto.CreateDate, UpdateDate = dto.UpdateDate, Name = dto.Text, - ProviderUserKey = dto.UniqueId.Value, + ProviderUserKey = dto.NodeId, Trashed = dto.Trashed, Key = dto.UniqueId.Value, CreatorId = dto.UserId.HasValue ? dto.UserId.Value : 0, diff --git a/src/Umbraco.Core/Services/MemberService.cs b/src/Umbraco.Core/Services/MemberService.cs index 9d6fdef060..6b6be67548 100644 --- a/src/Umbraco.Core/Services/MemberService.cs +++ b/src/Umbraco.Core/Services/MemberService.cs @@ -625,7 +625,7 @@ namespace Umbraco.Core.Services throw new ArgumentException(string.Format("No MemberType matching the passed in Alias: '{0}' was found", memberTypeAlias)); } - return CreateMemberWithIdentity(email, username, password, memberType, raiseEvents); + return CreateMemberWithIdentity(username, email, password, memberType, raiseEvents); } /// diff --git a/src/Umbraco.Web/Models/LoginStatusModel.cs b/src/Umbraco.Web/Models/LoginStatusModel.cs index 9be7602541..7c1dd8b359 100644 --- a/src/Umbraco.Web/Models/LoginStatusModel.cs +++ b/src/Umbraco.Web/Models/LoginStatusModel.cs @@ -1,4 +1,6 @@ -using umbraco.cms.businesslogic.member; +using System.Web; +using umbraco.cms.businesslogic.member; +using Umbraco.Core; namespace Umbraco.Web.Models { @@ -6,17 +8,19 @@ namespace Umbraco.Web.Models { public LoginStatusModel() { - //TODO Use new Member API - if (Member.IsLoggedOn()) + if (HttpContext.Current != null + && HttpContext.Current.User != null + && HttpContext.Current.User.Identity.IsAuthenticated) { - var member = Member.GetCurrentMember(); + var member = ApplicationContext.Current.Services.MemberService.GetByUsername( + HttpContext.Current.User.Identity.Name); if (member != null) { - this.Name = member.Text; - this.Username = member.LoginName; + this.Name = member.Name; + this.Username = member.Username; this.Email = member.Email; this.IsLoggedIn = true; - } + } } }