Merge pull request #225 from sergey-litvinov-work/fixed-self-encoding

Fixed issue with encoding for `links.self` item
joukevandermaas · Oct 23, 2019 · 126e952 · 126e952
2 parents d578a65 + 466f48b
commit 126e952
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/Saule/Serialization/ResourceSerializer.cs b/Saule/Serialization/ResourceSerializer.cs
@@ -133,7 +133,7 @@ private JToken CreateTopLevelLinks(int count)
             // to preserve back compatibility if Self is enabled, then we also render it. Or if TopSelf is enabled
             if (_resource.LinkType.HasFlag(LinkType.TopSelf) || _resource.LinkType.HasFlag(LinkType.Self))
             {
-                result.Add("self", _baseUrl.AbsoluteUri);
+                result.Add("self", _baseUrl.ToString());
             }
 
             var queryStrings = new PaginationQuery(_paginationContext, _value);

diff --git a/Tests/Serialization/UrlConstructionTests.cs b/Tests/Serialization/UrlConstructionTests.cs
@@ -98,6 +98,45 @@ public void SelfLinkNoPort()
             Assert.Equal("http://localhost/api/people/123", selfLink);
         }
 
+        [Fact(DisplayName = "Adds top level self link without any port for https")]
+        public void SelfLinkNoPortHttps()
+        {
+            var target = new ResourceSerializer(Get.Person(), new PersonResource(),
+                new Uri("https://localhost:443/api/people/123"), DefaultPathBuilder, null, null, null);
+            var result = target.Serialize();
+            _output.WriteLine(result.ToString());
+
+            var selfLink = result["links"].Value<string>("self");
+
+            Assert.Equal("https://localhost/api/people/123", selfLink);
+        }
+
+        [Fact(DisplayName = "Adds top level self link without any port and with correct encoding")]
+        public void SelfLinkNoEncoding()
+        {
+            var target = new ResourceSerializer(Get.Person(), new PersonResource(),
+                new Uri("https://localhost:443/api/people?page[number]=1&page[size]=10"), DefaultPathBuilder, null, null, null);
+            var result = target.Serialize();
+            _output.WriteLine(result.ToString());
+
+            var selfLink = result["links"].Value<string>("self");
+
+            Assert.Equal("https://localhost/api/people?page[number]=1&page[size]=10", selfLink);
+        }
+
+        [Fact(DisplayName = "Adds top level self link without any port and with correct encoding based on already encoded value")]
+        public void SelfLinkNoEncodingBasedOnEncoded()
+        {
+            var target = new ResourceSerializer(Get.Person(), new PersonResource(),
+                new Uri("https://localhost:443/api/people?page%5Bnumber%5D=1&page%5Bsize%5D=10"), DefaultPathBuilder, null, null, null);
+            var result = target.Serialize();
+            _output.WriteLine(result.ToString());
+
+            var selfLink = result["links"].Value<string>("self");
+
+            Assert.Equal("https://localhost/api/people?page[number]=1&page[size]=10", selfLink);
+        }
+
         [Fact(DisplayName = "Adds top level self link if only LinkType.TopSelf is specified")]
         public void TopLinkOnlyLink()
         {