huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Microsoft.AspNetCore.Http.Connections.Client refactors (#1995)

This commit is contained in:
James Newton-King 2018-04-13 20:13:58 +12:00 committed by GitHub
parent 83dec1093a
commit 198013bfa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Microsoft.AspNetCore.Http.Connections.Client/HttpConnection.Log.cs
View File

@ -42,8 +42,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
private static readonly Action<ILogger, Uri, Exception> _errorWithNegotiation =
LoggerMessage.Define<Uri>(LogLevel.Error, new EventId(10, "ErrorWithNegotiation"), "Failed to start connection. Error getting negotiation response from '{Url}'.");
private static readonly Action<ILogger, string, Exception> _errorStartingTransport =
LoggerMessage.Define<string>(LogLevel.Error, new EventId(11, "ErrorStartingTransport"), "Failed to start connection. Error starting transport '{Transport}'.");
private static readonly Action<ILogger, HttpTransportType, Exception> _errorStartingTransport =
LoggerMessage.Define<HttpTransportType>(LogLevel.Error, new EventId(11, "ErrorStartingTransport"), "Failed to start connection. Error starting transport '{Transport}'.");
private static readonly Action<ILogger, string, Exception> _transportNotSupported =
LoggerMessage.Define<string>(LogLevel.Debug, new EventId(12, "TransportNotSupported"), "Skipping transport {TransportName} because it is not supported by this client.");
@ -63,8 +63,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
private static readonly Action<ILogger, Exception> _transportThrewExceptionOnStop =
LoggerMessage.Define(LogLevel.Error, new EventId(17, "TransportThrewExceptionOnStop"), "The transport threw an exception while stopping.");
private static readonly Action<ILogger, string, Exception> _transportStarted =
LoggerMessage.Define<string>(LogLevel.Debug, new EventId(18, "TransportStarted"), "Transport '{Transport}' started.");
private static readonly Action<ILogger, HttpTransportType, Exception> _transportStarted =
LoggerMessage.Define<HttpTransportType>(LogLevel.Debug, new EventId(18, "TransportStarted"), "Transport '{Transport}' started.");
public static void Starting(ILogger logger)
{
@ -119,12 +119,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
_errorWithNegotiation(logger, url, exception);
}
public static void ErrorStartingTransport(ILogger logger, ITransport transport, Exception exception)
public static void ErrorStartingTransport(ILogger logger, HttpTransportType transportType, Exception exception)
{
if (logger.IsEnabled(LogLevel.Error))
{
_errorStartingTransport(logger, transport.GetType().Name, exception);
}
_errorStartingTransport(logger, transportType, exception);
}
public static void TransportNotSupported(ILogger logger, string transport)
@ -166,12 +163,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
_transportThrewExceptionOnStop(logger, ex);
}
public static void TransportStarted(ILogger logger, ITransport transport)
public static void TransportStarted(ILogger logger, HttpTransportType transportType)
{
if (logger.IsEnabled(LogLevel.Debug))
{
_transportStarted(logger, transport.GetType().Name, null);
}
_transportStarted(logger, transportType, null);
}
}
}

4
src/Microsoft.AspNetCore.Http.Connections.Client/HttpConnection.cs
View File

@ -342,7 +342,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
}
catch (Exception ex)
{
Log.ErrorStartingTransport(_logger, transport, ex);
Log.ErrorStartingTransport(_logger, transportType, ex);
_transport = null;
throw;
@ -357,7 +357,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
// We successfully started, set the transport properties (we don't want to set these until the transport is definitely running).
_transport = transport;
Log.TransportStarted(_logger, _transport);
Log.TransportStarted(_logger, transportType);
}
private HttpClient CreateHttpClient()

2
src/Microsoft.AspNetCore.Http.Connections.Client/HttpConnectionOptions.cs
View File

@ -67,6 +67,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
/// This delegate is invoked after headers from <see cref="Headers"/> and the access token from <see cref="AccessTokenProvider"/>
/// has been applied.
/// </remarks>
public Action<ClientWebSocketOptions> WebSocketOptions { get; set; }
public Action<ClientWebSocketOptions> WebSocketConfiguration { get; set; }
}
}

8
src/Microsoft.AspNetCore.Http.Connections.Client/Internal/AccessTokenHttpMessageHandler.cs
View File

@ -11,16 +11,16 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
{
public class AccessTokenHttpMessageHandler : DelegatingHandler
{
private readonly Func<Task<string>> _accessTokenFactory;
private readonly Func<Task<string>> _accessTokenProvider;
public AccessTokenHttpMessageHandler(HttpMessageHandler inner, Func<Task<string>> accessTokenFactory) : base(inner)
public AccessTokenHttpMessageHandler(HttpMessageHandler inner, Func<Task<string>> accessTokenProvider) : base(inner)
{
_accessTokenFactory = accessTokenFactory ?? throw new ArgumentNullException(nameof(accessTokenFactory));
_accessTokenProvider = accessTokenProvider ?? throw new ArgumentNullException(nameof(accessTokenProvider));
}
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
var accessToken = await _accessTokenFactory();
var accessToken = await _accessTokenProvider();
request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
return await base.SendAsync(request, cancellationToken);

10
src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.cs
View File

@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
public partial class WebSocketsTransport : ITransport
{
private readonly ClientWebSocket _webSocket;
private readonly Func<Task<string>> _accessTokenFactory;
private readonly Func<Task<string>> _accessTokenProvider;
private IDuplexPipe _application;
private WebSocketMessageType _webSocketMessageType;
private readonly ILogger _logger;
@ -81,10 +81,10 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
if (httpConnectionOptions.AccessTokenProvider != null)
{
_accessTokenFactory = httpConnectionOptions.AccessTokenProvider;
_accessTokenProvider = httpConnectionOptions.AccessTokenProvider;
}
httpConnectionOptions.WebSocketOptions?.Invoke(_webSocket.Options);
httpConnectionOptions.WebSocketConfiguration?.Invoke(_webSocket.Options);
_closeTimeout = httpConnectionOptions.CloseTimeout;
}
@ -116,9 +116,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
Log.StartTransport(_logger, transferFormat, resolvedUrl);
if (_accessTokenFactory != null)
if (_accessTokenProvider != null)
{
var accessToken = await _accessTokenFactory();
var accessToken = await _accessTokenProvider();
_webSocket.Options.SetRequestHeader("Authorization", $"Bearer {accessToken}");
}

6
test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/HubConnectionTests.cs
View File

@ -706,7 +706,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
{
using (StartLog(out var loggerFactory, $"{nameof(ClientCanUseJwtBearerTokenForAuthentication)}_{transportType}"))
{
async Task<string> AccessTokenFactory()
async Task<string> AccessTokenProvider()
{
var httpResponse = await new HttpClient().GetAsync(_serverFixture.Url + "/generateJwtToken");
httpResponse.EnsureSuccessStatusCode();
@ -717,7 +717,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
.WithLoggerFactory(loggerFactory)
.WithUrl(_serverFixture.Url + "/authorizedhub", transportType, options =>
{
options.AccessTokenProvider = AccessTokenFactory;
options.AccessTokenProvider = AccessTokenProvider;
})
.Build();
try
@ -784,7 +784,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
.WithLoggerFactory(loggerFactory)
.WithUrl(_serverFixture.Url + "/default", HttpTransportType.WebSockets, options =>
{
options.WebSocketOptions = o => o.Cookies = cookieJar;
options.WebSocketConfiguration = o => o.Cookies = cookieJar;
})
.Build();
try

4
test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Helpers.cs
View File

@ -22,13 +22,13 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
ITransport transport = null,
ITransportFactory transportFactory = null,
HttpTransportType? transportType = null,
Func<Task<string>> accessTokenFactory = null)
Func<Task<string>> accessTokenProvider = null)
{
var httpOptions = new HttpConnectionOptions
{
Transports = transportType ?? HttpTransportType.LongPolling,
HttpMessageHandlerFactory = (httpMessageHandler) => httpHandler ?? TestHttpMessageHandler.CreateDefault(),
AccessTokenProvider = accessTokenFactory,
AccessTokenProvider = accessTokenProvider,
};
if (url != null)
{

1
test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Negotiate.cs
View File

@ -7,6 +7,7 @@ using System.Net;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Connections;
using Microsoft.AspNetCore.Http.Connections;
using Microsoft.AspNetCore.Http.Connections.Client;
using Microsoft.AspNetCore.Http.Connections.Client.Internal;
using Moq;
using Newtonsoft.Json;

4
test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Transport.cs
View File

@ -51,14 +51,14 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
return await next();
});
Task<string> AccessTokenFactory()
Task<string> AccessTokenProvider()
{
callCount++;
return Task.FromResult(callCount.ToString());
}
await WithConnectionAsync(
CreateConnection(testHttpHandler, transportType: transportType, accessTokenFactory: AccessTokenFactory),
CreateConnection(testHttpHandler, transportType: transportType, accessTokenProvider: AccessTokenProvider),
async (connection) =>
{
await connection.StartAsync(TransferFormat.Text).OrTimeout();

2
test/Microsoft.AspNetCore.SignalR.Tests/WebSocketsTransportTests.cs
View File

@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
httpOptions.UseDefaultCredentials = false;
httpOptions.Credentials = Mock.Of<ICredentials>();
httpOptions.Proxy = Mock.Of<IWebProxy>();
httpOptions.WebSocketOptions = options => webSocketsOptions = options;
httpOptions.WebSocketConfiguration = options => webSocketsOptions = options;
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: httpOptions, loggerFactory: null);
Assert.NotNull(webSocketsTransport);