Tweak SetQueryParam / SetHashParam

Author: mythz

src/ServiceStack.Text/HttpUtils.cs

@@ -40,24 +40,18 @@ public static string SetQueryParam(this string url, string key, string val)
             var qsPos = url.IndexOf('?');
             if (qsPos != -1)
             {
-                int existingKeyPos;
-                if(qsPos + 1 == url.IndexOf(key, qsPos, PclExport.Instance.InvariantComparison))
-                {
-                    existingKeyPos = qsPos + 1;
-                }
-                else
-                {
-                    existingKeyPos = url.IndexOf("&" + key, qsPos, PclExport.Instance.InvariantComparison);
-                    if (existingKeyPos != -1)
-                        existingKeyPos++;
-                }
+                var existingKeyPos = qsPos + 1 == url.IndexOf(key, qsPos, PclExport.Instance.InvariantComparison) 
+                    ? qsPos 
+                    : url.IndexOf("&" + key, qsPos, PclExport.Instance.InvariantComparison);
 
                 if (existingKeyPos != -1)
                 {
-                    var endPos = url.IndexOf('&', existingKeyPos);
-                    if (endPos == -1) endPos = url.Length;
+                    var endPos = url.IndexOf('&', existingKeyPos + 1);
+                    if (endPos == -1) 
+                        endPos = url.Length;
 
                     var newUrl = url.Substring(0, existingKeyPos + key.Length + 1)
+                        + "="
                         + val.UrlEncode()
                         + url.Substring(endPos);
                     return newUrl;
@@ -85,13 +79,18 @@ public static string SetHashParam(this string url, string key, string val)
             var hPos = url.IndexOf('#');
             if (hPos != -1)
             {
-                var existingKeyPos = url.IndexOf(key, hPos, PclExport.Instance.InvariantComparison);
+                var existingKeyPos = hPos + 1 == url.IndexOf(key, hPos, PclExport.Instance.InvariantComparison)
+                    ? hPos
+                    : url.IndexOf("/" + key, hPos, PclExport.Instance.InvariantComparison);
+
                 if (existingKeyPos != -1)
                 {
-                    var endPos = url.IndexOf('/', existingKeyPos);
-                    if (endPos == -1) endPos = url.Length;
+                    var endPos = url.IndexOf('/', existingKeyPos + 1);
+                    if (endPos == -1) 
+                        endPos = url.Length;
 
                     var newUrl = url.Substring(0, existingKeyPos + key.Length + 1)
+                        + "="
                         + val.UrlEncode()
                         + url.Substring(endPos);
                     return newUrl;

tests/ServiceStack.Text.Tests/HttpUtilsTests.cs

@@ -12,6 +12,7 @@ public void Can_AddQueryParam()
             Assert.That("http://example.com?s=0".AddQueryParam("f", "1"), Is.EqualTo("http://example.com?s=0&f=1"));
             Assert.That("http://example.com?f=1".AddQueryParam("f", "2"), Is.EqualTo("http://example.com?f=1&f=2"));
             Assert.That("http://example.com?s=0&f=1&s=1".AddQueryParam("f", "2"), Is.EqualTo("http://example.com?s=0&f=1&s=1&f=2"));
+            Assert.That("http://example.com?s=rf&f=1".AddQueryParam("f", "2"), Is.EqualTo("http://example.com?s=rf&f=1&f=2"));
         }
 
         [Test]
@@ -31,6 +32,7 @@ public void Can_AddHashParam()
             Assert.That("http://example.com#s=0".AddHashParam("f", "1"), Is.EqualTo("http://example.com#s=0/f=1"));
             Assert.That("http://example.com#f=1".AddHashParam("f", "2"), Is.EqualTo("http://example.com#f=1/f=2"));
             Assert.That("http://example.com#s=0/f=1/s=1".AddHashParam("f", "2"), Is.EqualTo("http://example.com#s=0/f=1/s=1/f=2"));
+            Assert.That("http://example.com#s=rf/f=1".AddHashParam("f", "2"), Is.EqualTo("http://example.com#s=rf/f=1/f=2"));
         }
 
         [Test]
@@ -40,6 +42,7 @@ public void Can_SetHashParam()
             Assert.That("http://example.com#s=0".SetHashParam("f", "1"), Is.EqualTo("http://example.com#s=0/f=1"));
             Assert.That("http://example.com#f=1".SetHashParam("f", "2"), Is.EqualTo("http://example.com#f=2"));
             Assert.That("http://example.com#s=0/f=1/s=1".SetHashParam("f", "2"), Is.EqualTo("http://example.com#s=0/f=2/s=1"));
+            Assert.That("http://example.com#s=rf/f=1".SetHashParam("f", "2"), Is.EqualTo("http://example.com#s=rf/f=2"));
         }
     }
 }