Merge pull request #18 from stormpath/fix-post-content-type

Version 0.1.2

src/Stormpath.Owin.Abstractions/DefaultOwinResponse.cs

@@ -57,6 +57,11 @@ public string ReasonPhrase
             set { environment.SetOrRemove(OwinKeys.ResponseReasonPhrase, value); }
         }
 
+        public Action<Action<object>, object> OnSendingHeaders
+        {
+            get { return environment.Get<Action<Action<object>, object>>(OwinKeys.OnSendingHeaders); }
+        }
+
         public object this[string key]
         {
             get { return environment.Get(key); }

src/Stormpath.Owin.Abstractions/IOwinResponse.cs

@@ -14,6 +14,7 @@
 // limitations under the License.
 // </copyright>
 
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -28,6 +29,8 @@ public interface IOwinResponse
         IDictionary<string, string[]> Headers { get; }
         string ReasonPhrase { set; }
         int StatusCode { set; }
+        Action<Action<object>, object> OnSendingHeaders { get; }
+
         object this[string key] { get; set; }
 
         Task WriteAsync(string text, Encoding encoding, CancellationToken cancellationToken = default(CancellationToken));

src/Stormpath.Owin.Abstractions/OwinKeys.cs

@@ -53,6 +53,8 @@ public static class OwinKeys
 
         public static readonly string CallCancelled = "owin.CallCancelled";
 
+        public static readonly string OnSendingHeaders = "server.OnSendingHeaders";
+
         public static readonly string StormpathClient = "Stormpath.RequestClient";
 
         public static readonly string StormpathUser = "Stormpath.RequestUser";

src/Stormpath.Owin.Abstractions/project.json

@@ -25,6 +25,6 @@
   "tooling": {
     "defaultNamespace": "Stormpath.Owin.Abstractions"
   },
-  "version": "0.1.0",
+  "version": "0.1.2",
   "xmlDoc": true
 }

src/Stormpath.Owin.Middleware/Internal/Caching.cs

@@ -0,0 +1,32 @@
+// <copyright file="Caching.cs" company="Stormpath, Inc.">
+// Copyright (c) 2016 Stormpath, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </copyright>
+
+using Stormpath.Owin.Abstractions;
+
+namespace Stormpath.Owin.Middleware.Internal
+{
+    public static class Caching
+    {
+        public static void AddDoNotCacheHeaders(IOwinEnvironment context)
+        {
+            context.Response.OnSendingHeaders(state =>
+            {
+                context.Response.Headers.SetString("Cache-Control", "no-cache, no-store");
+                context.Response.Headers.SetString("Pragma", "no-cache");
+            }, null);
+        }
+    }
+}

src/Stormpath.Owin.Middleware/Internal/ContentNegotiation.cs

@@ -22,7 +22,7 @@ namespace Stormpath.Owin.Middleware.Internal
 {
     public static class ContentNegotiation
     {
-        public static ContentNegotiationResult Negotiate(string acceptHeader, IEnumerable<string> producesList)
+        public static ContentNegotiationResult NegotiateAcceptHeader(string acceptHeader, IEnumerable<string> producesList)
         {
             if (string.IsNullOrEmpty(acceptHeader))
             {
@@ -37,21 +37,29 @@ public static ContentNegotiationResult Negotiate(string acceptHeader, IEnumerabl
                 {
                     return new ContentNegotiationResult(
                         success: true,
-                        prefers: ContentType.Parse(producesList.First()));
+                        contentType: ContentType.Parse(producesList.First()));
                 }
 
                 if (producesList.Contains(potentialContentType))
                 {
                     return new ContentNegotiationResult(
                         success: true,
-                        prefers: ContentType.Parse(potentialContentType));
+                        contentType: ContentType.Parse(potentialContentType));
                 }
             }
 
             // Negotiation failed
             return new ContentNegotiationResult(
                 success: false,
-                prefers: ContentType.Parse(sortedAccept.First()));
+                contentType: ContentType.Parse(sortedAccept.First()));
+        }
+
+        public static ContentNegotiationResult DetectBodyType(string bodyContentType)
+        {
+            var parsed = ContentType.Parse(bodyContentType);
+            var isValid = parsed == ContentType.FormUrlEncoded || parsed == ContentType.Json;
+
+            return new ContentNegotiationResult(isValid, parsed);
         }
 
         private static string[] ParseAndSortHeader(string acceptHeader)

src/Stormpath.Owin.Middleware/Internal/ContentNegotiationResult.cs

@@ -18,13 +18,13 @@ namespace Stormpath.Owin.Middleware.Internal
 {
     public struct ContentNegotiationResult
     {
-        public ContentNegotiationResult(bool success, ContentType prefers)
+        public ContentNegotiationResult(bool success, ContentType contentType)
         {
-            this.Preferred = prefers;
+            this.ContentType = contentType;
             this.Success = success;
         }
 
-        public ContentType Preferred { get; private set; }
+        public ContentType ContentType { get; private set; }
 
         public bool Success { get; private set; }
     }

src/Stormpath.Owin.Middleware/Internal/ContentType.cs

@@ -26,28 +26,37 @@ public sealed class ContentType
 
         public static readonly ContentType Html = new ContentType("text/html");
 
+        public static readonly ContentType FormUrlEncoded = new ContentType("application/x-www-form-urlencoded");
+
         private ContentType(string contentType)
         {
             this.value = contentType;
         }
 
         public static ContentType Parse(string contentType)
         {
+            contentType = contentType.Split(';')?[0];
+
             if (contentType.Equals(Any))
             {
                 return Any;
             }
 
-            if (contentType.Equals(Json, StringComparison.OrdinalIgnoreCase))
+            if (contentType.Equals(Json, StringComparison.Ordinal))
             {
                 return Json;
             }
 
-            if (contentType.Equals(Html, StringComparison.OrdinalIgnoreCase))
+            if (contentType.Equals(Html, StringComparison.Ordinal))
             {
                 return Html;
             }
 
+            if (contentType.Equals(FormUrlEncoded, StringComparison.Ordinal))
+            {
+                return FormUrlEncoded;
+            }
+
             return new ContentType(contentType);
         }
 

src/Stormpath.Owin.Middleware/Internal/FormContentParser.cs

@@ -14,6 +14,7 @@
 // limitations under the License.
 // </copyright>
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -45,7 +46,7 @@ public static IDictionary<string, string[]> Parse(string formData)
                 temporaryDictionary[key].Add(value);
             }
 
-            return temporaryDictionary.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.ToArray());
+            return temporaryDictionary.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.ToArray(), StringComparer.OrdinalIgnoreCase);
         }
     }
 }

src/Stormpath.Owin.Middleware/Internal/PocoBinder{T}.cs

@@ -0,0 +1,52 @@
+// <copyright file="PocoBinder{T}.cs" company="Stormpath, Inc.">
+// Copyright (c) 2016 Stormpath, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </copyright>
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+
+namespace Stormpath.Owin.Middleware.Internal
+{
+    public class PocoBinder<T>
+        where T : new()
+    {
+        private readonly Func<string, string> valueFunc;
+
+        public PocoBinder(Func<string, string> valueFunc)
+        {
+            this.valueFunc = valueFunc;
+        }
+
+        public T Bind()
+        {
+            var result = new T();
+
+            foreach (var property in typeof(T).GetTypeInfo().DeclaredProperties)
+            {
+                if (property.PropertyType != typeof(string))
+                {
+                    throw new Exception($"Unsupported target property type {property.PropertyType.Name}.");
+                }
+
+                property.SetValue(result, this.valueFunc(property.Name));
+            }
+
+            return result;
+        }
+    }
+}

src/Stormpath.Owin.Middleware/Internal/PostBodyParser{T}.cs

@@ -0,0 +1,52 @@
+// <copyright file="PostBodyParser{T}.cs" company="Stormpath, Inc.">
+// Copyright (c) 2016 Stormpath, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </copyright>
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Stormpath.Owin.Abstractions;
+
+namespace Stormpath.Owin.Middleware.Internal
+{
+    public static class PostBodyParser
+    {
+        public static async Task<T> ToModel<T>(IOwinEnvironment context, ContentType bodyContentType, CancellationToken cancellationToken)
+            where T : new()
+        {
+            var bodyString = await context.Request.GetBodyAsStringAsync(cancellationToken);
+
+            return ToModel<T>(bodyString, bodyContentType);
+        }
+
+        public static T ToModel<T>(string body, ContentType bodyContentType)
+            where T : new()
+        {
+            if (bodyContentType == ContentType.Json)
+            {
+                return Serializer.Deserialize<T>(body);
+            }
+
+            if (bodyContentType == ContentType.FormUrlEncoded)
+            {
+                var formDictionary = FormContentParser.Parse(body);
+                return new PocoBinder<T>(key => formDictionary.GetString(key)).Bind();
+            }
+
+            // This should never happen. The logic in AbstractRoute should throw first if the Content-Type is unsupported.
+            throw new Exception($"Unsupported Content-Type {bodyContentType.ToString()}");
+        }
+    }
+}

src/Stormpath.Owin.Middleware/Model/ChangePasswordPostModel.cs

@@ -21,5 +21,7 @@ public class ChangePasswordPostModel
         public string SpToken { get; set; }
 
         public string Password { get; set; }
+
+        public string ConfirmPassword { get; set; }
     }
 }

src/Stormpath.Owin.Middleware/Model/RegisterPostModel.cs

@@ -33,9 +33,5 @@ public class RegisterPostModel
         public string Surname { get; set; }
 
         public string Username { get; set; }
-
-        public List<string> AllNonEmptyFieldNames { get; set; }
-
-        public Dictionary<string, object> CustomFields { get; set; }
     }
 }