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

Merge pull request #2186 from aspnet/release/2.1 

Fix not setting HttpConnection.ConnectionId (#2154)
This commit is contained in:
James Newton-King 2018-05-01 23:01:20 -07:00 committed by GitHub
parent 914d32b049 41c8dcf449
commit 9f40bd639f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,8 +68,19 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
/// <inheritdoc />
public override IFeatureCollection Features { get; } = new FeatureCollection();
/// <inheritdoc />
public override string ConnectionId { get; set; }
/// <summary>
/// Gets or sets the connection ID.
/// </summary>
/// <remarks>
/// The connection ID is set when the <see cref="HttpConnection"/> is started and should not be set by user code.
/// If the connection was created with <see cref="HttpConnectionOptions.SkipNegotiation"/> set to <c>true</c>
/// then the connection ID will be <c>null</c>.
/// </remarks>
public override string ConnectionId
{
get => _connectionId;
set => throw new InvalidOperationException("The ConnectionId is set internally and should not be set by user code.");
}
/// <inheritdoc />
public override IDictionary<object, object> Items { get; set; } = new ConnectionItems();

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

@ -82,6 +82,42 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
Assert.Equal(expectedNegotiate, await negotiateUrlTcs.Task.OrTimeout());
}
[Fact]
public async Task NegotiateReturnedConenctionIdIsSetOnConnection()
{
string connectionId = null;
var testHttpHandler = new TestHttpMessageHandler(autoNegotiate: false);
testHttpHandler.OnNegotiate((request, cancellationToken) => ResponseUtils.CreateResponse(HttpStatusCode.OK,
JsonConvert.SerializeObject(new
{
connectionId = "0rge0d00-0040-0030-0r00-000q00r00e00",
availableTransports = new object[]
{
new
{
transport = "LongPolling",
transferFormats = new[] { "Text" }
},
}
})));
testHttpHandler.OnLongPoll(cancellationToken => ResponseUtils.CreateResponse(HttpStatusCode.NoContent));
testHttpHandler.OnLongPollDelete((token) => ResponseUtils.CreateResponse(HttpStatusCode.Accepted));
using (var noErrorScope = new VerifyNoErrorsScope())
{
await WithConnectionAsync(
CreateConnection(testHttpHandler, loggerFactory: noErrorScope.LoggerFactory),
async (connection) =>
{
await connection.StartAsync(TransferFormat.Text).OrTimeout();
connectionId = connection.ConnectionId;
});
}
Assert.Equal("0rge0d00-0040-0030-0r00-000q00r00e00", connectionId);
}
[Fact]
public async Task NegotiateThatReturnsUrlGetFollowed()
{

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

@ -40,6 +40,14 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests
Assert.Equal("httpConnectionOptions", exception.ParamName);
}
[Fact]
public void CannotSetConnectionId()
{
var connection = new HttpConnection(new Uri("http://fakeuri.org/"));
var exception = Assert.Throws<InvalidOperationException>(() => connection.ConnectionId = "custom conneciton ID");
Assert.Equal("The ConnectionId is set internally and should not be set by user code.", exception.Message);
}
[Fact]
public async Task HttpOptionsSetOntoHttpClientHandler()
{