Merge pull request #2766 from thecodejunkie/csrf-update-implementation

Changed date parsing and extracted method

Author: phillip-haydon

src/Nancy/Security/Csrf.cs

@@ -172,17 +172,17 @@ private static CsrfToken GetCookieToken(Request request)
             return cookieToken;
         }
 
-        private static CsrfToken ParseToCsrfToken(string cookieTokenString)
+        private static void AddTokenValue(Dictionary<string, string> dictionary, string key, string value)
         {
-            var parsed = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-
-            void Add(string key, string value)
+            if (!string.IsNullOrEmpty(key))
             {
-                if (!string.IsNullOrEmpty(key))
-                {
-                    parsed.Add(key, value);
-                }
+                dictionary.Add(key, value);
             }
+        }
+
+        private static CsrfToken ParseToCsrfToken(string cookieTokenString)
+        {
+            var parsed = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
             var currentKey = string.Empty;
             var buffer = new StringBuilder();
@@ -198,7 +198,7 @@ void Add(string key, string value)
                         buffer.Clear();
                         break;
                     case PairDelimiter:
-                        Add(currentKey, buffer.ToString());
+                        AddTokenValue(parsed, currentKey, buffer.ToString());
                         buffer.Clear();
                         break;
                     default:
@@ -207,7 +207,7 @@ void Add(string key, string value)
                 }
             }
 
-            Add(currentKey, buffer.ToString());
+            AddTokenValue(parsed, currentKey, buffer.ToString());
 
             if (parsed.Keys.Count() != 3)
             {
@@ -218,7 +218,7 @@ void Add(string key, string value)
             {
                 return new CsrfToken
                 {
-                    CreatedDate = DateTimeOffset.ParseExact(parsed["CreatedDate"], "o", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal),
+                    CreatedDate = DateTimeOffset.ParseExact(parsed["CreatedDate"], "o", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal),
                     Hmac = Convert.FromBase64String(parsed["Hmac"]),
                     RandomBytes = Convert.FromBase64String(parsed["RandomBytes"])
                 };