From 9e867eeeefddff13fa0295ecc8e2d2a711aeeb73 Mon Sep 17 00:00:00 2001
From: Emma Garland <emmagarland77@gmail.com>
Date: Fri, 12 Mar 2021 15:05:50 +0000
Subject: [PATCH] Changes as per PR comments from Scott Brady

---
 .../Security/MemberRoleStore.cs               | 36 +++----------------
 .../Controllers/ContentController.cs          |  2 +-
 .../Umbraco.Web.Common.csproj                 |  1 -
 3 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Security/MemberRoleStore.cs b/src/Umbraco.Infrastructure/Security/MemberRoleStore.cs
index 9b0618e8dd..d76f3b5c7b 100644
--- a/src/Umbraco.Infrastructure/Security/MemberRoleStore.cs
+++ b/src/Umbraco.Infrastructure/Security/MemberRoleStore.cs
@@ -69,13 +69,13 @@ namespace Umbraco.Cms.Core.Security
             try
             {
                 cancellationToken.ThrowIfCancellationRequested();
+                ThrowIfDisposed();
+
                 if (role == null)
                 {
                     throw new ArgumentNullException(nameof(role));
                 }
 
-                ThrowIfDisposed();
-
                 if (!int.TryParse(role.Id, out int roleId))
                 {
                     return Task.FromResult(IdentityResult.Failed(_intParseError));
@@ -205,36 +205,10 @@ namespace Umbraco.Cms.Core.Security
         }
 
         /// <inheritdoc />
-        public Task<string> GetNormalizedRoleNameAsync(TRole role, CancellationToken cancellationToken = default)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-            ThrowIfDisposed();
-
-            if (role == null)
-            {
-                throw new ArgumentNullException(nameof(role));
-            }
-
-            //TODO: are we utilising NormalizedRoleName?
-            return Task.FromResult(role.NormalizedName);
-        }
+        public Task<string> GetNormalizedRoleNameAsync(TRole role, CancellationToken cancellationToken = default) => GetRoleNameAsync(role, cancellationToken);
 
         /// <inheritdoc />
-        public Task SetNormalizedRoleNameAsync(TRole role, string normalizedName, CancellationToken cancellationToken = default)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-            ThrowIfDisposed();
-
-            if (role == null)
-            {
-                throw new ArgumentNullException(nameof(role));
-            }
-
-            //TODO: are we utilising NormalizedRoleName and do we need to set it in the memberGroupService?
-            role.NormalizedName = normalizedName;
-
-            return Task.CompletedTask;
-        }
+        public Task SetNormalizedRoleNameAsync(TRole role, string normalizedName, CancellationToken cancellationToken = default) => SetRoleNameAsync(role, normalizedName, cancellationToken);
 
         /// <inheritdoc />
         public Task<TRole> FindByIdAsync(string roleId, CancellationToken cancellationToken = default)
@@ -280,8 +254,6 @@ namespace Umbraco.Cms.Core.Security
                 throw new ArgumentNullException(nameof(name));
             }
             IMemberGroup memberGroup = _memberGroupService.GetByName(name);
-            //TODO: throw exception when not found?
-
             return Task.FromResult(memberGroup == null ? null : MapFromMemberGroup(memberGroup));
         }
 
diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
index 00f2fff56c..c4c601593f 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
@@ -2435,7 +2435,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
                 .Select(_umbracoMapper.Map<MemberDisplay>)
                 .ToArray();
 
-            //TODO: change to role store
+            //TODO: change to role manager
             var allGroups = _memberGroupService.GetAll().ToArray();
             var groups = entry.Rules
                 .Where(rule => rule.RuleType == Constants.Conventions.PublicAccess.MemberRoleRuleType)
diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
index 0fe68d4cc9..738a9389dc 100644
--- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
+++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
@@ -24,7 +24,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.AspNet.Identity.Core" Version="2.2.3" />
       <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.2" />
       <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.2" />
       <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.3" />