Working on caching and tokens

src/OrchardCore.Modules/OrchardCore.Roles/Services/RoleStore.cs

@@ -10,7 +10,6 @@
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using OrchardCore.Environment.Cache;
-using OrchardCore.Environment.Shell.Scope;
 using OrchardCore.Modules;
 using OrchardCore.Roles.Models;
 using OrchardCore.Security;

src/OrchardCore.Modules/OrchardCore.Users/Commands/UserCommands.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Localization;
@@ -39,7 +40,7 @@ public async Task CreateUserAsync()
 
             var valid = true;
 
-            await _userService.CreateUserAsync(new User { UserName = UserName, Email = Email, RoleNames = roleNames, EmailConfirmed = true }, Password, (key, message) =>
+            await _userService.CreateUserAsync(new User { UserName = UserName, Email = Email, RoleNames = roleNames.ToImmutableArray(), EmailConfirmed = true }, Password, (key, message) =>
             {
                 valid = false;
                 Context.Output.WriteLine(message);

src/OrchardCore.Modules/OrchardCore.Users/Services/SetupEventHandler.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Immutable;
 using System.Threading.Tasks;
 using OrchardCore.Setup.Events;
 using OrchardCore.Users.Models;
@@ -33,7 +34,7 @@ Action<string, string> reportError
             {
                 UserName = userName,
                 Email = email,
-                RoleNames = new string[] { "Administrator" },
+                RoleNames = ImmutableArray.Create("Administrator"),
                 EmailConfirmed = true
             };
 

src/OrchardCore/OrchardCore.Users.Core/Models/User.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Immutable;
 using Microsoft.AspNetCore.Identity;
 using OrchardCore.Entities;
 
@@ -15,12 +15,12 @@ public class User : Entity, IUser
         public string SecurityStamp { get; set; }
         public bool EmailConfirmed { get; set; }
         public string ResetToken { get; set; }
-        public IList<string> RoleNames { get; set; } = new List<string>();
-        public IList<UserClaim> UserClaims { get; set; } = new List<UserClaim>();
-        public IList<UserLoginInfo> LoginInfos { get; set; } = new List<UserLoginInfo>();
+        public ImmutableArray<string> RoleNames { get; set; } = ImmutableArray<string>.Empty;
+        public ImmutableArray<UserClaim> UserClaims { get; set; } = ImmutableArray<UserClaim>.Empty;
+        public ImmutableArray<UserLoginInfo> LoginInfos { get; set; } = ImmutableArray<UserLoginInfo>.Empty;
 
         public override string ToString()
-        {            
+        {
             return UserName;
         }
     }

src/OrchardCore/OrchardCore.Users.Core/Services/UserStore.cs

@@ -329,7 +329,7 @@ public async Task AddToRoleAsync(IUser user, string normalizedRoleName, Cancella
                 throw new InvalidOperationException($"Role {normalizedRoleName} does not exist.");
             }
 
-            ((User)user).RoleNames.Add(roleName);
+            ((User)user).RoleNames = ((User)user).RoleNames.Add(roleName);
         }
 
         public async Task RemoveFromRoleAsync(IUser user, string normalizedRoleName, CancellationToken cancellationToken)
@@ -347,7 +347,7 @@ public async Task RemoveFromRoleAsync(IUser user, string normalizedRoleName, Can
                 throw new InvalidOperationException($"Role {normalizedRoleName} does not exist.");
             }
 
-            ((User)user).RoleNames.Remove(roleName);
+            ((User)user).RoleNames = ((User)user).RoleNames.Remove(roleName);
         }
 
         public Task<IList<string>> GetRolesAsync(IUser user, CancellationToken cancellationToken)
@@ -401,9 +401,11 @@ public Task AddLoginAsync(IUser user, UserLoginInfo login, CancellationToken can
             }
 
             if (((User)user).LoginInfos.Any(i => i.LoginProvider == login.LoginProvider))
+            {
                 throw new InvalidOperationException($"Provider {login.LoginProvider} is already linked for {user.UserName}");
+            }
 
-            ((User)user).LoginInfos.Add(login);
+            ((User)user).LoginInfos = ((User)user).LoginInfos.Add(login);
 
             return Task.CompletedTask;
         }
@@ -430,15 +432,12 @@ public Task RemoveLoginAsync(IUser user, string loginProvider, string providerKe
                 throw new ArgumentNullException(nameof(user));
             }
 
-            var externalLogins = ((User)user).LoginInfos;
-            if (externalLogins != null)
+            var item = ((User)user).LoginInfos.FirstOrDefault(c => c.LoginProvider == loginProvider && c.ProviderKey == providerKey);
+            if (item != null)
             {
-                var item = externalLogins.FirstOrDefault(c => c.LoginProvider == loginProvider && c.ProviderKey == providerKey);
-                if (item != null)
-                {
-                    externalLogins.Remove(item);
-                }
+                ((User)user).LoginInfos = ((User)user).LoginInfos.Remove(item);
             }
+
             return Task.CompletedTask;
         }
 
@@ -458,13 +457,18 @@ public Task<IList<Claim>> GetClaimsAsync(IUser user, CancellationToken cancellat
         public Task AddClaimsAsync(IUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken)
         {
             if (user == null)
+            {
                 throw new ArgumentNullException(nameof(user));
+            }
+
             if (claims == null)
+            {
                 throw new ArgumentNullException(nameof(claims));
+            }
 
             foreach (var claim in claims)
             {
-                ((User)user).UserClaims.Add(new UserClaim{ClaimType = claim.Type, ClaimValue = claim.Value});
+                ((User)user).UserClaims = ((User)user).UserClaims.Add(new UserClaim { ClaimType = claim.Type, ClaimValue = claim.Value });
             }
 
             return Task.CompletedTask;
@@ -473,16 +477,24 @@ public Task AddClaimsAsync(IUser user, IEnumerable<Claim> claims, CancellationTo
         public Task ReplaceClaimAsync(IUser user, Claim claim, Claim newClaim, CancellationToken cancellationToken)
         {
             if (user == null)
+            {
                 throw new ArgumentNullException(nameof(user));
+            }
+
             if (claim == null)
+            {
                 throw new ArgumentNullException(nameof(claim));
+            }
+
             if (newClaim == null)
+            {
+
                 throw new ArgumentNullException(nameof(newClaim));
+            }
 
-            foreach (var userClaim in ((User) user).UserClaims.Where(uc => uc.ClaimValue == claim.Value && uc.ClaimType == claim.Type))
+            foreach (var userClaim in ((User)user).UserClaims.Where(uc => uc.ClaimValue == claim.Value && uc.ClaimType == claim.Type))
             {
-                userClaim.ClaimValue = newClaim.Value;
-                userClaim.ClaimType = newClaim.Type;
+                ((User)user).UserClaims = ((User)user).UserClaims.Replace(userClaim, new UserClaim { ClaimType = newClaim.Type, ClaimValue = newClaim.Value });
             }
 
             return Task.CompletedTask;
@@ -491,14 +503,21 @@ public Task ReplaceClaimAsync(IUser user, Claim claim, Claim newClaim, Cancellat
         public Task RemoveClaimsAsync(IUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken)
         {
             if (user == null)
+            {
                 throw new ArgumentNullException(nameof(user));
+            }
+
             if (claims == null)
+            {
                 throw new ArgumentNullException(nameof(claims));
+            }
 
             foreach (var claim in claims)
             {
                 foreach (var userClaim in ((User)user).UserClaims.Where(uc => uc.ClaimValue == claim.Value && uc.ClaimType == claim.Type).ToList())
-                    ((User)user).UserClaims.Remove(userClaim);
+                {
+                    ((User)user).UserClaims = ((User)user).UserClaims.Remove(userClaim);
+                }
             }
 
             return Task.CompletedTask;
@@ -507,8 +526,10 @@ public Task RemoveClaimsAsync(IUser user, IEnumerable<Claim> claims, Cancellatio
         public async Task<IList<IUser>> GetUsersForClaimAsync(Claim claim, CancellationToken cancellationToken)
         {
             if (claim == null)
+            {
                 throw new ArgumentNullException(nameof(claim));
-
+            }
+
             var users = await _session.Query<User, UserByClaimIndex>(uc => uc.ClaimType == claim.Type && uc.ClaimValue == claim.Value).ListAsync();
 
             return users.Cast<IUser>().ToList();