From 17df4eb607e3bf0996e8280c91a0d9978e96ca13 Mon Sep 17 00:00:00 2001
From: emmagarland <emmagarland77@gmail.com>
Date: Mon, 30 Nov 2020 01:07:02 +0000
Subject: [PATCH] Members mapping definition updated, and commented out
 duplicate password work

---
 .../Models/Mapping/MemberMapDefinition.cs     | 30 +++++++++++++++++++
 .../CoreMappingProfiles.cs                    |  1 +
 .../Controllers/MemberController.cs           | 16 +++++-----
 3 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 src/Umbraco.Core/Models/Mapping/MemberMapDefinition.cs

diff --git a/src/Umbraco.Core/Models/Mapping/MemberMapDefinition.cs b/src/Umbraco.Core/Models/Mapping/MemberMapDefinition.cs
new file mode 100644
index 0000000000..dad995bdac
--- /dev/null
+++ b/src/Umbraco.Core/Models/Mapping/MemberMapDefinition.cs
@@ -0,0 +1,30 @@
+using Umbraco.Core.Mapping;
+using Umbraco.Core.Models;
+using Umbraco.Web.Models.ContentEditing;
+
+namespace Umbraco.Web.Models.Mapping
+{
+    public class MemberMapDefinition : IMapDefinition
+    {
+        public MemberMapDefinition()
+        {
+        }
+
+        public void DefineMaps(UmbracoMapper mapper)
+        {
+            mapper.Define<MemberSave, IMember>(Map);
+        }
+
+        // mappers
+        private static void Map(MemberSave source, IMember target, MapperContext context)
+        {
+            target.IsApproved = source.IsApproved;
+            target.Name = source.Name;
+            target.Email = source.Email;
+            target.Key = source.Key;
+            target.Username = source.Username;
+            target.Id = (int)(long)source.Id;
+            //TODO: map more properties as required
+        }
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/CoreMappingProfiles.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/CoreMappingProfiles.cs
index 823f8618ad..e35b936199 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/CoreMappingProfiles.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/CoreMappingProfiles.cs
@@ -33,6 +33,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
                 .Add<TagMapDefinition>()
                 .Add<TemplateMapDefinition>()
                 .Add<UserMapDefinition>()
+                .Add<MemberMapDefinition>()
                 .Add<LanguageMapDefinition>()
                 .Add<IdentityMapDefinition>()
                ;
diff --git a/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs b/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
index 92ff630023..dc7c2ce39c 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
@@ -356,16 +356,16 @@ namespace Umbraco.Web.BackOffice.Controllers
                 throw HttpResponseException.CreateNotificationValidationErrorResponse(created.Errors.ToErrorMessage());
             }
 
-            string resetPassword;
-            string password = _memberManager.GeneratePassword();
+            //string resetPassword;
+            //string password = _memberManager.GeneratePassword();
 
-            IdentityResult result = await _memberManager.AddPasswordAsync(identityMember, password);
-            if (result.Succeeded == false)
-            {
-                throw HttpResponseException.CreateNotificationValidationErrorResponse(created.Errors.ToErrorMessage());
-            }
+            //IdentityResult result = await _memberManager.AddPasswordAsync(identityMember, password);
+            //if (result.Succeeded == false)
+            //{
+            //    throw HttpResponseException.CreateNotificationValidationErrorResponse(created.Errors.ToErrorMessage());
+            //}
 
-            resetPassword = password;
+            //resetPassword = password;
 
             //now re-look the member back up which will now exist
             IMember member = _memberService.GetByEmail(memberSave.Email);