From 8535a2915c05a4b4ab084e3d23a85ee16ff1422c Mon Sep 17 00:00:00 2001 From: Emma Garland Date: Fri, 12 Mar 2021 15:21:56 +0000 Subject: [PATCH] Changed wording, PR feedback --- .../Mapping/MemberTabsAndPropertiesMapper.cs | 2 +- .../Security/MemberUserStore.cs | 25 +------------------ 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs b/src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs index 9ac1b05d0f..02ee4fe744 100644 --- a/src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs +++ b/src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs @@ -237,7 +237,7 @@ namespace Umbraco.Cms.Core.Models.Mapping var userRoles = username.IsNullOrWhiteSpace() ? null : _memberService.GetAllRoles(username); // create a dictionary of all roles (except internal roles) + "false" - //TODO: use MembersRoleStore + //TODO: use member role manager instead var result = _memberGroupService.GetAll() .Select(x => x.Name) // if a role starts with __umbracoRole we won't show it as it's an internal role used for public access diff --git a/src/Umbraco.Infrastructure/Security/MemberUserStore.cs b/src/Umbraco.Infrastructure/Security/MemberUserStore.cs index 233f053333..6be981b3d1 100644 --- a/src/Umbraco.Infrastructure/Security/MemberUserStore.cs +++ b/src/Umbraco.Infrastructure/Security/MemberUserStore.cs @@ -53,30 +53,7 @@ namespace Umbraco.Cms.Core.Security public override Task GetNormalizedUserNameAsync(MemberIdentityUser user, CancellationToken cancellationToken = default) => GetUserNameAsync(user, cancellationToken); /// - public override Task SetNormalizedUserNameAsync(MemberIdentityUser user, string normalizedName, - CancellationToken cancellationToken = default) - { - try - { - cancellationToken.ThrowIfCancellationRequested(); - ThrowIfDisposed(); - if (user == null) - { - throw new ArgumentNullException(nameof(user)); - } - - if (normalizedName == null) - { - throw new ArgumentNullException(nameof(normalizedName)); - } - - return SetUserNameAsync(user, normalizedName, cancellationToken); - } - catch (Exception ex) - { - return Task.FromResult(IdentityResult.Failed(new IdentityError { Code = genericIdentityErrorCode, Description = ex.Message })); - } - } + public override Task SetNormalizedUserNameAsync(MemberIdentityUser user, string normalizedName, CancellationToken cancellationToken = default) => SetUserNameAsync(user, normalizedName, cancellationToken); /// public override Task CreateAsync(MemberIdentityUser user, CancellationToken cancellationToken = default)