Added the ability to get the logged in user from the current thread if the http context is unavailable

Author: niemyjski

Source/Platforms/Web/ExceptionlessWebPlugin.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Web;
 using Exceptionless.Dependency;
 using Exceptionless.Plugins;
@@ -17,16 +18,13 @@ public void Run(EventPluginContext context) {
             // if the context is not passed in, try and grab it
             if (httpContext == null && HttpContext.Current != null)
                 httpContext = HttpContext.Current.ToWrapped();
+            
+            var serializer = context.Client.Configuration.Resolver.GetJsonSerializer();
+            if (context.Client.Configuration.IncludePrivateInformation)
+                AddUser(context, httpContext, serializer);
 
             if (httpContext == null)
                 return;
-            
-            var serializer = context.Client.Configuration.Resolver.GetJsonSerializer();
-            if (context.Client.Configuration.IncludePrivateInformation && httpContext.User != null && httpContext.User.Identity.IsAuthenticated) {
-                var user = context.Event.GetUserIdentity(serializer);
-                if (user == null)
-                    context.Event.SetUserIdentity(httpContext.User.Identity.Name);
-            }
 
             var tags = httpContext.Items[TAGS_HTTP_CONTEXT_NAME] as TagSet;
             if (tags != null)
@@ -56,5 +54,16 @@ public void Run(EventPluginContext context) {
 
             context.Event.AddRequestInfo(ri);
         }
+
+        private static void AddUser(EventPluginContext context, HttpContextBase httpContext, IJsonSerializer serializer) {
+            var user = context.Event.GetUserIdentity(serializer);
+            if (user != null)
+                return;
+
+            if (httpContext != null && httpContext.User != null && httpContext.User.Identity.IsAuthenticated)
+                context.Event.SetUserIdentity(httpContext.User.Identity.Name);
+            else if (Thread.CurrentPrincipal != null && Thread.CurrentPrincipal.Identity.IsAuthenticated)
+                context.Event.SetUserIdentity(Thread.CurrentPrincipal.Identity.Name);
+        }
     }
 }

Source/Platforms/WebApi/ExceptionlessWebApiPlugin.cs

@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Security.Principal;
 using System.Threading;
+using System.Web.Http.Controllers;
 using Exceptionless.Dependency;
 using Exceptionless.Plugins;
 using Exceptionless.Extensions;
@@ -15,23 +16,14 @@ namespace Exceptionless.WebApi {
     [Priority(90)]
     internal class ExceptionlessWebApiPlugin : IEventPlugin {
         public void Run(EventPluginContext context) {
-            if (!context.ContextData.ContainsKey("HttpActionContext"))
-                return;
-
             var actionContext = context.ContextData.GetHttpActionContext();
+            var serializer = context.Client.Configuration.Resolver.GetJsonSerializer();
+            if (context.Client.Configuration.IncludePrivateInformation)
+                AddUser(context, actionContext, serializer);
+
             if (actionContext == null)
                 return;
 
-            var serializer = context.Client.Configuration.Resolver.GetJsonSerializer();
-            if (context.Client.Configuration.IncludePrivateInformation) {
-                var user = context.Event.GetUserIdentity(serializer);
-                if (user == null) {
-                    IPrincipal principal = GetPrincipal(actionContext.Request);
-                    if (principal != null && principal.Identity.IsAuthenticated)
-                        context.Event.SetUserIdentity(principal.Identity.Name);
-                }
-            }
-
             var ri = context.Event.GetRequestInfo(serializer);
             if (ri != null)
                 return;
@@ -54,9 +46,19 @@ public void Run(EventPluginContext context) {
             context.Event.AddRequestInfo(ri);
         }
 
+        private static void AddUser(EventPluginContext context, HttpActionContext actionContext, IJsonSerializer serializer) {
+            var user = context.Event.GetUserIdentity(serializer);
+            if (user != null)
+                return;
+
+            var principal = GetPrincipal(actionContext != null ? actionContext.Request : null);
+            if (principal != null && principal.Identity.IsAuthenticated)
+                context.Event.SetUserIdentity(principal.Identity.Name);
+        }
+
         private static IPrincipal GetPrincipal(HttpRequestMessage request) {
             if (request == null)
-                throw new ArgumentNullException("request");
+                return Thread.CurrentPrincipal;
 
             const string RequestContextKey = "MS_RequestContext";
 
@@ -73,7 +75,6 @@ private static IPrincipal GetPrincipal(HttpRequestMessage request) {
             }
 
             var principal = _principalGetAccessor(context) as IPrincipal;
-
             return principal ?? Thread.CurrentPrincipal;
         }
 

Source/Samples/SampleWebApi/Controllers/ValuesController.cs

@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Web.Http;
+using Exceptionless.Logging;
 
 namespace Exceptionless.SampleWebApi.Controllers {
     public class ValuesController : ApiController {
         // GET api/values
         public IEnumerable<string> Get() {
+            ExceptionlessClient.Default.SubmitLog("ValuesController", "Getting results", LogLevel.Info);
             throw new ApplicationException("WebApi GET error");
         }