Remove CallCancelled property. Fix Owin query string. Add Owin user. Add Owin tests.

Author: Tratcher

src/Microsoft.AspNet.Http/HttpRequest.cs

@@ -120,12 +120,5 @@ public abstract class HttpRequest
         /// </summary>
         /// <returns>The owin.RequestBody Stream.</returns>
         public abstract Stream Body { get; set; }
-
-        /// <summary>
-        /// Gets or sets the cancellation token for the request.
-        /// </summary>
-        /// <returns>The cancellation token for the request.</returns>
-        public abstract CancellationToken CallCanceled { get; set; }
-
     }
 }

src/Microsoft.AspNet.Owin/OwinEnvironment.cs

@@ -8,11 +8,14 @@
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Security.Claims;
 using System.Security.Cryptography.X509Certificates;
+using System.Security.Principal;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.HttpFeature.Security;
 
 namespace Microsoft.AspNet.Owin
 {
@@ -28,12 +31,14 @@ public OwinEnvironment(HttpContext context)
             _context = context;
             _entries = new Dictionary<string, FeatureMap>()
             {
+                { OwinConstants.CallCancelled, new FeatureMap<IHttpRequestLifetimeFeature>(feature => feature.OnRequestAborted) },
                 { OwinConstants.RequestProtocol, new FeatureMap<IHttpRequestFeature>(feature => feature.Protocol, (feature, value) => feature.Protocol = Convert.ToString(value)) },
                 { OwinConstants.RequestScheme, new FeatureMap<IHttpRequestFeature>(feature => feature.Scheme, (feature, value) => feature.Scheme = Convert.ToString(value)) },
                 { OwinConstants.RequestMethod, new FeatureMap<IHttpRequestFeature>(feature => feature.Method, (feature, value) => feature.Method = Convert.ToString(value)) },
                 { OwinConstants.RequestPathBase, new FeatureMap<IHttpRequestFeature>(feature => feature.PathBase, (feature, value) => feature.PathBase = Convert.ToString(value)) },
                 { OwinConstants.RequestPath, new FeatureMap<IHttpRequestFeature>(feature => feature.Path, (feature, value) => feature.Path = Convert.ToString(value)) },
-                { OwinConstants.RequestQueryString, new FeatureMap<IHttpRequestFeature>(feature => feature.QueryString, (feature, value) => feature.QueryString = Convert.ToString(value)) },
+                { OwinConstants.RequestQueryString, new FeatureMap<IHttpRequestFeature>(feature => RemoveQuestionMark(feature.QueryString),
+                    (feature, value) => feature.QueryString = AddQuestionMark(Convert.ToString(value))) },
                 { OwinConstants.RequestHeaders, new FeatureMap<IHttpRequestFeature>(feature => feature.Headers, (feature, value) => feature.Headers = (IDictionary<string, string[]>)value) },
                 { OwinConstants.RequestBody, new FeatureMap<IHttpRequestFeature>(feature => feature.Body, (feature, value) => feature.Body = (Stream)value) },
 
@@ -56,6 +61,8 @@ public OwinEnvironment(HttpContext context)
                 { OwinConstants.CommonKeys.IsLocal, new FeatureMap<IHttpConnectionFeature>(feature => feature.IsLocal, (feature, value) => feature.IsLocal = Convert.ToBoolean(value)) },
 
                 { OwinConstants.SendFiles.SendAsync, new FeatureMap<IHttpSendFileFeature>(feature => new SendFileFunc(feature.SendFileAsync)) },
+
+                { OwinConstants.Security.User, new FeatureMap<IHttpAuthenticationFeature>(feature => feature.User, (feature, value) => feature.User = MakeClaimsPrincipal((IPrincipal)value)) },
             };
 
             if (context.Request.IsSecure)
@@ -222,6 +229,36 @@ IEnumerator IEnumerable.GetEnumerator()
             throw new NotImplementedException();
         }
 
+        private string RemoveQuestionMark(string queryString)
+        {
+            if (!string.IsNullOrEmpty(queryString))
+            {
+                if (queryString[0] == '?')
+                {
+                    return queryString.Substring(1);
+                }
+            }
+            return queryString;
+        }
+
+        private string AddQuestionMark(string queryString)
+        {
+            if (!string.IsNullOrEmpty(queryString))
+            {
+                return '?' + queryString;
+            }
+            return queryString;
+        }
+
+        private ClaimsPrincipal MakeClaimsPrincipal(IPrincipal principal)
+        {
+            if (principal is ClaimsPrincipal)
+            {
+                return principal as ClaimsPrincipal;
+            }
+            return new ClaimsPrincipal(principal);
+        }
+
         public class FeatureMap
         {
             public FeatureMap(Type featureInterface, Func<object, object> getter)

src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs

@@ -149,18 +149,5 @@ public override IReadableStringCollection Cookies
         {
             get { return RequestCookiesFeature.Cookies; }
         }
-
-        public override System.Threading.CancellationToken CallCanceled
-        {
-            get
-            {
-                // TODO: Which feature exposes this?
-                return CancellationToken.None;
-            }
-            set
-            {
-                throw new NotImplementedException();
-            }
-        }
     }
 }