From 6706499fa3bf048fc735139addd68f964618959e Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Thu, 29 Sep 2022 13:57:15 +0300
Subject: [PATCH 1/2] Added policy options for document discovery

---
 .../IdentityClientConfiguration.cs             | 18 ++++++++++++++++++
 .../IdentityModelAuthenticationService.cs      |  4 +++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientConfiguration.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientConfiguration.cs
index 325491685b..d31b95e231 100644
--- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientConfiguration.cs
+++ b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientConfiguration.cs
@@ -83,6 +83,24 @@ public class IdentityClientConfiguration : Dictionary<string, string>
         get => this.GetOrDefault(nameof(CacheAbsoluteExpiration))?.To<int>() ?? 60 * 30;
         set => this[nameof(CacheAbsoluteExpiration)] = value.ToString(CultureInfo.InvariantCulture);
     }
+    
+    /// <summary>
+    /// ValidateIssuerName.
+    /// Default: true.
+    /// </summary>
+    public bool ValidateIssuerName {
+        get => this.GetOrDefault(nameof(ValidateIssuerName))?.To<bool>() ?? true;
+        set => this[nameof(ValidateIssuerName)] = value.ToString().ToLowerInvariant();
+    }
+    
+    /// <summary>
+    /// ValidateEndpoints.
+    /// Default: true.
+    /// </summary>
+    public bool ValidateEndpoints {
+        get => this.GetOrDefault(nameof(ValidateEndpoints))?.To<bool>() ?? true;
+        set => this[nameof(ValidateEndpoints)] = value.ToString().ToLowerInvariant();
+    }
 
     public IdentityClientConfiguration()
     {
diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelAuthenticationService.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelAuthenticationService.cs
index 6e98a047bb..db59346465 100644
--- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelAuthenticationService.cs
+++ b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelAuthenticationService.cs
@@ -127,7 +127,9 @@ public class IdentityModelAuthenticationService : IIdentityModelAuthenticationSe
                     Address = configuration.Authority,
                     Policy =
                     {
-                        RequireHttps = configuration.RequireHttps
+                        RequireHttps = configuration.RequireHttps,
+                        ValidateIssuerName = configuration.ValidateIssuerName,
+                        ValidateEndpoints = configuration.ValidateEndpoints
                     }
                 };
                 IdentityModelHttpRequestMessageOptions.ConfigureHttpRequestMessage?.Invoke(request);

From 2e4206413706d92ceace620e2b9257465c21843f Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Thu, 29 Sep 2022 13:59:48 +0300
Subject: [PATCH 2/2] Update IdentityClientConfiguration.cs

---
 .../Volo/Abp/IdentityModel/IdentityClientConfiguration.cs   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientConfiguration.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientConfiguration.cs
index d31b95e231..8faf3225ab 100644
--- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientConfiguration.cs
+++ b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientConfiguration.cs
@@ -116,7 +116,9 @@ public class IdentityClientConfiguration : Dictionary<string, string>
         string userName = null,
         string userPassword = null,
         bool requireHttps = true,
-        int cacheAbsoluteExpiration = 60 * 30)
+        int cacheAbsoluteExpiration = 60 * 30,
+        bool validateIssuerName = true,
+        bool validateEndpoints = true)
     {
         this[nameof(Authority)] = authority;
         this[nameof(Scope)] = scope;
@@ -127,5 +129,7 @@ public class IdentityClientConfiguration : Dictionary<string, string>
         this[nameof(UserPassword)] = userPassword;
         this[nameof(RequireHttps)] = requireHttps.ToString().ToLowerInvariant();
         this[nameof(CacheAbsoluteExpiration)] = cacheAbsoluteExpiration.ToString(CultureInfo.InvariantCulture);
+        this[nameof(ValidateIssuerName)] = validateIssuerName.ToString().ToLowerInvariant();
+        this[nameof(ValidateEndpoints)] = validateEndpoints.ToString().ToLowerInvariant();
     }
 }