Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Throw an exception in ConfigureHttpClient when custom IForwarderHttpClientFactory is added #1805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 18, 2022
Merged

Throw an exception in ConfigureHttpClient when custom IForwarderHttpClientFactory is added #1805

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62916d0
Throw an exception in ConfigureHttpClient when custom IForwarderHttpC…
Kahbazi Jul 15, 2022
dd4275a
Remove unused usings
Kahbazi Jul 15, 2022
1987684
Update src/ReverseProxy/Management/ReverseProxyServiceCollectionExten…
Tratcher Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/ReverseProxy/Management/ReverseProxyServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT License.

using System;
using System.Linq;
using System.Net.Http;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection.Extensions;
Expand Down Expand Up @@ -143,6 +144,15 @@ public static IReverseProxyBuilder ConfigureHttpClient(this IReverseProxyBuilder
throw new ArgumentNullException(nameof(configure));
}

var service = builder.Services.FirstOrDefault(service => service.ServiceType == typeof(IForwarderHttpClientFactory));
if (service is not null)
{
if (service.ImplementationType != typeof(ForwarderHttpClientFactory))
{
throw new InvalidOperationException($"ConfigureHttpClient will override the custom IForwarderHttpClientFactory type.");
}
}

builder.Services.AddSingleton<IForwarderHttpClientFactory>(services =>
{
var logger = services.GetRequiredService<ILogger<ForwarderHttpClientFactory>>();
Expand Down
41 changes: 41 additions & 0 deletions test/ReverseProxy.Tests/Forwarder/ReverseProxyServiceCollectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System;
using System.Net.Http;
using Microsoft.Extensions.DependencyInjection;
using Xunit;

namespace Yarp.ReverseProxy.Forwarder;

public class ReverseProxyServiceCollectionTests
{

[Fact]
public void ConfigureHttpClient_Works()
{
new ServiceCollection()
.AddReverseProxy()
.ConfigureHttpClient((_, _) => { });
}

[Fact]
public void ConfigureHttpClient_ThrowIfCustomServiceAdded()
{
Assert.Throws<InvalidOperationException>(() =>
{
new ServiceCollection()
.AddSingleton<IForwarderHttpClientFactory, CustomForwarderHttpClientFactory>()
.AddReverseProxy()
.ConfigureHttpClient((_, _) => { });
});
}

private class CustomForwarderHttpClientFactory : IForwarderHttpClientFactory
{
public HttpMessageInvoker CreateClient(ForwarderHttpClientContext context)
{
throw new NotImplementedException();
}
}
}