Browse Source

Changes a suggested.

BaronGreenback 4 years ago
parent
commit
f9b0816b80

+ 1 - 2
Emby.Dlna/Api/DlnaServerService.cs

@@ -134,8 +134,7 @@ namespace Emby.Dlna.Api
             _dlnaManager = dlnaManager;
             _resultFactory = httpResultFactory;
             _configurationManager = configurationManager;
-            object request = httpContextAccessor?.HttpContext.Items["ServiceStackRequest"] ?? throw new ArgumentNullException(nameof(httpContextAccessor));
-            Request = (IRequest)request;
+            Request = httpContextAccessor?.HttpContext.GetServiceStack() ?? throw new ArgumentNullException(nameof(httpContextAccessor));
         }
 
         private string GetHeader(string name)

+ 1 - 0
Emby.Server.Implementations/Services/ServiceHandler.cs

@@ -6,6 +6,7 @@ using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.HttpServer;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Model.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;

+ 7 - 6
Emby.Server.Implementations/Services/HttpContextExtension.cs → MediaBrowser.Common/Extensions/HttpContextExtensions.cs

@@ -1,27 +1,28 @@
 using MediaBrowser.Model.Services;
 using Microsoft.AspNetCore.Http;
 
-namespace Emby.Server.Implementations.Services
+namespace MediaBrowser.Common.Extensions
 {
     /// <summary>
     /// Extention to enable the service stack request to be stored in the HttpRequest object.
+    /// Static class containing extension methods for <see cref="HttpContext"/>.
     /// </summary>
-    public static class HttpContextExtension
+    public static class HttpContextExtensions
     {
-        private const string SERVICESTACKREQUEST = "ServiceRequestStack";
+        private const string SERVICESTACKREQUEST = "ServiceStackRequest";
 
         /// <summary>
-        /// Set the service stack request.
+        /// Set the ServiceStack request.
         /// </summary>
         /// <param name="httpContext">The HttpContext instance.</param>
-        /// <param name="request">The IRequest instance.</param>
+        /// <param name="request">The service stack request instance.</param>
         public static void SetServiceStackRequest(this HttpContext httpContext, IRequest request)
         {
             httpContext.Items[SERVICESTACKREQUEST] = request;
         }
 
         /// <summary>
-        /// Get the service stack request.
+        /// Get the ServiceStack request.
         /// </summary>
         /// <param name="httpContext">The HttpContext instance.</param>
         /// <returns>The service stack request instance.</returns>