From 5f2aa6fc397213e4383a0aa9245a7784045b9043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sat, 30 May 2020 01:50:09 +0300
Subject: [PATCH] Make constants changeable.

---
 .../ClientPostLogoutRedirectUriConsts.cs      |  1 +
 .../Clients/ClientRedirectUriConsts.cs        |  1 +
 .../Grants/PersistedGrantConsts.cs            |  4 +--
 ...yServerDbContextModelCreatingExtensions.cs | 32 ++++++++-----------
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Clients/ClientPostLogoutRedirectUriConsts.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Clients/ClientPostLogoutRedirectUriConsts.cs
index 8fe55ba018..3092232d47 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Clients/ClientPostLogoutRedirectUriConsts.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Clients/ClientPostLogoutRedirectUriConsts.cs
@@ -3,5 +3,6 @@
     public class ClientPostLogoutRedirectUriConsts
     {
         public const int PostLogoutRedirectUriMaxLength = 2000;
+        public static int PostLogoutRedirectUriMaxLengthValue { get; set; } = 2000;
     }
 }
\ No newline at end of file
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Clients/ClientRedirectUriConsts.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Clients/ClientRedirectUriConsts.cs
index d67bbea509..e972388487 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Clients/ClientRedirectUriConsts.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Clients/ClientRedirectUriConsts.cs
@@ -3,5 +3,6 @@
     public class ClientRedirectUriConsts
     {
         public const int RedirectUriMaxLength = 2000;
+        public static int RedirectUriMaxLengthValue { get; set; } = 2000;
     }
 }
\ No newline at end of file
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Grants/PersistedGrantConsts.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Grants/PersistedGrantConsts.cs
index ab46d03ece..6d0836ab17 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Grants/PersistedGrantConsts.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Grants/PersistedGrantConsts.cs
@@ -6,9 +6,7 @@
         public const int TypeMaxLength = 50;
         public const int SubjectIdMaxLength = 200;
         public const int ClientIdMaxLength = 200;
-
-        // 50000 chosen to be explicit to allow enough size to avoid truncation, yet stay beneath the MySql row size limit of ~65K
-        // apparently anything over 4K converts to nvarchar(max) on SqlServer
         public const int DataMaxLength = 50000;
+        public static int DataMaxLengthValue { get; set; }= 50000;
     }
 }
\ No newline at end of file
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs
index 124eb8d91d..8acb8a9539 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs
@@ -80,13 +80,10 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
 
                 if (IsDatabaseProvider(builder, options, EfCoreDatabaseProvider.MySql))
                 {
-                    b.Property(x => x.RedirectUri).HasMaxLength(300).IsRequired();
-                }
-                else
-                {
-                    b.Property(x => x.RedirectUri).HasMaxLength(ClientRedirectUriConsts.RedirectUriMaxLength)
-                        .IsRequired();
-                }
+                    ClientRedirectUriConsts.RedirectUriMaxLengthValue = 300;
+                } 
+                
+                b.Property(x => x.RedirectUri).HasMaxLength(ClientRedirectUriConsts.RedirectUriMaxLengthValue).IsRequired();
             });
 
             builder.Entity<ClientPostLogoutRedirectUri>(b =>
@@ -99,13 +96,12 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
 
                 if (IsDatabaseProvider(builder, options, EfCoreDatabaseProvider.MySql))
                 {
-                    b.Property(x => x.PostLogoutRedirectUri).HasMaxLength(300).IsRequired();
-                }
-                else
-                {
-                    b.Property(x => x.PostLogoutRedirectUri)
-                        .HasMaxLength(ClientPostLogoutRedirectUriConsts.PostLogoutRedirectUriMaxLength).IsRequired();
-                }
+                    ClientPostLogoutRedirectUriConsts.PostLogoutRedirectUriMaxLengthValue = 300;
+                } 
+                
+                b.Property(x => x.PostLogoutRedirectUri)
+                    .HasMaxLength(ClientPostLogoutRedirectUriConsts.PostLogoutRedirectUriMaxLengthValue)
+                    .IsRequired();
             });
 
             builder.Entity<ClientScope>(b =>
@@ -199,12 +195,10 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
 
                 if (IsDatabaseProvider(builder, options, EfCoreDatabaseProvider.MySql))
                 {
-                    b.Property(x => x.Data).HasMaxLength(10000).IsRequired();
-                }
-                else
-                {
-                    b.Property(x => x.Data).HasMaxLength(PersistedGrantConsts.DataMaxLength).IsRequired();
+                    PersistedGrantConsts.DataMaxLengthValue = 10000; //TODO: MySQL accepts 20.000. We can consider to change in v3.0. 
                 }
+                
+                b.Property(x => x.Data).HasMaxLength(PersistedGrantConsts.DataMaxLengthValue).IsRequired();
 
                 b.HasKey(x => x.Key); //TODO: What about Id!!!