From f0f17b3cf83774f51bd6403d1be10835dcb2ba57 Mon Sep 17 00:00:00 2001 From: Emma Garland Date: Tue, 1 Dec 2020 19:06:36 +0000 Subject: [PATCH] Stop duplicate saving --- .../Members/UmbracoMembersUserStore.cs | 1 + src/Umbraco.Web.BackOffice/Controllers/MemberController.cs | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Infrastructure/Members/UmbracoMembersUserStore.cs b/src/Umbraco.Infrastructure/Members/UmbracoMembersUserStore.cs index 482d154a2e..fcefd4b751 100644 --- a/src/Umbraco.Infrastructure/Members/UmbracoMembersUserStore.cs +++ b/src/Umbraco.Infrastructure/Members/UmbracoMembersUserStore.cs @@ -65,6 +65,7 @@ namespace Umbraco.Infrastructure.Members memberUser.Name.IsNullOrWhiteSpace() ? memberUser.UserName : memberUser.Name, memberUser.MemberTypeAlias.IsNullOrWhiteSpace() ? Constants.Security.DefaultMemberTypeAlias : memberUser.MemberTypeAlias); + //IMember member = new Member(memberUser.Name, memberUser.Email.ToLower().Trim(), memberUser.UserName, null); bool anythingChanged = UpdateMemberProperties(memberEntity, memberUser); diff --git a/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs b/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs index 3d7bd5288a..971716a239 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs @@ -261,8 +261,8 @@ namespace Umbraco.Web.BackOffice.Controllers //TODO: There's 3 things saved here and we should do this all in one transaction, which we can do here by wrapping in a scope // but it would be nicer to have this taken care of within the Save method itself - //create/save the IMember - _memberService.Save(contentItem.PersistedContent); + //TODO: create/save the IMember: this is now saved in CreateAsync, remove once logic is clarified + //_memberService.Save(contentItem.PersistedContent); //Now let's do the role provider stuff - now that we've saved the content item (that is important since // if we are changing the username, it must be persisted before looking up the member roles). @@ -395,9 +395,6 @@ namespace Umbraco.Web.BackOffice.Controllers //map the save info over onto the user member = _umbracoMapper.Map(memberSave, member); - - _memberService.Save(member); - return member; }