Fixed coding style :P

SignalR · Jul 31, 2011 · 3b93a20 · 3b93a20
1 parent 3f951ce
commit 3b93a20
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/SignalR/Hubs/HubContext.cs b/SignalR/Hubs/HubContext.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Security.Principal;
 using System.Web;
 
 namespace SignalR.Hubs {
@@ -16,9 +13,12 @@ public class HubContext {
         /// </summary>
         public HttpCookieCollection Cookies { get; private set; }
 
-        public HubContext(string clientId, HttpCookieCollection cookies) {
+        public IPrincipal User { get; private set; }
+
+        public HubContext(string clientId, HttpCookieCollection cookies, IPrincipal user) {
             ClientId = clientId;
             Cookies = cookies;
+            User = user;
         }
     }
 }
diff --git a/SignalR/Hubs/HubDispatcher.cs b/SignalR/Hubs/HubDispatcher.cs
@@ -8,6 +8,7 @@
 using System.Web;
 using System.Web.Script.Serialization;
 using SignalR.Infrastructure;
+using System.Security.Principal;
 
 namespace SignalR.Hubs {
     public class HubDispatcher : PersistentConnection {
@@ -25,6 +26,7 @@ public class HubDispatcher : PersistentConnection {
         private readonly IJavaScriptProxyGenerator _proxyGenerator;
         private readonly string _url;
         private HttpCookieCollection _cookies;
+        private IPrincipal _user;
 
         public HubDispatcher(string url)
             : this(DependencyResolver.Resolve<IHubFactory>(),
@@ -71,7 +73,7 @@ public HubDispatcher(string url)
             string hubName = hub.GetType().FullName;
 
             var state = new TrackingDictionary(hubRequest.State);
-            hub.Context = new HubContext(clientId, _cookies);
+            hub.Context = new HubContext(clientId, _cookies, _user);
             hub.Caller = new SignalAgent(Connection, clientId, hubName, state);
             var agent = new ClientAgent(Connection, hubName);
             hub.Agent = agent;
@@ -124,7 +126,7 @@ public HubDispatcher(string url)
                 }
             }
             catch (TargetInvocationException e) {
-                ProcessResult(state, null, hubRequest, e.GetBaseException());
+                ProcessResult(state, null, hubRequest, e);
             }
 
             return base.OnReceivedAsync(clientId, data);
@@ -139,6 +141,8 @@ public HubDispatcher(string url)
             }
 
             _cookies = context.Request.Cookies;
+            _user = context.User;
+
             return base.ProcessRequestAsync(context);
         }
 

diff --git a/SignalR/Hubs/HubMethodNameAttribute.cs b/SignalR/Hubs/HubMethodNameAttribute.cs
@@ -3,17 +3,16 @@
 namespace SignalR.Hubs {
     [AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = false)]
     public sealed class HubMethodNameAttribute : Attribute {
-        private readonly string methodName;
-
         public HubMethodNameAttribute(string methodName) {
             if (String.IsNullOrEmpty(methodName)) {
                 throw new ArgumentNullException("methodName");
             }
-            this.methodName = methodName;
+            MethodName = methodName;
         }
 
         public string MethodName {
-            get { return methodName; }
+            get;
+            private set;
         }
     }
 }
diff --git a/SignalR/Hubs/HubNameAttribute.cs b/SignalR/Hubs/HubNameAttribute.cs
@@ -2,18 +2,17 @@
 
 namespace SignalR.Hubs {
     [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
-    public sealed class HubNameAttribute : Attribute {
-        private readonly string hubName;
-
+    public sealed class HubNameAttribute : Attribute {    
         public HubNameAttribute(string hubName) {
             if (String.IsNullOrEmpty(hubName)) {
                 throw new ArgumentNullException("hubName");
             }
-            this.hubName = hubName;
+            HubName = hubName;
         }
 
         public string HubName {
-            get { return hubName; }
+            get;
+            private set;
         }
     }
 }