From 0765fd568f9b5572bc41e8352cf188beb60ca2f0 Mon Sep 17 00:00:00 2001 From: Cody Robibero Date: Sat, 1 Jan 2022 09:59:25 -0700 Subject: Use IAuthorizationContext for websocket --- MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs | 3 ++- MediaBrowser.Controller/Net/IWebSocketConnection.cs | 6 ------ MediaBrowser.Controller/Net/IWebSocketListener.cs | 4 +++- 3 files changed, 5 insertions(+), 8 deletions(-) (limited to 'MediaBrowser.Controller/Net') diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs index 0813a8e7d..eadc09fd4 100644 --- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs +++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs @@ -11,6 +11,7 @@ using System.Threading; using System.Threading.Tasks; using MediaBrowser.Model.Net; using MediaBrowser.Model.Session; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; namespace MediaBrowser.Controller.Net @@ -95,7 +96,7 @@ namespace MediaBrowser.Controller.Net } /// - public Task ProcessWebSocketConnectedAsync(IWebSocketConnection connection) => Task.CompletedTask; + public Task ProcessWebSocketConnectedAsync(IWebSocketConnection connection, HttpContext httpContext) => Task.CompletedTask; /// /// Starts sending messages over a web socket. diff --git a/MediaBrowser.Controller/Net/IWebSocketConnection.cs b/MediaBrowser.Controller/Net/IWebSocketConnection.cs index c8c5caf80..2c6483ae2 100644 --- a/MediaBrowser.Controller/Net/IWebSocketConnection.cs +++ b/MediaBrowser.Controller/Net/IWebSocketConnection.cs @@ -29,12 +29,6 @@ namespace MediaBrowser.Controller.Net /// The date of last Keeplive received. DateTime LastKeepAliveDate { get; set; } - /// - /// Gets the query string. - /// - /// The query string. - IQueryCollection QueryString { get; } - /// /// Gets or sets the receive action. /// diff --git a/MediaBrowser.Controller/Net/IWebSocketListener.cs b/MediaBrowser.Controller/Net/IWebSocketListener.cs index f1a75d518..672bb8cbf 100644 --- a/MediaBrowser.Controller/Net/IWebSocketListener.cs +++ b/MediaBrowser.Controller/Net/IWebSocketListener.cs @@ -1,4 +1,5 @@ using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; namespace MediaBrowser.Controller.Net { @@ -18,7 +19,8 @@ namespace MediaBrowser.Controller.Net /// Processes a new web socket connection. /// /// An instance of the interface. + /// The current http context. /// Task. - Task ProcessWebSocketConnectedAsync(IWebSocketConnection connection); + Task ProcessWebSocketConnectedAsync(IWebSocketConnection connection, HttpContext httpContext); } } -- cgit v1.2.3