From 66f0a863e9f05bf5c7690949a3e2bf3b4073ae00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sun, 4 Feb 2018 14:25:42 +0300
Subject: [PATCH] Introduce AbpIdentityServerConsts.

---
 .../Abp/IdentityServer/AbpIdentityServerConsts.cs    |  9 +++++++++
 .../EntityFrameworkCore/IdentityServerDbContext.cs   |  7 +++----
 ...IdentityServerDbContextModelCreatingExtensions.cs | 12 ++++++++----
 3 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerConsts.cs

diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerConsts.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerConsts.cs
new file mode 100644
index 0000000000..c0593a245e
--- /dev/null
+++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerConsts.cs
@@ -0,0 +1,9 @@
+namespace Volo.Abp.IdentityServer
+{
+    public static class AbpIdentityServerConsts
+    {
+        public const string DefaultDbTablePrefix = "IdentityServer";
+
+        public const string DefaultDbSchema = null;
+    }
+}
diff --git a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContext.cs b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContext.cs
index db8882023a..159783a8d9 100644
--- a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContext.cs
+++ b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContext.cs
@@ -9,9 +9,9 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
 {
     public class IdentityServerDbContext : AbpDbContext<IdentityServerDbContext>, IIdentityServerDbContext
     {
-        public static string TablePrefix { get; set; } = "IdentityServer";
+        public static string TablePrefix { get; set; } = AbpIdentityServerConsts.DefaultDbTablePrefix;
 
-        public static string Schema { get; set; }
+        public static string Schema { get; set; } = AbpIdentityServerConsts.DefaultDbSchema;
 
         public DbSet<ApiResource> ApiResources { get; set; }
 
@@ -58,8 +58,7 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
         protected override void OnModelCreating(ModelBuilder builder)
         {
             base.OnModelCreating(builder);
-
-            this.ConfigureIdentityServer(builder, TablePrefix, Schema);
+            builder.ConfigureIdentityServer(TablePrefix, Schema);
         }
     }
 }
diff --git a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs
index 0a12abe5fc..a6e9522919 100644
--- a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs
+++ b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.IdentityServer.ApiResources;
 using Volo.Abp.IdentityServer.Clients;
@@ -10,9 +9,14 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
 {
     public static class IdentityServerDbContextModelCreatingExtensions
     {
-        public static void ConfigureIdentityServer(this IIdentityServerDbContext dbContext, ModelBuilder builder, string tablePrefix = "", [CanBeNull] string schema = null)
+        public static void ConfigureIdentityServer(
+            this ModelBuilder builder, 
+            [CanBeNull] string tablePrefix = AbpIdentityServerConsts.DefaultDbTablePrefix, 
+            [CanBeNull] string schema = AbpIdentityServerConsts.DefaultDbSchema)
         {
-            if (tablePrefix.IsNullOrWhiteSpace())
+            Check.NotNull(builder, nameof(builder));
+
+            if (tablePrefix == null)
             {
                 tablePrefix = "";
             }