fixes #1831

src/IdentityServer4/ResponseHandling/TokenResponseGenerator.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.
 
 
@@ -134,7 +134,8 @@ protected virtual async Task<TokenResponse> ProcessAuthorizationCodeRequestAsync
             var response = new TokenResponse
             {
                 AccessToken = accessToken,
-                AccessTokenLifetime = request.ValidatedRequest.AccessTokenLifetime
+                AccessTokenLifetime = request.ValidatedRequest.AccessTokenLifetime,
+                Custom = request.CustomResponse
             };
 
             //////////////////////////
@@ -221,7 +222,8 @@ protected virtual async Task<TokenResponse> ProcessRefreshTokenRequestAsync(Toke
                 IdentityToken = await CreateIdTokenFromRefreshTokenRequestAsync(request.ValidatedRequest, accessTokenString),
                 AccessToken = accessTokenString,
                 AccessTokenLifetime = request.ValidatedRequest.AccessTokenLifetime,
-                RefreshToken = handle
+                RefreshToken = handle,
+                Custom = request.CustomResponse
             };
         }
 

test/IdentityServer.IntegrationTests/Clients/CustomTokenRequestValidatorClient.cs

@@ -0,0 +1,113 @@
+// 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 FluentAssertions;
+using IdentityModel;
+using IdentityModel.Client;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.TestHost;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace IdentityServer4.IntegrationTests.Clients
+{
+    public class CustomTokenRequestValidatorClient
+    {
+        private const string TokenEndpoint = "https://server/connect/token";
+
+        private readonly HttpClient _client;
+        private readonly HttpMessageHandler _handler;
+
+        public CustomTokenRequestValidatorClient()
+        {
+            var val = new TestCustomTokenRequestValidator();
+            Startup.CustomTokenRequestValidator = val;
+
+            var builder = new WebHostBuilder()
+                .UseStartup<Startup>();
+            var server = new TestServer(builder);
+
+            _handler = server.CreateHandler();
+            _client = server.CreateClient();
+        }
+
+        [Fact]
+        public async Task client_credentials_request_should_contain_custom_response()
+        {
+            var client = new TokenClient(
+                TokenEndpoint,
+                "client",
+                "secret",
+                innerHttpMessageHandler: _handler);
+
+            var response = await client.RequestClientCredentialsAsync("api1");
+
+            var fields = GetFields(response);
+            fields.Should().Contain("custom", "custom");
+        }
+
+        [Fact]
+        public async Task resource_owner_credentials_request_should_contain_custom_response()
+        {
+            var client = new TokenClient(
+                TokenEndpoint,
+                "roclient",
+                "secret",
+                innerHttpMessageHandler: _handler);
+
+            var response = await client.RequestResourceOwnerPasswordAsync("bob", "bob", "api1");
+
+            var fields = GetFields(response);
+            fields.Should().Contain("custom", "custom");
+        }
+
+        [Fact]
+        public async Task refreshing_a_token_should_contain_custom_response()
+        {
+            var client = new TokenClient(
+                TokenEndpoint,
+                "roclient",
+                "secret",
+                innerHttpMessageHandler: _handler);
+
+            var response = await client.RequestResourceOwnerPasswordAsync("bob", "bob", "api1 offline_access");
+            response = await client.RequestRefreshTokenAsync(response.RefreshToken);
+
+            var fields = GetFields(response);
+            fields.Should().Contain("custom", "custom");
+        }
+
+        [Fact]
+        public async Task extension_grant_request_should_contain_custom_response()
+        {
+            var client = new TokenClient(
+                TokenEndpoint,
+                "client.custom",
+                "secret",
+                innerHttpMessageHandler: _handler);
+
+            var customParameters = new Dictionary<string, string>
+                {
+                    { "custom_credential", "custom credential"}
+                };
+
+            var response = await client.RequestCustomGrantAsync("custom", "api1", customParameters);
+
+            var fields = GetFields(response);
+            fields.Should().Contain("custom", "custom");
+        }
+
+        private Dictionary<string, object> GetFields(TokenResponse response)
+        {
+            return response.Json.ToObject<Dictionary<string, object>>();
+        }
+    }
+}

test/IdentityServer.IntegrationTests/Clients/Setup/Startup.cs

@@ -6,11 +6,14 @@
 using IdentityServer4.Validation;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
+using System;
 
 namespace IdentityServer4.IntegrationTests.Clients
 {
     public class Startup
     {
+        static public ICustomTokenRequestValidator CustomTokenRequestValidator { get; set; } 
+
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddAuthentication();
@@ -42,6 +45,12 @@ public void ConfigureServices(IServiceCollection services)
 
             builder.AddSecretParser<JwtBearerClientAssertionSecretParser>();
             builder.AddSecretValidator<PrivateKeyJwtSecretValidator>();
+
+            // add a custom token request validator if set
+            if (CustomTokenRequestValidator != null)
+            {
+                builder.Services.AddTransient(r => CustomTokenRequestValidator);
+            }
         }
 
         public void Configure(IApplicationBuilder app)

test/IdentityServer.IntegrationTests/Clients/Setup/TestCustomTokenRequestValidator.cs

@@ -0,0 +1,23 @@
+// 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 IdentityServer4.Validation;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace IdentityServer4.IntegrationTests.Clients
+{
+    public class TestCustomTokenRequestValidator : ICustomTokenRequestValidator
+    {
+        public Task ValidateAsync(CustomTokenRequestValidationContext context)
+        {
+            context.Result.CustomResponse = new Dictionary<string, object>
+            {
+                {"custom", "custom" }
+            };
+
+            return Task.CompletedTask;
+        }
+    }
+}