diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityDataSeeder.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityDataSeeder.cs index dffe51120a..af67d32d5e 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityDataSeeder.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityDataSeeder.cs @@ -9,5 +9,6 @@ public interface IIdentityDataSeeder Task SeedAsync( [NotNull] string adminEmail, [NotNull] string adminPassword, - Guid? tenantId = null); + Guid? tenantId = null, + string? adminUserName = null); } diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs index b14ace4b05..9dc7539ef4 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs @@ -8,6 +8,8 @@ public class IdentityDataSeedContributor : IDataSeedContributor, ITransientDepen { public const string AdminEmailPropertyName = "AdminEmail"; public const string AdminEmailDefaultValue = "admin@abp.io"; + public const string AdminUserNamePropertyName = "AdminUserName"; + public const string AdminUserNameDefaultValue = "admin"; public const string AdminPasswordPropertyName = "AdminPassword"; public const string AdminPasswordDefaultValue = "1q2w3E*"; @@ -23,7 +25,8 @@ public class IdentityDataSeedContributor : IDataSeedContributor, ITransientDepen return IdentityDataSeeder.SeedAsync( context?[AdminEmailPropertyName] as string ?? AdminEmailDefaultValue, context?[AdminPasswordPropertyName] as string ?? AdminPasswordDefaultValue, - context?.TenantId + context?.TenantId, + context?[AdminUserNamePropertyName] as string ?? AdminUserNameDefaultValue ); } } diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeeder.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeeder.cs index c09f2b030f..1c153effd1 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeeder.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeeder.cs @@ -44,7 +44,8 @@ public class IdentityDataSeeder : ITransientDependency, IIdentityDataSeeder public virtual async Task SeedAsync( string adminEmail, string adminPassword, - Guid? tenantId = null) + Guid? tenantId = null, + string? adminUserName = null) { Check.NotNullOrWhiteSpace(adminEmail, nameof(adminEmail)); Check.NotNullOrWhiteSpace(adminPassword, nameof(adminPassword)); @@ -55,7 +56,10 @@ public class IdentityDataSeeder : ITransientDependency, IIdentityDataSeeder var result = new IdentityDataSeedResult(); //"admin" user - const string adminUserName = "admin"; + if(adminUserName.IsNullOrWhiteSpace()) + { + adminUserName = IdentityDataSeedContributor.AdminUserNameDefaultValue; + } var adminUser = await UserRepository.FindByNormalizedUserNameAsync( LookupNormalizer.NormalizeName(adminUserName) );