Merge pull request #7718 from abpframework/maliming/IdentityDataSeeder

Ignore password validation in IdentityDataSeeder.

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

@@ -53,57 +53,54 @@ namespace Volo.Abp.Identity
             {
                 await IdentityOptions.SetAsync();
 
-                using (IdentityOptions.Value.Password.ClearRequirements())
+                var result = new IdentityDataSeedResult();
+                //"admin" user
+                const string adminUserName = "admin";
+                var adminUser = await UserRepository.FindByNormalizedUserNameAsync(
+                    LookupNormalizer.NormalizeName(adminUserName)
+                );
+
+                if (adminUser != null)
                 {
-                    var result = new IdentityDataSeedResult();
-                    //"admin" user
-                    const string adminUserName = "admin";
-                    var adminUser = await UserRepository.FindByNormalizedUserNameAsync(
-                        LookupNormalizer.NormalizeName(adminUserName)
-                    );
+                    return result;
+                }
 
-                    if (adminUser != null)
-                    {
-                        return result;
-                    }
+                adminUser = new IdentityUser(
+                    GuidGenerator.Create(),
+                    adminUserName,
+                    adminEmail,
+                    tenantId
+                )
+                {
+                    Name = adminUserName
+                };
+
+                (await UserManager.CreateAsync(adminUser, adminPassword, validatePassword: false)).CheckErrors();
+                result.CreatedAdminUser = true;
 
-                    adminUser = new IdentityUser(
+                //"admin" role
+                const string adminRoleName = "admin";
+                var adminRole =
+                    await RoleRepository.FindByNormalizedNameAsync(LookupNormalizer.NormalizeName(adminRoleName));
+                if (adminRole == null)
+                {
+                    adminRole = new IdentityRole(
                         GuidGenerator.Create(),
-                        adminUserName,
-                        adminEmail,
+                        adminRoleName,
                         tenantId
                     )
                     {
-                        Name = adminUserName
+                        IsStatic = true,
+                        IsPublic = true
                     };
 
-                    (await UserManager.CreateAsync(adminUser, adminPassword)).CheckErrors();
-                    result.CreatedAdminUser = true;
-
-                    //"admin" role
-                    const string adminRoleName = "admin";
-                    var adminRole =
-                        await RoleRepository.FindByNormalizedNameAsync(LookupNormalizer.NormalizeName(adminRoleName));
-                    if (adminRole == null)
-                    {
-                        adminRole = new IdentityRole(
-                            GuidGenerator.Create(),
-                            adminRoleName,
-                            tenantId
-                        )
-                        {
-                            IsStatic = true,
-                            IsPublic = true
-                        };
-
-                        (await RoleManager.CreateAsync(adminRole)).CheckErrors();
-                        result.CreatedAdminRole = true;
-                    }
+                    (await RoleManager.CreateAsync(adminRole)).CheckErrors();
+                    result.CreatedAdminRole = true;
+                }
 
-                    (await UserManager.AddToRoleAsync(adminUser, adminRoleName)).CheckErrors();
+                (await UserManager.AddToRoleAsync(adminUser, adminRoleName)).CheckErrors();
 
-                    return result;
-                }
+                return result;
             }
         }
     }

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

@@ -60,6 +60,17 @@ namespace Volo.Abp.Identity
             CancellationTokenProvider = cancellationTokenProvider;
         }
 
+        public virtual async Task<IdentityResult> CreateAsync(IdentityUser user, string password, bool validatePassword)
+        {
+            var result = await UpdatePasswordHash(user, password, validatePassword);
+            if (!result.Succeeded)
+            {
+                return result;
+            }
+
+            return await CreateAsync(user);
+        }
+
         public virtual async Task<IdentityUser> GetByIdAsync(Guid id)
         {
             var user = await Store.FindByIdAsync(id.ToString(), CancellationToken);

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

@@ -1,35 +0,0 @@
-using System;
-using Microsoft.AspNetCore.Identity;
-
-namespace Volo.Abp.Identity
-{
-    public static class PasswordOptionsExtensions
-    {
-        public static IDisposable ClearRequirements(this PasswordOptions options)
-        {
-            var oldRequireDigit = options.RequireDigit;
-            var oldRequiredLength = options.RequiredLength;
-            var oldRequireLowercase = options.RequireLowercase;
-            var oldRequireUppercase = options.RequireUppercase;
-            var oldRequiredUniqueChars = options.RequiredUniqueChars;
-            var oldRequireNonAlphanumeric = options.RequireNonAlphanumeric;
-
-            options.RequireDigit = false;
-            options.RequiredLength = 1;
-            options.RequireLowercase = false;
-            options.RequireUppercase = false;
-            options.RequiredUniqueChars = 1;
-            options.RequireNonAlphanumeric = false;
-
-            return new DisposeAction(() =>
-            {
-                options.RequireDigit = oldRequireDigit;
-                options.RequiredLength = oldRequiredLength;
-                options.RequireLowercase = oldRequireLowercase;
-                options.RequireUppercase = oldRequireUppercase;
-                options.RequiredUniqueChars = oldRequiredUniqueChars;
-                options.RequireNonAlphanumeric = oldRequireNonAlphanumeric;
-            });
-        }
-    }
-}