Merge pull request #17 from geeklearningio/assert-helper

Make the CopyCookiesFromResponse helper method an extension method

Author: arnaudauroux

src/GeekLearning.Test.Integration/Helpers/Http/AntiForgeryHelper.cs

@@ -7,7 +7,7 @@
     // http://www.stefanhendriks.com/2016/05/11/integration-testing-your-asp-net-core-app-dealing-with-anti-request-forgery-csrf-formdata-and-cookies/
     public static class AntiForgeryHelper
     {
-        internal static string ExtractAntiForgeryToken(string htmlResponseText)
+        internal static string ExtractAntiForgeryTokenCore(string htmlResponseText)
         {
             if (htmlResponseText == null) throw new ArgumentNullException("htmlResponseText");
 
@@ -18,7 +18,7 @@ internal static string ExtractAntiForgeryToken(string htmlResponseText)
         public static async Task<string> ExtractAntiForgeryTokenAsync(this HttpResponseMessage response)
         {
             string responseAsString = await response.Content.ReadAsStringAsync();
-            return await Task.FromResult(ExtractAntiForgeryToken(responseAsString));
+            return await Task.FromResult(ExtractAntiForgeryTokenCore(responseAsString));
         }
     }
 }

src/GeekLearning.Test.Integration/Helpers/Http/CookieHelper.cs

@@ -1,16 +1,20 @@
-namespace GeekLearning.Test.Integration.Helpers
+namespace System.Net.Http
 {
     using Microsoft.Net.Http.Headers;
     using System.Collections.Generic;
     using System.Linq;
-    using System.Net.Http;
 
     // http://www.stefanhendriks.com/2016/05/11/integration-testing-your-asp-net-core-app-dealing-with-anti-request-forgery-csrf-formdata-and-cookies/
-    public class CookiesHelper
+    public static class CookiesHelper
     {
+        public static HttpRequestMessage CopyCookiesFromResponse(this HttpRequestMessage request, HttpResponseMessage response)
+        {
+            return PutCookiesOnRequest(request, ExtractCookiesFromResponse(response));
+        }
+
         // Inspired from:
         // https://github.com/aspnet/Mvc/blob/538cd9c19121f8d3171cbfddd5d842cbb756df3e/test/Microsoft.AspNet.Mvc.FunctionalTests/TempDataTest.cs#L201-L202
-        public static IDictionary<string, string> ExtractCookiesFromResponse(HttpResponseMessage response)
+        private static IDictionary<string, string> ExtractCookiesFromResponse(HttpResponseMessage response)
         {
             IDictionary<string, string> result = new Dictionary<string, string>();
             IEnumerable<string> values;
@@ -25,7 +29,7 @@ public static IDictionary<string, string> ExtractCookiesFromResponse(HttpRespons
             return result;
         }
 
-        public static HttpRequestMessage PutCookiesOnRequest(HttpRequestMessage request, IDictionary<string, string> cookies)
+        private static HttpRequestMessage PutCookiesOnRequest(HttpRequestMessage request, IDictionary<string, string> cookies)
         {
             cookies.Keys.ToList().ForEach(key =>
             {
@@ -34,10 +38,5 @@ public static HttpRequestMessage PutCookiesOnRequest(HttpRequestMessage request,
 
             return request;
         }
-
-        public static HttpRequestMessage CopyCookiesFromResponse(HttpRequestMessage request, HttpResponseMessage response)
-        {
-            return PutCookiesOnRequest(request, ExtractCookiesFromResponse(response));
-        }
     }
 }

src/GeekLearning.Test.Integration/Helpers/Http/HttpClientHelpers.cs

@@ -1,76 +1,37 @@
 namespace System.Net.Http
 {
     using Collections.Generic;
-    using GeekLearning.Test.Integration.Helpers;
-    using Globalization;
-    using Linq;
-    using Newtonsoft.Json.Linq;
+    using GeekLearning.Test.Integration.Helpers.Http;
     using System.Threading.Tasks;
 
     public static class HttpClientHelper
     {
         public static async Task<HttpResponseMessage> PostAsJsonAntiForgeryAsync<TContent>(this HttpClient httpClient, string requestUri, TContent content)
         {
-            IDictionary<string, string> contentData = ExtractContent(content);
-
+            // Get the form view
             HttpResponseMessage responseMsg = await httpClient.GetAsync(requestUri);
             if (!responseMsg.IsSuccessStatusCode)
             {
                 return responseMsg;
             }
 
+            // Extract Anti Forgery Token
             var antiForgeryToken = await responseMsg.ExtractAntiForgeryTokenAsync();
-            contentData.Add("__RequestVerificationToken", antiForgeryToken);
 
+            // Serialize data to Key/Value pairs
+            IDictionary<string, string> contentData = content.ToKeyValue();
+
+            // Create the request message with previously serialized data + the Anti Forgery Token
+            contentData.Add("__RequestVerificationToken", antiForgeryToken);
             var requestMsg = new HttpRequestMessage(HttpMethod.Post, requestUri)
             {
                 Content = new FormUrlEncodedContent(contentData)
             };
 
-            CookiesHelper.CopyCookiesFromResponse(requestMsg, responseMsg);
+            // Copy the cookies from the response (containing the Anti Forgery Token) to the request that is about to be sent
+            requestMsg.CopyCookiesFromResponse(responseMsg);
 
             return await httpClient.SendAsync(requestMsg);
         }
-
-        private static IDictionary<string, string> ExtractContent(object metaToken)
-        {
-            if (metaToken == null)
-            {
-                return null;
-            }
-
-            JToken token = metaToken as JToken;
-            if (token == null)
-            {
-                return ExtractContent(JObject.FromObject(metaToken));
-            }
-
-            if (token.HasValues)
-            {
-                var contentData = new Dictionary<string, string>();
-                foreach (var child in token.Children().ToList())
-                {
-                    var childContent = ExtractContent(child);
-                    if (childContent != null)
-                    {
-                        contentData = contentData.Concat(childContent).ToDictionary(k => k.Key, v => v.Value);
-                    }
-                }
-
-                return contentData;
-            }
-
-            var jValue = token as JValue;
-            if (jValue?.Value == null)
-            {
-                return null;
-            }
-
-            var value = jValue?.Type == JTokenType.Date ?
-                            jValue?.ToString("o", CultureInfo.InvariantCulture) :
-                            jValue?.ToString(CultureInfo.InvariantCulture);
-       
-            return new Dictionary<string, string> { { token.Path, value } };
-        }
-    }
+    }    
 }

src/GeekLearning.Test.Integration/Helpers/Http/SerializationHelper.cs

@@ -0,0 +1,51 @@
+namespace GeekLearning.Test.Integration.Helpers.Http
+{
+    using Newtonsoft.Json.Linq;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Linq;
+
+    public static class SerializationHelper
+    {
+        public static IDictionary<string, string> ToKeyValue(this object metaToken)
+        {
+            if (metaToken == null)
+            {
+                return null;
+            }
+
+            JToken token = metaToken as JToken;
+            if (token == null)
+            {
+                return ToKeyValue(JObject.FromObject(metaToken));
+            }
+
+            if (token.HasValues)
+            {
+                var contentData = new Dictionary<string, string>();
+                foreach (var child in token.Children().ToList())
+                {
+                    var childContent = ToKeyValue(child);
+                    if (childContent != null)
+                    {
+                        contentData = contentData.Concat(childContent).ToDictionary(k => k.Key, v => v.Value);
+                    }
+                }
+
+                return contentData;
+            }
+
+            var jValue = token as JValue;
+            if (jValue?.Value == null)
+            {
+                return null;
+            }
+
+            var value = jValue?.Type == JTokenType.Date ?
+                            jValue?.ToString("o", CultureInfo.InvariantCulture) :
+                            jValue?.ToString(CultureInfo.InvariantCulture);
+
+            return new Dictionary<string, string> { { token.Path, value } };
+        }
+    }
+}