Fix test failures in IdentityServer.IntegrationTests

Author: cnblogs-dudu

src/IdentityServer4/test/IdentityServer.IntegrationTests/Clients/ClientAssertionClient.cs

@@ -67,7 +67,6 @@ public async Task Valid_client_should_succeed()
             {
                 Address = TokenEndpoint,
 
-                ClientId = ClientId,
                 ClientAssertion =
                 {
                     Type = OidcConstants.ClientAssertionTypes.JwtBearer,
@@ -88,8 +87,6 @@ public async Task Valid_client_with_implicit_clientId_should_succeed()
             var response = await _client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest
             {
                 Address = TokenEndpoint,
-                ClientId = "client",
-
                 ClientAssertion =
                 {
                     Type = OidcConstants.ClientAssertionTypes.JwtBearer,
@@ -101,7 +98,7 @@ public async Task Valid_client_with_implicit_clientId_should_succeed()
 
             AssertValidToken(response);
         }
-        
+
         [Fact]
         public async Task Valid_client_with_token_replay_should_fail()
         {
@@ -110,8 +107,6 @@ public async Task Valid_client_with_token_replay_should_fail()
             var response = await _client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest
             {
                 Address = TokenEndpoint,
-
-                ClientId = ClientId,
                 ClientAssertion =
                 {
                     Type = OidcConstants.ClientAssertionTypes.JwtBearer,
@@ -122,13 +117,11 @@ public async Task Valid_client_with_token_replay_should_fail()
             });
 
             AssertValidToken(response);
-            
+
             // replay
             response = await _client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest
             {
                 Address = TokenEndpoint,
-
-                ClientId = ClientId,
                 ClientAssertion =
                 {
                     Type = OidcConstants.ClientAssertionTypes.JwtBearer,
@@ -148,11 +141,9 @@ public async Task Client_with_invalid_secret_should_fail()
             var response = await _client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest
             {
                 Address = TokenEndpoint,
-
-                ClientId = ClientId,
                 ClientAssertion =
                 {
-                    Type = OidcConstants.ClientAssertionTypes.JwtBearer,
+                    Type =  OidcConstants.ClientAssertionTypes.JwtBearer,
                     Value = "invalid"
                 },
 
@@ -173,8 +164,6 @@ public async Task Invalid_client_should_fail()
             var response = await _client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest
             {
                 Address = TokenEndpoint,
-
-                ClientId = clientId,
                 ClientAssertion =
                 {
                     Type = OidcConstants.ClientAssertionTypes.JwtBearer,
@@ -204,12 +193,12 @@ private void AssertValidToken(TokenResponse response)
             response.RefreshToken.Should().BeNull();
 
             var payload = GetPayload(response);
-            
+
             payload.Count().Should().Be(8);
             payload.Should().Contain("iss", "https://idsvr4");
             payload.Should().Contain("client_id", ClientId);
             payload.Keys.Should().Contain("iat");
-            
+
             var scopes = payload["scope"] as JArray;
             scopes.First().ToString().Should().Be("api1");
 

src/IdentityServer4/test/IdentityServer.IntegrationTests/Clients/CustomTokenRequestValidatorClient.cs

@@ -1,16 +1,15 @@
 // 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.
 
-
 using System.Collections.Generic;
 using System.Net.Http;
-using System.Text.Json;
 using System.Threading.Tasks;
 using FluentAssertions;
 using IdentityModel.Client;
 using IdentityServer.IntegrationTests.Clients.Setup;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
+using Newtonsoft.Json;
 using Xunit;
 
 namespace IdentityServer.IntegrationTests.Clients
@@ -120,7 +119,7 @@ public async Task Extension_grant_request_should_contain_custom_response()
 
         private Dictionary<string, object> GetFields(TokenResponse response)
         {
-            return response.Json.Deserialize<Dictionary<string, object>>();
+            return JsonConvert.DeserializeObject<Dictionary<string, object>>(response.Json.ToString());
         }
     }
 }

src/IdentityServer4/test/IdentityServer.IntegrationTests/Endpoints/Introspection/IntrospectionTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -181,7 +182,7 @@ public async Task Response_data_should_be_valid_using_single_scope()
                 Token = tokenResponse.AccessToken
             });
 
-            var values = introspectionResponse.Json.Deserialize<Dictionary<string, object>>();
+            var values = JsonConvert.DeserializeObject<Dictionary<string, object>>(introspectionResponse.Json.ToString());
 
             values["aud"].GetType().Name.Should().Be("String");
             values["iss"].GetType().Name.Should().Be("String");
@@ -220,7 +221,7 @@ public async Task Response_data_with_user_authentication_should_be_valid_using_s
                 Token = tokenResponse.AccessToken
             });
 
-            var values = introspectionResponse.Json.Deserialize<Dictionary<string, object>>();
+            var values = JsonConvert.DeserializeObject<Dictionary<string, object>>(introspectionResponse.Json.ToString());
 
             values["aud"].GetType().Name.Should().Be("String");
             values["iss"].GetType().Name.Should().Be("String");