Add form and query helpers needed for Facebook auth.

src/Microsoft.AspNet.Http/IBuilder.cs

@@ -2,17 +2,22 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Collections.Generic;
 
 namespace Microsoft.AspNet.Builder
 {
     public interface IBuilder
     {
         IServiceProvider ApplicationServices { get; set; }
+
         IServerInformation Server { get; set; }
 
+        IDictionary<string, object> Properties { get; set; }
+
         IBuilder Use(Func<RequestDelegate, RequestDelegate> middleware);
 
         IBuilder New();
+
         RequestDelegate Build();
     }
 }

src/Microsoft.AspNet.PipelineCore/Builder.cs

@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Http.Infrastructure;
 
 namespace Microsoft.AspNet.Builder
 {
@@ -15,17 +16,51 @@ public class Builder : IBuilder
 
         public Builder(IServiceProvider serviceProvider)
         {
+            Properties = new Dictionary<string, object>();
             ApplicationServices = serviceProvider;
         }
 
         private Builder(Builder builder)
         {
-            ApplicationServices = builder.ApplicationServices;
-            Server = builder.Server;
+            Properties = builder.Properties;
         }
 
-        public IServiceProvider ApplicationServices { get; set; }
-        public IServerInformation Server { get; set; }
+        public IServiceProvider ApplicationServices
+        {
+            get
+            {
+                return GetProperty<IServiceProvider>(Constants.BuilderProperties.ApplicationServices);
+            }
+            set
+            {
+                SetProperty<IServiceProvider>(Constants.BuilderProperties.ApplicationServices, value);
+            }
+        }
+
+        public IServerInformation Server
+        {
+            get
+            {
+                return GetProperty<IServerInformation>(Constants.BuilderProperties.ServerInformation);
+            }
+            set
+            {
+                SetProperty<IServerInformation>(Constants.BuilderProperties.ServerInformation, value);
+            }
+        }
+
+        public IDictionary<string, object> Properties { get; set; }
+
+        private T GetProperty<T>(string key)
+        {
+            object value;
+            return Properties.TryGetValue(key, out value) ? (T)value : default(T);
+        }
+
+        private void SetProperty<T>(string key, T value)
+        {
+            Properties[key] = value;
+        }
 
         public IBuilder Use(Func<RequestDelegate, RequestDelegate> middleware)
         {

src/Microsoft.AspNet.PipelineCore/FormFeature.cs

@@ -9,8 +9,9 @@
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.HttpFeature;
-using Microsoft.AspNet.PipelineCore.Collections;
 using Microsoft.AspNet.PipelineCore.Infrastructure;
+using Microsoft.AspNet.WebUtilities;
+using Microsoft.AspNet.WebUtilities.Collections;
 
 namespace Microsoft.AspNet.PipelineCore
 {
@@ -60,8 +61,8 @@ public async Task<IReadableStringCollection> GetFormAsync(CancellationToken canc
                                                            detectEncodingFromByteOrderMarks: true,
                                                            bufferSize: 1024, leaveOpen: true))
                 {
-                    string formQuery = await streamReader.ReadToEndAsync();
-                    _form = new ReadableStringCollection(ParsingHelpers.GetQuery(formQuery));
+                    string form = await streamReader.ReadToEndAsync();
+                    _form = FormHelpers.ParseForm(form);
                 }
             }
             return _form;

src/Microsoft.AspNet.PipelineCore/Infrastructure/Constants.cs

@@ -25,5 +25,11 @@ internal static class Headers
             internal const string Expires = "Expires";
             internal const string WebSocketSubProtocols = "Sec-WebSocket-Protocol";
         }
+
+        internal static class BuilderProperties
+        {
+            internal static string ServerInformation = "server.Information";
+            internal static string ApplicationServices = "application.Services";
+        }
     }
 }

src/Microsoft.AspNet.PipelineCore/Infrastructure/ParsingHelpers.cs

@@ -818,18 +818,6 @@ internal static IDictionary<string, string[]> GetQuery(string queryString)
                     StringComparer.OrdinalIgnoreCase);
         }
 
-        internal static IFormCollection GetForm(string text)
-        {
-            IDictionary<string, string[]> form = new Dictionary<string, string[]>(StringComparer.OrdinalIgnoreCase);
-            var accumulator = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
-            ParseDelimited(text, new[] { '&' }, AppendItemCallback, accumulator);
-            foreach (var kv in accumulator)
-            {
-                form.Add(kv.Key, kv.Value.ToArray());
-            }
-            return new FormCollection(form);
-        }
-
         internal static string GetJoinedValue(IDictionary<string, string[]> store, string key)
         {
             string[] values = GetUnmodifiedValues(store, key);

src/Microsoft.AspNet.PipelineCore/QueryFeature.cs

@@ -5,8 +5,8 @@
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.HttpFeature;
-using Microsoft.AspNet.PipelineCore.Collections;
 using Microsoft.AspNet.PipelineCore.Infrastructure;
+using Microsoft.AspNet.WebUtilities.Collections;
 
 namespace Microsoft.AspNet.PipelineCore
 {

src/Microsoft.AspNet.PipelineCore/RequestCookiesFeature.cs

@@ -9,6 +9,7 @@
 using Microsoft.AspNet.HttpFeature;
 using Microsoft.AspNet.PipelineCore.Collections;
 using Microsoft.AspNet.PipelineCore.Infrastructure;
+using Microsoft.AspNet.WebUtilities.Collections;
 
 namespace Microsoft.AspNet.PipelineCore
 {

src/Microsoft.AspNet.PipelineCore/project.json

@@ -4,7 +4,8 @@
   "dependencies": {
     "Microsoft.AspNet.FeatureModel": "",
     "Microsoft.AspNet.Http": "",
-    "Microsoft.AspNet.HttpFeature": ""
+    "Microsoft.AspNet.HttpFeature": "",
+    "Microsoft.AspNet.WebUtilities": ""
   },
   "frameworks": {
     "net45": {},

src/Microsoft.AspNet.PipelineCore/Collections/FormCollection.cs → src/Microsoft.AspNet.WebUtilities/Collections/FormCollection.cs

@@ -4,15 +4,15 @@
 using Microsoft.AspNet.Http;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.PipelineCore.Collections
+namespace Microsoft.AspNet.WebUtilities.Collections
 {
     /// <summary>
     /// Contains the parsed form values.
     /// </summary>
     public class FormCollection : ReadableStringCollection, IFormCollection
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="T:Microsoft.Owin.FormCollection" /> class.
+        /// Initializes a new instance of the <see cref="T:Microsoft.AspNet.WebUtilities.FormCollection" /> class.
         /// </summary>
         /// <param name="store">The store for the form.</param>
         public FormCollection(IDictionary<string, string[]> store)

src/Microsoft.AspNet.PipelineCore/Collections/ReadableStringCollection.cs → src/Microsoft.AspNet.WebUtilities/Collections/ReadableStringCollection.cs

@@ -4,11 +4,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Microsoft.AspNet.Http.Infrastructure;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.PipelineCore.Infrastructure;
 
-namespace Microsoft.AspNet.PipelineCore.Collections
+namespace Microsoft.AspNet.WebUtilities.Collections
 {
     /// <summary>
     /// Accessors for query, forms, etc.

src/Microsoft.AspNet.WebUtilities/FormHelpers.cs

@@ -0,0 +1,18 @@
+using System;
+using Microsoft.AspNet.Http;
+
+namespace Microsoft.AspNet.WebUtilities
+{
+    public static class FormHelpers
+    {
+        /// <summary>
+        /// Parses an HTTP form body.
+        /// </summary>
+        /// <param name="text">The HTTP form body to parse.</param>
+        /// <returns>The <see cref="T:Microsoft.Owin.IFormCollection" /> object containing the parsed HTTP form body.</returns>
+        public static IFormCollection ParseForm(string text)
+        {
+            return ParsingHelpers.GetForm(text);
+        }
+    }
+}

src/Microsoft.AspNet.WebUtilities/NotNullAttribute.cs

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNet.WebUtilities
+{
+    [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)]
+    internal sealed class NotNullAttribute : Attribute
+    {
+    }
+}

src/Microsoft.AspNet.WebUtilities/ParsingHelpers.cs

@@ -0,0 +1,94 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNet.Http;
+using Microsoft.AspNet.WebUtilities.Collections;
+
+namespace Microsoft.AspNet.WebUtilities
+{
+    internal static partial class ParsingHelpers
+    {
+        internal static void ParseDelimited(string text, char[] delimiters, Action<string, string, object> callback, object state)
+        {
+            int textLength = text.Length;
+            int equalIndex = text.IndexOf('=');
+            if (equalIndex == -1)
+            {
+                equalIndex = textLength;
+            }
+            int scanIndex = 0;
+            while (scanIndex < textLength)
+            {
+                int delimiterIndex = text.IndexOfAny(delimiters, scanIndex);
+                if (delimiterIndex == -1)
+                {
+                    delimiterIndex = textLength;
+                }
+                if (equalIndex < delimiterIndex)
+                {
+                    while (scanIndex != equalIndex && char.IsWhiteSpace(text[scanIndex]))
+                    {
+                        ++scanIndex;
+                    }
+                    string name = text.Substring(scanIndex, equalIndex - scanIndex);
+                    string value = text.Substring(equalIndex + 1, delimiterIndex - equalIndex - 1);
+                    callback(
+                        Uri.UnescapeDataString(name.Replace('+', ' ')),
+                        Uri.UnescapeDataString(value.Replace('+', ' ')),
+                        state);
+                    equalIndex = text.IndexOf('=', delimiterIndex);
+                    if (equalIndex == -1)
+                    {
+                        equalIndex = textLength;
+                    }
+                }
+                scanIndex = delimiterIndex + 1;
+            }
+        }
+
+        private static readonly Action<string, string, object> AppendItemCallback = (name, value, state) =>
+        {
+            var dictionary = (IDictionary<string, List<String>>)state;
+
+            List<string> existing;
+            if (!dictionary.TryGetValue(name, out existing))
+            {
+                dictionary.Add(name, new List<string>(1) { value });
+            }
+            else
+            {
+                existing.Add(value);
+            }
+        };
+
+        internal static IFormCollection GetForm(string text)
+        {
+            IDictionary<string, string[]> form = new Dictionary<string, string[]>(StringComparer.OrdinalIgnoreCase);
+            var accumulator = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
+            ParseDelimited(text, new[] { '&' }, AppendItemCallback, accumulator);
+            foreach (var kv in accumulator)
+            {
+                form.Add(kv.Key, kv.Value.ToArray());
+            }
+            return new FormCollection(form);
+        }
+
+        internal static string GetJoinedValue(IDictionary<string, string[]> store, string key)
+        {
+            string[] values = GetUnmodifiedValues(store, key);
+            return values == null ? null : string.Join(",", values);
+        }
+
+        internal static string[] GetUnmodifiedValues(IDictionary<string, string[]> store, string key)
+        {
+            if (store == null)
+            {
+                throw new ArgumentNullException("store");
+            }
+            string[] values;
+            return store.TryGetValue(key, out values) ? values : null;
+        }
+    }
+}

src/Microsoft.AspNet.WebUtilities/QueryHelpers.cs

@@ -0,0 +1,20 @@
+using System;
+
+namespace Microsoft.AspNet.WebUtilities
+{
+    public static class QueryHelpers
+    {
+        /// <summary>
+        /// Append the given query key and value to the uri.
+        /// </summary>
+        /// <param name="uri">The base uri.</param>
+        /// <param name="name">The name of the query key.</param>
+        /// <param name="value">The query value.</param>
+        /// <returns>The combine result.</returns>
+        public static string AddQueryString([NotNull] string uri, [NotNull] string name, [NotNull] string value)
+        {
+            bool hasQuery = uri.IndexOf('?') != -1;
+            return uri + (hasQuery ? "&" : "?") + Uri.EscapeDataString(name) + "=" + Uri.EscapeDataString(value);
+        }
+    }
+}