Add SharedKey property and update related methods for user sharing functionality

Author: maliming

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityUserConsts.cs

@@ -37,4 +37,9 @@ public static class IdentityUserConsts
     /// Default value: 16
     /// </summary>
     public static int MaxLoginProviderLength { get; set; } = 16;
+
+    /// <summary>
+    /// Default value: 256
+    /// </summary>
+    public static int MaxSharedKeyLength { get; set; } = 256;
 }

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs

@@ -167,7 +167,7 @@ Task<IdentityUser> FindByPasskeyIdAsync(
         CancellationToken cancellationToken = default);
 
     Task<List<IdentityUser>> GetSharingUsersAsync(
-        [NotNull] string normalizedEmail,
+        [NotNull] string sharedKey,
         bool includeDetails = false,
         CancellationToken cancellationToken = default
     );

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs

@@ -137,6 +137,11 @@ public class IdentityUser : FullAuditedAggregateRoot<Guid>, IUser, IHasEntityVer
     /// </summary>
     public virtual bool IsShared { get; protected set; }
 
+    /// <summary>
+    /// Gets or sets the shared key for this user.
+    /// </summary>
+    public virtual string SharedKey { get; protected set; }
+
     //TODO: Can we make collections readonly collection, which will provide encapsulation. But... can work for all ORMs?
 
     /// <summary>
@@ -450,6 +455,11 @@ public virtual void SethIsShared(bool isShared)
         IsShared = isShared;
     }
 
+    public virtual void SetSharedKey(string sharedKey)
+    {
+        SharedKey = sharedKey;
+    }
+
     public override string ToString()
     {
         return $"{base.ToString()}, UserName = {UserName}";

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs

@@ -116,7 +116,7 @@ protected async override Task<IdentityResult> UpdateUserAsync(IdentityUser user)
     /// <returns>A <see cref="IdentityResult"/> representing whether validation was successful.</returns>
     public virtual async Task<IdentityResult> CallValidateUserAsync(IdentityUser user)
     {
-        return await base.ValidateUserAsync(user);
+        return await ValidateUserAsync(user);
     }
 
     /// <summary>
@@ -129,7 +129,20 @@ public virtual async Task<IdentityResult> CallValidateUserAsync(IdentityUser use
     /// <returns>A <see cref="IdentityResult"/> representing whether validation was successful.</returns>
     public virtual async Task<IdentityResult> CallValidatePasswordAsync(IdentityUser user, string password)
     {
-        return await base.ValidatePasswordAsync(user, password);
+        return await ValidatePasswordAsync(user, password);
+    }
+
+    /// <summary>
+    /// This is to call the protection method UpdatePasswordHash
+    /// Updates a user's password hash.
+    /// </summary>
+    /// <param name="user">The user.</param>
+    /// <param name="newPassword">The new password.</param>
+    /// <param name="validatePassword">Whether to validate the password.</param>
+    /// <returns>Whether the password has was successfully updated.</returns>
+    public virtual async Task<IdentityResult> CallUpdatePasswordHash(IdentityUser user, string newPassword, bool validatePassword)
+    {
+        return await UpdatePasswordHash(user, newPassword, validatePassword);
     }
 
     public virtual async Task<IdentityUser> GetByIdAsync(Guid id)

modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs

@@ -455,12 +455,11 @@ public virtual async Task UpdateOrganizationAsync(Guid sourceOrganizationId, Gui
         }
     }
 
-    public virtual async Task<List<IdentityUser>> GetSharingUsersAsync(string normalizedEmail, bool includeDetails = false, CancellationToken cancellationToken = default)
+    public virtual async Task<List<IdentityUser>> GetSharingUsersAsync(string sharedKey, bool includeDetails = false, CancellationToken cancellationToken = default)
     {
         return await (await GetDbSetAsync())
             .IncludeDetails(includeDetails)
-            .Where(x => x.IsShared)
-            .Where(x => x.NormalizedEmail == normalizedEmail)
+            .Where(x => x.SharedKey == sharedKey)
             .ToListAsync(GetCancellationToken(cancellationToken));
     }
 

modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs

@@ -33,6 +33,10 @@ public static void ConfigureIdentity([NotNull] this ModelBuilder builder)
                 .HasColumnName(nameof(IdentityUser.TwoFactorEnabled));
             b.Property(u => u.LockoutEnabled).HasDefaultValue(false)
                 .HasColumnName(nameof(IdentityUser.LockoutEnabled));
+            b.Property(u => u.IsShared).HasDefaultValue(false)
+                .HasColumnName(nameof(IdentityUser.IsShared));
+            b.Property(u => u.SharedKey).HasMaxLength(IdentityUserConsts.MaxSharedKeyLength)
+                .HasColumnName(nameof(IdentityUser.SharedKey));
 
             b.Property(u => u.IsExternal).IsRequired().HasDefaultValue(false)
                 .HasColumnName(nameof(IdentityUser.IsExternal));

modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs

@@ -451,12 +451,10 @@ public virtual async Task<IdentityUser> FindByPasskeyIdAsync(byte[] credentialId
             .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
     }
 
-
-    public virtual async Task<List<IdentityUser>> GetSharingUsersAsync(string normalizedEmail, bool includeDetails = false, CancellationToken cancellationToken = default)
+    public virtual async Task<List<IdentityUser>> GetSharingUsersAsync(string sharedKey, bool includeDetails = false, CancellationToken cancellationToken = default)
     {
         return await (await GetQueryableAsync(cancellationToken))
-            .Where(x => x.IsShared)
-            .Where(u => u.NormalizedEmail == normalizedEmail)
+            .Where(u => u.SharedKey == sharedKey)
             .ToListAsync(GetCancellationToken(cancellationToken));
     }