Merge pull request #2184 from aspnet/release/2.1
This commit is contained in:
commit
2a236193da
|
|
@ -577,13 +577,8 @@ describe("hubConnection", () => {
|
||||||
const hubConnection = getConnectionBuilder(transportType).build();
|
const hubConnection = getConnectionBuilder(transportType).build();
|
||||||
hubConnection.serverTimeoutInMilliseconds = 100;
|
hubConnection.serverTimeoutInMilliseconds = 100;
|
||||||
|
|
||||||
const timeout = setTimeout(200, () => {
|
|
||||||
fail("Server timeout did not fire within expected interval");
|
|
||||||
});
|
|
||||||
|
|
||||||
hubConnection.start().then(() => {
|
hubConnection.start().then(() => {
|
||||||
hubConnection.onclose((error) => {
|
hubConnection.onclose((error) => {
|
||||||
clearTimeout(timeout);
|
|
||||||
expect(error).toEqual(new Error("Server timeout elapsed without receiving a message from the server."));
|
expect(error).toEqual(new Error("Server timeout elapsed without receiving a message from the server."));
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,67 @@
|
||||||
|
import { HttpResponse } from "../src/HttpClient";
|
||||||
|
import { LogLevel } from "../src/ILogger";
|
||||||
|
import { TransferFormat } from "../src/ITransport";
|
||||||
|
import { NullLogger } from "../src/Loggers";
|
||||||
|
import { LongPollingTransport } from "../src/LongPollingTransport";
|
||||||
|
import { ConsoleLogger } from "../src/Utils";
|
||||||
|
|
||||||
|
import { TestHttpClient } from "./TestHttpClient";
|
||||||
|
import { asyncit as it, PromiseSource } from "./Utils";
|
||||||
|
|
||||||
|
describe("LongPollingTransport", () => {
|
||||||
|
it("shuts down poll after timeout even if server doesn't shut it down on receiving the DELETE", async () => {
|
||||||
|
let firstPoll = true;
|
||||||
|
const pollCompleted = new PromiseSource();
|
||||||
|
const client = new TestHttpClient()
|
||||||
|
.on("GET", async (r) => {
|
||||||
|
if (firstPoll) {
|
||||||
|
firstPoll = false;
|
||||||
|
return new HttpResponse(200);
|
||||||
|
} else {
|
||||||
|
// Turn 'onabort' into a promise.
|
||||||
|
const abort = new Promise((resolve, reject) => r.abortSignal.onabort = resolve);
|
||||||
|
await abort;
|
||||||
|
|
||||||
|
// Signal that the poll has completed.
|
||||||
|
pollCompleted.resolve();
|
||||||
|
return new HttpResponse(204);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.on("DELETE", (r) => new HttpResponse(202));
|
||||||
|
const transport = new LongPollingTransport(client, null, NullLogger.instance, false, 100);
|
||||||
|
|
||||||
|
await transport.connect("http://example.com", TransferFormat.Text);
|
||||||
|
await transport.stop();
|
||||||
|
|
||||||
|
// This should complete within the shutdown timeout
|
||||||
|
await pollCompleted.promise;
|
||||||
|
});
|
||||||
|
|
||||||
|
it("sends DELETE request on stop", async () => {
|
||||||
|
let firstPoll = true;
|
||||||
|
const deleteReceived = new PromiseSource();
|
||||||
|
const pollCompleted = new PromiseSource();
|
||||||
|
const client = new TestHttpClient()
|
||||||
|
.on("GET", async (r) => {
|
||||||
|
if (firstPoll) {
|
||||||
|
firstPoll = false;
|
||||||
|
return new HttpResponse(200);
|
||||||
|
} else {
|
||||||
|
await deleteReceived.promise;
|
||||||
|
pollCompleted.resolve();
|
||||||
|
return new HttpResponse(204);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.on("DELETE", (r) => {
|
||||||
|
deleteReceived.resolve();
|
||||||
|
return new HttpResponse(202);
|
||||||
|
});
|
||||||
|
const transport = new LongPollingTransport(client, null, NullLogger.instance, false);
|
||||||
|
|
||||||
|
await transport.connect("http://example.com", TransferFormat.Text);
|
||||||
|
await transport.stop();
|
||||||
|
|
||||||
|
// This should complete, because the DELETE request triggers it to stop.
|
||||||
|
await pollCompleted.promise;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -19,15 +19,17 @@ export class LongPollingTransport implements ITransport {
|
||||||
private url: string;
|
private url: string;
|
||||||
private pollXhr: XMLHttpRequest;
|
private pollXhr: XMLHttpRequest;
|
||||||
private pollAbort: AbortController;
|
private pollAbort: AbortController;
|
||||||
|
private shutdownTimer: any; // We use 'any' because this is an object in NodeJS. But it still gets passed to clearTimeout, so it doesn't really matter
|
||||||
private shutdownTimeout: number;
|
private shutdownTimeout: number;
|
||||||
private running: boolean;
|
private running: boolean;
|
||||||
|
|
||||||
constructor(httpClient: HttpClient, accessTokenFactory: () => string | Promise<string>, logger: ILogger, logMessageContent: boolean) {
|
constructor(httpClient: HttpClient, accessTokenFactory: () => string | Promise<string>, logger: ILogger, logMessageContent: boolean, shutdownTimeout?: number) {
|
||||||
this.httpClient = httpClient;
|
this.httpClient = httpClient;
|
||||||
this.accessTokenFactory = accessTokenFactory || (() => null);
|
this.accessTokenFactory = accessTokenFactory || (() => null);
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
this.pollAbort = new AbortController();
|
this.pollAbort = new AbortController();
|
||||||
this.logMessageContent = logMessageContent;
|
this.logMessageContent = logMessageContent;
|
||||||
|
this.shutdownTimeout = shutdownTimeout || SHUTDOWN_TIMEOUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async connect(url: string, transferFormat: TransferFormat): Promise<void> {
|
public async connect(url: string, transferFormat: TransferFormat): Promise<void> {
|
||||||
|
|
@ -107,7 +109,7 @@ export class LongPollingTransport implements ITransport {
|
||||||
this.logger.log(LogLevel.Information, "(LongPolling transport) Poll terminated by server");
|
this.logger.log(LogLevel.Information, "(LongPolling transport) Poll terminated by server");
|
||||||
|
|
||||||
// If we were on a timeout waiting for shutdown, unregister it.
|
// If we were on a timeout waiting for shutdown, unregister it.
|
||||||
clearTimeout(this.shutdownTimeout);
|
clearTimeout(this.shutdownTimer);
|
||||||
|
|
||||||
this.running = false;
|
this.running = false;
|
||||||
} else if (response.statusCode !== 200) {
|
} else if (response.statusCode !== 200) {
|
||||||
|
|
@ -179,10 +181,10 @@ export class LongPollingTransport implements ITransport {
|
||||||
} finally {
|
} finally {
|
||||||
// Abort the poll after 5 seconds if the server doesn't stop it.
|
// Abort the poll after 5 seconds if the server doesn't stop it.
|
||||||
if (!this.pollAbort.aborted) {
|
if (!this.pollAbort.aborted) {
|
||||||
this.shutdownTimeout = setTimeout(SHUTDOWN_TIMEOUT, () => {
|
this.shutdownTimer = setTimeout(() => {
|
||||||
this.logger.log(LogLevel.Warning, "(LongPolling transport) server did not terminate within 5 seconds after DELETE request, cancelling poll.");
|
this.logger.log(LogLevel.Warning, "(LongPolling transport) server did not terminate after DELETE request, canceling poll.");
|
||||||
this.pollAbort.abort();
|
this.pollAbort.abort();
|
||||||
});
|
}, this.shutdownTimeout);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -137,7 +137,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
|
||||||
_httpClient = CreateHttpClient();
|
_httpClient = CreateHttpClient();
|
||||||
}
|
}
|
||||||
|
|
||||||
_transportFactory = new DefaultTransportFactory(httpConnectionOptions.Transports, _loggerFactory, _httpClient, httpConnectionOptions);
|
_transportFactory = new DefaultTransportFactory(httpConnectionOptions.Transports, _loggerFactory, _httpClient, httpConnectionOptions, GetAccessTokenAsync);
|
||||||
_logScope = new ConnectionLogScope();
|
_logScope = new ConnectionLogScope();
|
||||||
_scopeDisposable = _logger.BeginScope(_logScope);
|
_scopeDisposable = _logger.BeginScope(_logScope);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
// Copyright (c) .NET Foundation. All rights reserved.
|
// Copyright (c) .NET Foundation. All rights reserved.
|
||||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
using System.Net.Http.Headers;
|
using System.Net.Http.Headers;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,7 @@
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
using Microsoft.AspNetCore.Http.Connections.Client;
|
using System.Threading.Tasks;
|
||||||
using Microsoft.AspNetCore.Http.Connections.Client.Internal;
|
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
|
namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
|
||||||
|
|
@ -13,11 +12,12 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
|
||||||
{
|
{
|
||||||
private readonly HttpClient _httpClient;
|
private readonly HttpClient _httpClient;
|
||||||
private readonly HttpConnectionOptions _httpConnectionOptions;
|
private readonly HttpConnectionOptions _httpConnectionOptions;
|
||||||
|
private readonly Func<Task<string>> _accessTokenProvider;
|
||||||
private readonly HttpTransportType _requestedTransportType;
|
private readonly HttpTransportType _requestedTransportType;
|
||||||
private readonly ILoggerFactory _loggerFactory;
|
private readonly ILoggerFactory _loggerFactory;
|
||||||
private static volatile bool _websocketsSupported = true;
|
private static volatile bool _websocketsSupported = true;
|
||||||
|
|
||||||
public DefaultTransportFactory(HttpTransportType requestedTransportType, ILoggerFactory loggerFactory, HttpClient httpClient, HttpConnectionOptions httpConnectionOptions)
|
public DefaultTransportFactory(HttpTransportType requestedTransportType, ILoggerFactory loggerFactory, HttpClient httpClient, HttpConnectionOptions httpConnectionOptions, Func<Task<string>> accessTokenProvider)
|
||||||
{
|
{
|
||||||
if (httpClient == null && requestedTransportType != HttpTransportType.WebSockets)
|
if (httpClient == null && requestedTransportType != HttpTransportType.WebSockets)
|
||||||
{
|
{
|
||||||
|
|
@ -28,6 +28,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
|
||||||
_loggerFactory = loggerFactory;
|
_loggerFactory = loggerFactory;
|
||||||
_httpClient = httpClient;
|
_httpClient = httpClient;
|
||||||
_httpConnectionOptions = httpConnectionOptions;
|
_httpConnectionOptions = httpConnectionOptions;
|
||||||
|
_accessTokenProvider = accessTokenProvider;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ITransport CreateTransport(HttpTransportType availableServerTransports)
|
public ITransport CreateTransport(HttpTransportType availableServerTransports)
|
||||||
|
|
@ -36,7 +37,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return new WebSocketsTransport(_httpConnectionOptions, _loggerFactory);
|
return new WebSocketsTransport(_httpConnectionOptions, _loggerFactory, _accessTokenProvider);
|
||||||
}
|
}
|
||||||
catch (PlatformNotSupportedException)
|
catch (PlatformNotSupportedException)
|
||||||
{
|
{
|
||||||
|
|
@ -46,11 +47,13 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
|
||||||
|
|
||||||
if ((availableServerTransports & HttpTransportType.ServerSentEvents & _requestedTransportType) == HttpTransportType.ServerSentEvents)
|
if ((availableServerTransports & HttpTransportType.ServerSentEvents & _requestedTransportType) == HttpTransportType.ServerSentEvents)
|
||||||
{
|
{
|
||||||
|
// We don't need to give the transport the accessTokenProvider because the HttpClient has a message handler that does the work for us.
|
||||||
return new ServerSentEventsTransport(_httpClient, _loggerFactory);
|
return new ServerSentEventsTransport(_httpClient, _loggerFactory);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((availableServerTransports & HttpTransportType.LongPolling & _requestedTransportType) == HttpTransportType.LongPolling)
|
if ((availableServerTransports & HttpTransportType.LongPolling & _requestedTransportType) == HttpTransportType.LongPolling)
|
||||||
{
|
{
|
||||||
|
// We don't need to give the transport the accessTokenProvider because the HttpClient has a message handler that does the work for us.
|
||||||
return new LongPollingTransport(_httpClient, _loggerFactory);
|
return new LongPollingTransport(_httpClient, _loggerFactory);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,12 +32,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
|
||||||
|
|
||||||
public PipeWriter Output => _transport.Output;
|
public PipeWriter Output => _transport.Output;
|
||||||
|
|
||||||
public WebSocketsTransport()
|
public WebSocketsTransport(HttpConnectionOptions httpConnectionOptions, ILoggerFactory loggerFactory, Func<Task<string>> accessTokenProvider)
|
||||||
: this(null, null)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public WebSocketsTransport(HttpConnectionOptions httpConnectionOptions, ILoggerFactory loggerFactory)
|
|
||||||
{
|
{
|
||||||
_webSocket = new ClientWebSocket();
|
_webSocket = new ClientWebSocket();
|
||||||
|
|
||||||
|
|
@ -79,11 +74,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
|
||||||
_webSocket.Options.UseDefaultCredentials = httpConnectionOptions.UseDefaultCredentials.Value;
|
_webSocket.Options.UseDefaultCredentials = httpConnectionOptions.UseDefaultCredentials.Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (httpConnectionOptions.AccessTokenProvider != null)
|
|
||||||
{
|
|
||||||
_accessTokenProvider = httpConnectionOptions.AccessTokenProvider;
|
|
||||||
}
|
|
||||||
|
|
||||||
httpConnectionOptions.WebSocketConfiguration?.Invoke(_webSocket.Options);
|
httpConnectionOptions.WebSocketConfiguration?.Invoke(_webSocket.Options);
|
||||||
|
|
||||||
_closeTimeout = httpConnectionOptions.CloseTimeout;
|
_closeTimeout = httpConnectionOptions.CloseTimeout;
|
||||||
|
|
@ -94,6 +84,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
|
||||||
_webSocket.Options.SetRequestHeader("X-Requested-With", "XMLHttpRequest");
|
_webSocket.Options.SetRequestHeader("X-Requested-With", "XMLHttpRequest");
|
||||||
|
|
||||||
_logger = (loggerFactory ?? NullLoggerFactory.Instance).CreateLogger<WebSocketsTransport>();
|
_logger = (loggerFactory ?? NullLoggerFactory.Instance).CreateLogger<WebSocketsTransport>();
|
||||||
|
|
||||||
|
// Ignore the HttpConnectionOptions access token provider. We were given an updated delegate from the HttpConnection.
|
||||||
|
_accessTokenProvider = accessTokenProvider;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task StartAsync(Uri url, TransferFormat transferFormat)
|
public async Task StartAsync(Uri url, TransferFormat transferFormat)
|
||||||
|
|
@ -116,10 +109,14 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
|
||||||
|
|
||||||
Log.StartTransport(_logger, transferFormat, resolvedUrl);
|
Log.StartTransport(_logger, transferFormat, resolvedUrl);
|
||||||
|
|
||||||
|
// We don't need to capture to a local because we never change this delegate.
|
||||||
if (_accessTokenProvider != null)
|
if (_accessTokenProvider != null)
|
||||||
{
|
{
|
||||||
var accessToken = await _accessTokenProvider();
|
var accessToken = await _accessTokenProvider();
|
||||||
_webSocket.Options.SetRequestHeader("Authorization", $"Bearer {accessToken}");
|
if (!string.IsNullOrEmpty(accessToken))
|
||||||
|
{
|
||||||
|
_webSocket.Options.SetRequestHeader("Authorization", $"Bearer {accessToken}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
await _webSocket.ConnectAsync(resolvedUrl, CancellationToken.None);
|
await _webSocket.ConnectAsync(resolvedUrl, CancellationToken.None);
|
||||||
|
|
|
||||||
|
|
@ -799,6 +799,34 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[MemberData(nameof(TransportTypes))]
|
||||||
|
public async Task ClientCanUseJwtBearerTokenForAuthenticationWhenRedirected(HttpTransportType transportType)
|
||||||
|
{
|
||||||
|
using (StartVerifableLog(out var loggerFactory, $"{nameof(ClientCanUseJwtBearerTokenForAuthenticationWhenRedirected)}_{transportType}"))
|
||||||
|
{
|
||||||
|
var hubConnection = new HubConnectionBuilder()
|
||||||
|
.WithLoggerFactory(loggerFactory)
|
||||||
|
.WithUrl(ServerFixture.Url + "/redirect", transportType)
|
||||||
|
.Build();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await hubConnection.StartAsync().OrTimeout();
|
||||||
|
var message = await hubConnection.InvokeAsync<string>(nameof(TestHub.Echo), "Hello, World!").OrTimeout();
|
||||||
|
Assert.Equal("Hello, World!", message);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
loggerFactory.CreateLogger<HubConnectionTests>().LogError(ex, "{ExceptionType} from test", ex.GetType().FullName);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
await hubConnection.DisposeAsync().OrTimeout();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
[Theory]
|
[Theory]
|
||||||
[MemberData(nameof(TransportTypes))]
|
[MemberData(nameof(TransportTypes))]
|
||||||
public async Task ClientCanSendHeaders(HttpTransportType transportType)
|
public async Task ClientCanSendHeaders(HttpTransportType transportType)
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Http;
|
||||||
using Microsoft.AspNetCore.Http.Connections;
|
using Microsoft.AspNetCore.Http.Connections;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Microsoft.IdentityModel.Tokens;
|
using Microsoft.IdentityModel.Tokens;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
|
namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
|
||||||
{
|
{
|
||||||
|
|
@ -69,6 +70,14 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
|
||||||
await context.Response.WriteAsync(GenerateJwtToken());
|
await context.Response.WriteAsync(GenerateJwtToken());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
else if (context.Request.Path.StartsWithSegments("/redirect"))
|
||||||
|
{
|
||||||
|
await context.Response.WriteAsync(JsonConvert.SerializeObject(new
|
||||||
|
{
|
||||||
|
url = $"{context.Request.Scheme}://{context.Request.Host}/authorizedHub",
|
||||||
|
accessToken = GenerateJwtToken()
|
||||||
|
}));
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ using System.Net.Http;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Microsoft.AspNetCore.Connections;
|
using Microsoft.AspNetCore.Connections;
|
||||||
using Microsoft.AspNetCore.Http.Connections;
|
using Microsoft.AspNetCore.Http.Connections;
|
||||||
using Microsoft.AspNetCore.Http.Connections.Client;
|
|
||||||
using Microsoft.AspNetCore.Http.Connections.Client.Internal;
|
using Microsoft.AspNetCore.Http.Connections.Client.Internal;
|
||||||
using Microsoft.AspNetCore.SignalR.Tests;
|
using Microsoft.AspNetCore.SignalR.Tests;
|
||||||
using Moq;
|
using Moq;
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
[InlineData((HttpTransportType)int.MaxValue)]
|
[InlineData((HttpTransportType)int.MaxValue)]
|
||||||
public void DefaultTransportFactoryCanBeCreatedWithNoOrUnknownTransportTypeFlags(HttpTransportType transportType)
|
public void DefaultTransportFactoryCanBeCreatedWithNoOrUnknownTransportTypeFlags(HttpTransportType transportType)
|
||||||
{
|
{
|
||||||
Assert.NotNull(new DefaultTransportFactory(transportType, new LoggerFactory(), new HttpClient(), httpConnectionOptions: null));
|
Assert.NotNull(new DefaultTransportFactory(transportType, new LoggerFactory(), new HttpClient(), httpConnectionOptions: null, accessTokenProvider: null));
|
||||||
}
|
}
|
||||||
|
|
||||||
[Theory]
|
[Theory]
|
||||||
|
|
@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
public void DefaultTransportFactoryCannotBeCreatedWithoutHttpClient(HttpTransportType transportType)
|
public void DefaultTransportFactoryCannotBeCreatedWithoutHttpClient(HttpTransportType transportType)
|
||||||
{
|
{
|
||||||
var exception = Assert.Throws<ArgumentNullException>(
|
var exception = Assert.Throws<ArgumentNullException>(
|
||||||
() => new DefaultTransportFactory(transportType, new LoggerFactory(), httpClient: null, httpConnectionOptions: null));
|
() => new DefaultTransportFactory(transportType, new LoggerFactory(), httpClient: null, httpConnectionOptions: null, accessTokenProvider: null));
|
||||||
|
|
||||||
Assert.Equal("httpClient", exception.ParamName);
|
Assert.Equal("httpClient", exception.ParamName);
|
||||||
}
|
}
|
||||||
|
|
@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
[Fact]
|
[Fact]
|
||||||
public void DefaultTransportFactoryCanBeCreatedWithoutHttpClientIfWebSocketsTransportRequestedExplicitly()
|
public void DefaultTransportFactoryCanBeCreatedWithoutHttpClientIfWebSocketsTransportRequestedExplicitly()
|
||||||
{
|
{
|
||||||
new DefaultTransportFactory(HttpTransportType.WebSockets, new LoggerFactory(), httpClient: null, httpConnectionOptions: null);
|
new DefaultTransportFactory(HttpTransportType.WebSockets, new LoggerFactory(), httpClient: null, httpConnectionOptions: null, accessTokenProvider: null);
|
||||||
}
|
}
|
||||||
|
|
||||||
[ConditionalTheory]
|
[ConditionalTheory]
|
||||||
|
|
@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
[WebSocketsSupportedCondition]
|
[WebSocketsSupportedCondition]
|
||||||
public void DefaultTransportFactoryCreatesRequestedTransportIfAvailable(HttpTransportType requestedTransport, Type expectedTransportType)
|
public void DefaultTransportFactoryCreatesRequestedTransportIfAvailable(HttpTransportType requestedTransport, Type expectedTransportType)
|
||||||
{
|
{
|
||||||
var transportFactory = new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpConnectionOptions: null);
|
var transportFactory = new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpConnectionOptions: null, accessTokenProvider: null);
|
||||||
Assert.IsType(expectedTransportType,
|
Assert.IsType(expectedTransportType,
|
||||||
transportFactory.CreateTransport(AllTransportTypes));
|
transportFactory.CreateTransport(AllTransportTypes));
|
||||||
}
|
}
|
||||||
|
|
@ -64,7 +64,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
public void DefaultTransportFactoryThrowsIfItCannotCreateRequestedTransport(HttpTransportType requestedTransport)
|
public void DefaultTransportFactoryThrowsIfItCannotCreateRequestedTransport(HttpTransportType requestedTransport)
|
||||||
{
|
{
|
||||||
var transportFactory =
|
var transportFactory =
|
||||||
new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpConnectionOptions: null);
|
new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpConnectionOptions: null, accessTokenProvider: null);
|
||||||
var ex = Assert.Throws<InvalidOperationException>(
|
var ex = Assert.Throws<InvalidOperationException>(
|
||||||
() => transportFactory.CreateTransport(~requestedTransport));
|
() => transportFactory.CreateTransport(~requestedTransport));
|
||||||
|
|
||||||
|
|
@ -76,7 +76,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
public void DefaultTransportFactoryCreatesWebSocketsTransportIfAvailable()
|
public void DefaultTransportFactoryCreatesWebSocketsTransportIfAvailable()
|
||||||
{
|
{
|
||||||
Assert.IsType<WebSocketsTransport>(
|
Assert.IsType<WebSocketsTransport>(
|
||||||
new DefaultTransportFactory(AllTransportTypes, loggerFactory: null, httpClient: new HttpClient(), httpConnectionOptions: null)
|
new DefaultTransportFactory(AllTransportTypes, loggerFactory: null, httpClient: new HttpClient(), httpConnectionOptions: null, accessTokenProvider: null)
|
||||||
.CreateTransport(AllTransportTypes));
|
.CreateTransport(AllTransportTypes));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -88,7 +88,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
{
|
{
|
||||||
if (!TestHelpers.IsWebSocketsSupported())
|
if (!TestHelpers.IsWebSocketsSupported())
|
||||||
{
|
{
|
||||||
var transportFactory = new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpConnectionOptions: null);
|
var transportFactory = new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpConnectionOptions: null, accessTokenProvider: null);
|
||||||
Assert.IsType(expectedTransportType,
|
Assert.IsType(expectedTransportType,
|
||||||
transportFactory.CreateTransport(AllTransportTypes));
|
transportFactory.CreateTransport(AllTransportTypes));
|
||||||
}
|
}
|
||||||
|
|
@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
if (!TestHelpers.IsWebSocketsSupported())
|
if (!TestHelpers.IsWebSocketsSupported())
|
||||||
{
|
{
|
||||||
var transportFactory =
|
var transportFactory =
|
||||||
new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpConnectionOptions: null);
|
new DefaultTransportFactory(requestedTransport, loggerFactory: null, httpClient: new HttpClient(), httpConnectionOptions: null, accessTokenProvider: null);
|
||||||
var ex = Assert.Throws<InvalidOperationException>(
|
var ex = Assert.Throws<InvalidOperationException>(
|
||||||
() => transportFactory.CreateTransport(AllTransportTypes));
|
() => transportFactory.CreateTransport(AllTransportTypes));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
httpOptions.Proxy = Mock.Of<IWebProxy>();
|
httpOptions.Proxy = Mock.Of<IWebProxy>();
|
||||||
httpOptions.WebSocketConfiguration = options => webSocketsOptions = options;
|
httpOptions.WebSocketConfiguration = options => webSocketsOptions = options;
|
||||||
|
|
||||||
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: httpOptions, loggerFactory: null);
|
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: httpOptions, loggerFactory: null, accessTokenProvider: null);
|
||||||
Assert.NotNull(webSocketsTransport);
|
Assert.NotNull(webSocketsTransport);
|
||||||
|
|
||||||
Assert.NotNull(webSocketsOptions);
|
Assert.NotNull(webSocketsOptions);
|
||||||
|
|
@ -59,7 +59,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
{
|
{
|
||||||
using (StartVerifiableLog(out var loggerFactory))
|
using (StartVerifiableLog(out var loggerFactory))
|
||||||
{
|
{
|
||||||
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory);
|
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory, accessTokenProvider: null);
|
||||||
await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/echo"),
|
await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/echo"),
|
||||||
TransferFormat.Binary).OrTimeout();
|
TransferFormat.Binary).OrTimeout();
|
||||||
await webSocketsTransport.StopAsync().OrTimeout();
|
await webSocketsTransport.StopAsync().OrTimeout();
|
||||||
|
|
@ -73,7 +73,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
{
|
{
|
||||||
using (StartVerifiableLog(out var loggerFactory))
|
using (StartVerifiableLog(out var loggerFactory))
|
||||||
{
|
{
|
||||||
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory);
|
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory, accessTokenProvider: null);
|
||||||
await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/httpheader"),
|
await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/httpheader"),
|
||||||
TransferFormat.Binary).OrTimeout();
|
TransferFormat.Binary).OrTimeout();
|
||||||
|
|
||||||
|
|
@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
{
|
{
|
||||||
using (StartVerifiableLog(out var loggerFactory))
|
using (StartVerifiableLog(out var loggerFactory))
|
||||||
{
|
{
|
||||||
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory);
|
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory, accessTokenProvider: null);
|
||||||
await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/httpheader"),
|
await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/httpheader"),
|
||||||
TransferFormat.Binary).OrTimeout();
|
TransferFormat.Binary).OrTimeout();
|
||||||
|
|
||||||
|
|
@ -124,7 +124,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
{
|
{
|
||||||
using (StartVerifiableLog(out var loggerFactory))
|
using (StartVerifiableLog(out var loggerFactory))
|
||||||
{
|
{
|
||||||
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory);
|
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory, accessTokenProvider: null);
|
||||||
await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/echo"),
|
await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/echo"),
|
||||||
TransferFormat.Binary);
|
TransferFormat.Binary);
|
||||||
webSocketsTransport.Output.Complete();
|
webSocketsTransport.Output.Complete();
|
||||||
|
|
@ -140,7 +140,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
{
|
{
|
||||||
using (StartVerifiableLog(out var loggerFactory))
|
using (StartVerifiableLog(out var loggerFactory))
|
||||||
{
|
{
|
||||||
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory);
|
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory, accessTokenProvider: null);
|
||||||
await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/echoAndClose"), transferFormat);
|
await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/echoAndClose"), transferFormat);
|
||||||
|
|
||||||
await webSocketsTransport.Output.WriteAsync(new byte[] { 0x42 });
|
await webSocketsTransport.Output.WriteAsync(new byte[] { 0x42 });
|
||||||
|
|
@ -162,7 +162,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
{
|
{
|
||||||
using (StartVerifiableLog(out var loggerFactory))
|
using (StartVerifiableLog(out var loggerFactory))
|
||||||
{
|
{
|
||||||
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory);
|
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory, accessTokenProvider: null);
|
||||||
|
|
||||||
await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/echo"),
|
await webSocketsTransport.StartAsync(new Uri(ServerFixture.WebSocketsUrl + "/echo"),
|
||||||
transferFormat).OrTimeout();
|
transferFormat).OrTimeout();
|
||||||
|
|
@ -180,7 +180,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
|
||||||
{
|
{
|
||||||
using (StartVerifiableLog(out var loggerFactory))
|
using (StartVerifiableLog(out var loggerFactory))
|
||||||
{
|
{
|
||||||
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory);
|
var webSocketsTransport = new WebSocketsTransport(httpConnectionOptions: null, loggerFactory: loggerFactory, accessTokenProvider: null);
|
||||||
var exception = await Assert.ThrowsAsync<ArgumentException>(() =>
|
var exception = await Assert.ThrowsAsync<ArgumentException>(() =>
|
||||||
webSocketsTransport.StartAsync(new Uri("http://fakeuri.org"), transferFormat));
|
webSocketsTransport.StartAsync(new Uri("http://fakeuri.org"), transferFormat));
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue