From 0c555475918c9be408fb4201f41810d4e5a21316 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Fri, 19 Feb 2021 22:43:09 +0800
Subject: [PATCH] Remove AbpRedirectUriValidatorOptions

---
 ...pIdentityServerServiceCollectionExtensions.cs |  7 +------
 .../AbpRedirectUriValidatorOptions.cs            | 14 --------------
 .../AbpStrictRedirectUriValidator.cs             | 16 +++-------------
 .../AbpStrictRedirectUriValidator_Tests.cs       |  2 +-
 4 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpRedirectUriValidatorOptions.cs

diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerServiceCollectionExtensions.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerServiceCollectionExtensions.cs
index 679078adbc..ec45ee32b6 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerServiceCollectionExtensions.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerServiceCollectionExtensions.cs
@@ -6,13 +6,8 @@ namespace Volo.Abp.IdentityServer
 {
     public static class AbpIdentityServerServiceCollectionExtensions
     {
-        public static void AddAbpStrictRedirectUriValidator(this IServiceCollection services, params string[] domainFormats)
+        public static void AddAbpStrictRedirectUriValidator(this IServiceCollection services)
         {
-            services.Configure<AbpRedirectUriValidatorOptions>(options =>
-            {
-                options.DomainFormats.AddRange(domainFormats);
-            });
-
             services.Replace(ServiceDescriptor.Transient<IRedirectUriValidator, AbpStrictRedirectUriValidator>());
         }
     }
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpRedirectUriValidatorOptions.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpRedirectUriValidatorOptions.cs
deleted file mode 100644
index e9bf575bfe..0000000000
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpRedirectUriValidatorOptions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-
-namespace Volo.Abp.IdentityServer
-{
-    public class AbpRedirectUriValidatorOptions
-    {
-        public List<string> DomainFormats { get; }
-
-        public AbpRedirectUriValidatorOptions()
-        {
-            DomainFormats = new List<string>();
-        }
-    }
-}
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpStrictRedirectUriValidator.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpStrictRedirectUriValidator.cs
index 94f05b962b..e67740f7f1 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpStrictRedirectUriValidator.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpStrictRedirectUriValidator.cs
@@ -10,13 +10,6 @@ namespace Volo.Abp.IdentityServer
 {
     public class AbpStrictRedirectUriValidator : StrictRedirectUriValidator
     {
-        protected AbpRedirectUriValidatorOptions Options { get; }
-
-        public AbpStrictRedirectUriValidator(IOptions<AbpRedirectUriValidatorOptions> options)
-        {
-            Options = options.Value;
-        }
-
         public override async Task<bool> IsRedirectUriValidAsync(string requestedUri, Client client)
         {
             var isAllowed = await base.IsRedirectUriValidAsync(requestedUri, client);
@@ -38,13 +31,10 @@ namespace Volo.Abp.IdentityServer
 
             foreach (var url in uris)
             {
-                if (Options.DomainFormats.Any(x => url.Contains(x)))
+                var extractResult = FormattedStringValueExtracter.Extract(requestedUri, url, ignoreCase: true);
+                if (extractResult.IsMatch)
                 {
-                    var extractResult = FormattedStringValueExtracter.Extract(requestedUri, url, ignoreCase: true);
-                    if (extractResult.IsMatch)
-                    {
-                        return Task.FromResult(true);
-                    }
+                    return Task.FromResult(true);
                 }
             }
 
diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/AbpStrictRedirectUriValidator_Tests.cs b/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/AbpStrictRedirectUriValidator_Tests.cs
index 50f84e890e..447b0bd008 100644
--- a/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/AbpStrictRedirectUriValidator_Tests.cs
+++ b/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/AbpStrictRedirectUriValidator_Tests.cs
@@ -33,7 +33,7 @@ namespace Volo.Abp.IdentityServer
 
         protected override void AfterAddApplication(IServiceCollection services)
         {
-            services.AddAbpStrictRedirectUriValidator("{0}.api.abp.io:8080/signin-oidc", "{0}.ng.abp.io/index.html");
+            services.AddAbpStrictRedirectUriValidator();
         }
 
         [Fact]