Use custom user validator in Identity module

Author: maliming

modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreModule.cs

@@ -48,6 +48,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
 
     public override void PostConfigureServices(ServiceConfigurationContext context)
     {
+        // Replace the default UserValidator with AbpIdentityUserValidator
         context.Services.RemoveAll(x => x.ServiceType == typeof(IUserValidator<IdentityUser>) && x.ImplementationType == typeof(UserValidator<IdentityUser>));
         context.Services.AddAbpOptions<SecurityStampValidatorOptions>()
             .Configure<IServiceProvider>((securityStampValidatorOptions, serviceProvider) =>

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

@@ -35,7 +35,7 @@ public AbpIdentityUserValidator(
             CurrentTenant = currentTenant;
             TenantFilter = tenantFilter;
             UserRepository = userRepository;
-            DefaultUserValidator = new UserValidator<IdentityUser>();
+            DefaultUserValidator = new UserValidator<IdentityUser>(ErrorDescriber);
         }
 
         public virtual async Task<IdentityResult> ValidateAsync(UserManager<IdentityUser> manager, IdentityUser user)
@@ -121,7 +121,7 @@ protected virtual async Task<IdentityResult> ValidateSharedUserAsync(UserManager
                     if (users.Any())
                     {
                         var userNames = users.Select(u => u.UserName).ToList();
-                        errors.Add(userNames.Contains(user.UserName) ? ErrorDescriber.DuplicateUserName(user.UserName!) : ErrorDescriber.DuplicateEmail(user.Email!));
+                        errors.Add(userNames.Contains(user.UserName) ? ErrorDescriber.InvalidUserName(user.UserName!) : ErrorDescriber.InvalidEmail(user.Email!));
                     }
 
                     users = await UserRepository.GetUsersByNormalizedEmailsAsync([normalizedUserName!, normalizedEmail], true);
@@ -133,7 +133,7 @@ protected virtual async Task<IdentityResult> ValidateSharedUserAsync(UserManager
                     if (users.Any())
                     {
                         var emails = users.Select(u => u.Email).ToList();
-                        errors.Add(emails.Contains(user.Email) ? ErrorDescriber.DuplicateEmail(user.Email!) : ErrorDescriber.DuplicateUserName(user.UserName!));
+                        errors.Add(emails.Contains(user.Email) ? ErrorDescriber.InvalidEmail(user.Email!) : ErrorDescriber.InvalidUserName(user.UserName!));
                     }
                 }
             }
@@ -146,7 +146,7 @@ public virtual async Task<IdentityResult> BuiltInValidateAsync(UserManager<Ident
             var errors = await ValidateUserName(manager, user);
             if (manager.Options.User.RequireUniqueEmail)
             {
-                errors = await ValidateEmail(manager, user);
+                errors.AddRange(await ValidateEmail(manager, user));
             }
             return errors?.Count > 0 ? IdentityResult.Failed(errors.ToArray()) : IdentityResult.Success;
         }

modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo/Abp/Identity/AspNetCore/AbpIdentityUserValidator_Tests.cs

@@ -1,9 +1,12 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Localization;
 using Shouldly;
 using Volo.Abp.Identity.Localization;
+using Volo.Abp.MultiTenancy;
 using Xunit;
 
 namespace Volo.Abp.Identity.AspNetCore;
@@ -60,3 +63,15 @@ public async Task Can_Not_Use_Another_Users_Name_As_Your_Email_Test()
         identityResult.Errors.First().Description.ShouldBe(Localizer["Volo.Abp.Identity:InvalidEmail", "user1@volosoft.com"]);
     }
 }
+
+public class SharedTenantUserSharingStrategy_AbpIdentityUserValidator_Tests : AbpIdentityUserValidator_Tests
+{
+    protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services)
+    {
+        services.Configure<AbpMultiTenancyOptions>(options =>
+        {
+            options.IsEnabled = true;
+            options.UserSharingStrategy = TenantUserSharingStrategy.Shared;
+        });
+    }
+}