Merge pull request #2350 from MediaBrowser/beta

Beta

1 files changed, 16 insertions, 28 deletions

diff --git a/MediaBrowser.Controller/Net/LoggedAttribute.cs b/MediaBrowser.Controller/Net/LoggedAttribute.cs
index d56a015a8..6a2a5e2e3 100644
--- a/MediaBrowser.Controller/Net/LoggedAttribute.cs
+++ b/MediaBrowser.Controller/Net/LoggedAttribute.cs
@@ -2,17 +2,25 @@
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Logging;
-using ServiceStack.Web;
 using System;
+using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Controller.Net
 {
-    public class LoggedAttribute : Attribute, IHasRequestFilter
+    public class LoggedAttribute : IRequestFilter
     {
-        public ILogger Logger { get; set; }
-        public IUserManager UserManager { get; set; }
-        public ISessionManager SessionManager { get; set; }
-        public IAuthorizationContext AuthorizationContext { get; set; }
+        public LoggedAttribute(ILogger logger, IUserManager userManager, ISessionManager sessionManager, IAuthorizationContext authorizationContext)
+        {
+            Logger = logger;
+            UserManager = userManager;
+            SessionManager = sessionManager;
+            AuthorizationContext = authorizationContext;
+        }
+
+        public ILogger Logger { get; private set; }
+        public IUserManager UserManager { get; private set; }
+        public ISessionManager SessionManager { get; private set; }
+        public IAuthorizationContext AuthorizationContext { get; private set; }
 
         /// <summary>
         /// The request filter is executed before the service.
@@ -20,9 +28,9 @@ namespace MediaBrowser.Controller.Net
         /// <param name="request">The http request wrapper</param>
         /// <param name="response">The http response wrapper</param>
         /// <param name="requestDto">The request DTO</param>
-        public void RequestFilter(IRequest request, IResponse response, object requestDto)
+        public void Filter(IRequest request, IResponse response, object requestDto)
         {
-            var serviceRequest = new ServiceStackServiceRequest(request);
+            var serviceRequest = new ServiceRequest(request);
             
             //This code is executed before the service
             var auth = AuthorizationContext.GetAuthorizationInfo(serviceRequest);
@@ -51,25 +59,5 @@ namespace MediaBrowser.Controller.Net
                 }
             }
         }
-
-        /// <summary>
-        /// A new shallow copy of this filter is used on every request.
-        /// </summary>
-        /// <returns>IHasRequestFilter.</returns>
-        public IHasRequestFilter Copy()
-        {
-            return this;
-        }
-
-        /// <summary>
-        /// Order in which Request Filters are executed.
-        /// &lt;0 Executed before global request filters
-        /// &gt;0 Executed after global request filters
-        /// </summary>
-        /// <value>The priority.</value>
-        public int Priority
-        {
-            get { return 0; }
-        }
     }
 }