Db table prefix revision for the identity module.

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

@@ -1,11 +0,0 @@
-namespace Volo.Abp.Identity
-{
-    public static class AbpIdentityConsts
-    {
-        public const string DefaultDbTablePrefix = "Abp";
-
-        public const string DefaultDbSchema = null;
-
-        public const string ConnectionStringName = "AbpIdentity";
-    }
-}

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

@@ -0,0 +1,13 @@
+using Volo.Abp.Data;
+
+namespace Volo.Abp.Identity
+{
+    public static class AbpIdentityDbProperties
+    {
+        public static string DbTablePrefix { get; } = AbpCommonDbProperties.DbTablePrefix;
+
+        public static string DbSchema { get; } = AbpCommonDbProperties.DbSchema;
+
+        public const string ConnectionStringName = "AbpIdentity";
+    }
+}

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

@@ -4,7 +4,7 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace Volo.Abp.Identity.EntityFrameworkCore
 {
-    [ConnectionStringName(AbpIdentityConsts.ConnectionStringName)]
+    [ConnectionStringName(AbpIdentityDbProperties.ConnectionStringName)]
     public interface IIdentityDbContext : IEfCoreDbContext
     {
         DbSet<IdentityUser> Users { get; set; }

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

@@ -7,13 +7,9 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
     /// <summary>
     /// Base class for the Entity Framework database context used for identity.
     /// </summary>
-    [ConnectionStringName(AbpIdentityConsts.ConnectionStringName)]
+    [ConnectionStringName(AbpIdentityDbProperties.ConnectionStringName)]
     public class IdentityDbContext : AbpDbContext<IdentityDbContext>, IIdentityDbContext
     {
-        public static string TablePrefix { get; set; } = AbpIdentityConsts.DefaultDbTablePrefix;
-
-        public static string Schema { get; set; } = AbpIdentityConsts.DefaultDbSchema;
-
         public DbSet<IdentityUser> Users { get; set; }
 
         public DbSet<IdentityRole> Roles { get; set; }
@@ -30,11 +26,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
         {
             base.OnModelCreating(builder);
 
-            builder.ConfigureIdentity(options =>
+            builder.ConfigureIdentity();
-            {
-                options.TablePrefix = TablePrefix;
-                options.Schema = Schema;
-            });
         }
     }
 }

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

@@ -14,7 +14,10 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
         {
             Check.NotNull(builder, nameof(builder));
 
-            var options = new IdentityModelBuilderConfigurationOptions();
+            var options = new IdentityModelBuilderConfigurationOptions(
+                AbpIdentityDbProperties.DbTablePrefix,
+                AbpIdentityDbProperties.DbSchema
+            );
 
             optionsAction?.Invoke(options);
 

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

@@ -6,8 +6,8 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
     public class IdentityModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions
     {
         public IdentityModelBuilderConfigurationOptions(
-            [NotNull] string tablePrefix = AbpIdentityConsts.DefaultDbTablePrefix,
+            [NotNull] string tablePrefix,
-            [CanBeNull] string schema = AbpIdentityConsts.DefaultDbSchema)
+            [CanBeNull] string schema)
             : base(
                 tablePrefix, 
                 schema)

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

@@ -4,11 +4,9 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.Identity.MongoDB
 {
-    [ConnectionStringName(AbpIdentityConsts.ConnectionStringName)]
+    [ConnectionStringName(AbpIdentityDbProperties.ConnectionStringName)]
     public class AbpIdentityMongoDbContext : AbpMongoDbContext, IAbpIdentityMongoDbContext
     {
-        public static string CollectionPrefix { get; set; } = AbpIdentityConsts.DefaultDbTablePrefix;
-
         public IMongoCollection<IdentityUser> Users => Collection<IdentityUser>();
 
         public IMongoCollection<IdentityRole> Roles => Collection<IdentityRole>();
@@ -19,10 +17,7 @@ namespace Volo.Abp.Identity.MongoDB
         {
             base.CreateModel(modelBuilder);
 
-            modelBuilder.ConfigureIdentity(options =>
+            modelBuilder.ConfigureIdentity();
-            {
-                options.CollectionPrefix = CollectionPrefix;
-            });
         }
     }
 }

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

@@ -11,7 +11,9 @@ namespace Volo.Abp.Identity.MongoDB
         {
             Check.NotNull(builder, nameof(builder));
 
-            var options = new IdentityMongoModelBuilderConfigurationOptions();
+            var options = new IdentityMongoModelBuilderConfigurationOptions(
+                AbpIdentityDbProperties.DbTablePrefix
+            );
 
             optionsAction?.Invoke(options);
 

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

@@ -4,7 +4,7 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.Identity.MongoDB
 {
-    [ConnectionStringName(AbpIdentityConsts.ConnectionStringName)]
+    [ConnectionStringName(AbpIdentityDbProperties.ConnectionStringName)]
     public interface IAbpIdentityMongoDbContext : IAbpMongoDbContext
     {
         IMongoCollection<IdentityUser> Users { get; }

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

@@ -1,11 +1,12 @@
-using Volo.Abp.MongoDB;
+using JetBrains.Annotations;
+using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.Identity.MongoDB
 {
     public class IdentityMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions
     {
-        public IdentityMongoModelBuilderConfigurationOptions()
+        public IdentityMongoModelBuilderConfigurationOptions([NotNull] string collectionPrefix = "")
-            : base(AbpIdentityConsts.DefaultDbTablePrefix)
+            : base(collectionPrefix)
         {
         }
     }