enable default client validator by default (#2525)

IdentityServer · Aug 7, 2018 · b7a860e · b7a860e
1 parent 3135a54
commit b7a860e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/host/Startup.cs b/host/Startup.cs
@@ -50,7 +50,6 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
                 .AddExtensionGrantValidator<Extensions.NoSubjectExtensionGrantValidator>()
                 .AddJwtBearerClientAuthentication()
                 .AddAppAuthRedirectUriValidator()
-                .AddClientConfigurationValidator<DefaultClientConfigurationValidator>()
                 .AddTestUsers(TestUsers.Users);
 
             services.AddExternalIdentityProviders();

diff --git a/src/Configuration/DependencyInjection/BuilderExtensions/Core.cs b/src/Configuration/DependencyInjection/BuilderExtensions/Core.cs
@@ -190,7 +190,7 @@ public static IIdentityServerBuilder AddValidators(this IIdentityServerBuilder b
             builder.Services.TryAddTransient<IResourceOwnerPasswordValidator, NotSupportedResourceOwnerPasswordValidator>();
             builder.Services.TryAddTransient<ICustomTokenRequestValidator, DefaultCustomTokenRequestValidator>();
             builder.Services.TryAddTransient<IUserInfoRequestValidator, UserInfoRequestValidator>();
-            builder.Services.TryAddTransient<IClientConfigurationValidator, NopClientConfigurationValidator>();
+            builder.Services.TryAddTransient<IClientConfigurationValidator, DefaultClientConfigurationValidator>();
 
             // optional
             builder.Services.TryAddTransient<ICustomTokenValidator, DefaultCustomTokenValidator>();

diff --git a/test/IdentityServer.IntegrationTests/Clients/Setup/Clients.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/Clients.cs
@@ -237,13 +237,15 @@ public static IEnumerable<Client> Get()
                 {
                     ClientId = "implicit",
                     AllowedGrantTypes = GrantTypes.Implicit,
-                    AllowedScopes = {"api1"}
+                    AllowedScopes = {"api1"},
+                    RedirectUris = { "http://implicit" }
                 },
                 new Client
                 {
                     ClientId = "implicit_and_client_creds",
                     AllowedGrantTypes = GrantTypes.ImplicitAndClientCredentials,
-                    AllowedScopes = {"api1"}
+                    AllowedScopes = {"api1"},
+                    RedirectUris = { "http://implicit_and_client_creds" }
                 }
             };
         }

diff --git a/...IdentityServer.IntegrationTests/Endpoints/Authorize/RestrictAccessTokenViaBrowserTests.cs b/...IdentityServer.IntegrationTests/Endpoints/Authorize/RestrictAccessTokenViaBrowserTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
+// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
@@ -47,6 +47,7 @@ public RestrictAccessTokenViaBrowserTests()
                 {
                     ClientId = "client3",
                     AllowedGrantTypes = GrantTypes.Hybrid,
+                    ClientSecrets = { new Secret("secret".Sha256()) },
                     RequireConsent = false,
                     AllowedScopes = new List<string> { "openid" },
                     RedirectUris = new List<string> { "https://client3/callback" },
@@ -56,6 +57,7 @@ public RestrictAccessTokenViaBrowserTests()
                 {
                     ClientId = "client4",
                     AllowedGrantTypes = GrantTypes.Hybrid,
+                    ClientSecrets = { new Secret("secret".Sha256()) },
                     RequireConsent = false,
                     AllowedScopes = new List<string> { "openid" },
                     RedirectUris = new List<string> { "https://client4/callback" },

diff --git a/test/IdentityServer.IntegrationTests/Endpoints/Revocation/RevocationTests.cs b/test/IdentityServer.IntegrationTests/Endpoints/Revocation/RevocationTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
+// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
@@ -58,6 +58,7 @@ public RevocationTests()
             {
                 ClientId = "implicit_and_client_creds",
                 AllowedGrantTypes = GrantTypes.ImplicitAndClientCredentials,
+                ClientSecrets = { new Secret("secret".Sha256()) },
                 RequireConsent = false,
                 AllowedScopes = new List<string> { "api" },
                 RedirectUris = new List<string> { redirect_uri },