Merge pull request #79 from joukevandermaas/iis

Always prefix IIS virtual path root

Author: Jouke van der Maas

Saule/Constants.cs

@@ -5,6 +5,7 @@ internal class Constants
         public const string RequestPropertyName = "Saule_ResourceDescriptor";
         public const string QueryContextPropertyName = "Saule_QueryContext";
         public const string PreprocessResultPropertyName = "Saule_PreprocessedResult";
+        public const string WebApiRequestContextPropertyName = "MS_RequestContext";
 
         public const string MediaType = "application/vnd.api+json";
 

Saule/Http/PreprocessingDelegatingHandler.cs

@@ -43,7 +43,7 @@ internal static PreprocessResult PreprocessRequest(
                 };
             }
 
-            PrepareUrlPathBuilder(jsonApi, request, config, resource);
+            PrepareUrlPathBuilder(jsonApi, request, config);
 
             return jsonApi.PreprocessContent(content, resource, request.RequestUri);
         }
@@ -77,27 +77,26 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
         private static void PrepareUrlPathBuilder(
             JsonApiSerializer jsonApiSerializer,
             HttpRequestMessage request,
-            JsonApiConfiguration config,
-            ApiResource resource)
+            JsonApiConfiguration config)
         {
-            var result = config.UrlPathBuilder;
-            if (resource == null)
+            if (config.UrlPathBuilder != null)
             {
-                result = result ?? new DefaultUrlPathBuilder();
+                jsonApiSerializer.UrlPathBuilder = config.UrlPathBuilder;
             }
-            else if (!request.Properties.ContainsKey("MS_RequestContext"))
+            else if (!request.Properties.ContainsKey(Constants.WebApiRequestContextPropertyName))
             {
-                result = result ?? new DefaultUrlPathBuilder();
+                jsonApiSerializer.UrlPathBuilder = new DefaultUrlPathBuilder();
             }
             else
             {
-                var routeTemplate = (request.Properties["MS_RequestContext"] as HttpRequestContext)
-                    ?.RouteData.Route.RouteTemplate;
-                result = result ?? new DefaultUrlPathBuilder(
-                    routeTemplate, resource);
-            }
+                var requestContext = request.Properties[Constants.WebApiRequestContextPropertyName]
+                    as HttpRequestContext;
+                var routeTemplate = requestContext?.RouteData.Route.RouteTemplate;
+                var virtualPathRoot = requestContext?.VirtualPathRoot ?? "/";
 
-            jsonApiSerializer.UrlPathBuilder = result;
+                jsonApiSerializer.UrlPathBuilder = new DefaultUrlPathBuilder(
+                    virtualPathRoot, routeTemplate);
+            }
         }
 
         private static void PrepareQueryContext(

Saule/Serialization/DefaultUrlPathBuilder.cs

@@ -29,7 +29,7 @@ public DefaultUrlPathBuilder(string prefix)
             _prefix = prefix;
         }
 
-        internal DefaultUrlPathBuilder(string template, ApiResource resource)
+        internal DefaultUrlPathBuilder(string virtualPathRoot, string template)
         {
             var templateParts = template.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
             var dynamicCount = templateParts.Count(t => t.StartsWith("{"));
@@ -40,7 +40,7 @@ internal DefaultUrlPathBuilder(string template, ApiResource resource)
                 preDynamic = preDynamic.Take(preDynamic.Count - 1).ToList();
             }
 
-            _prefix = '/'.TrimJoin(preDynamic.ToArray());
+            _prefix = '/'.TrimJoin(virtualPathRoot.ToEnumerable().Concat(preDynamic).ToArray());
         }
 
         /// <summary>

Tests/Serialization/DefaultUrlPathBuilderTests.cs

@@ -29,7 +29,7 @@ public static IEnumerable<object[]> GetPrefixData()
             {
                 "/api",
                 "/two/parts",
-                ""
+                "/"
             };
             var templates = new[]
             {
@@ -45,20 +45,36 @@ from template in templates
                    select new object[] { prefix, template };
         }
 
-        [Theory(DisplayName = "Finds correct prefix from template & url/")]
+        [Theory(DisplayName = "Finds correct prefix from template & url")]
         [MemberData("GetPrefixData")]
         public void FindsCorrectPrefix(string prefix, string template)
         {
             var resource = new PersonResource();
             template = $"{prefix}/{template}";
 
-            var builder = new DefaultUrlPathBuilder(template, resource);
+            var builder = new DefaultUrlPathBuilder("/", template);
 
             var url = builder.BuildCanonicalPath(resource);
 
             _output.WriteLine($"template: {template}\ngenerated result: {url}");
 
-            Assert.Equal($"{prefix}/people/", builder.BuildCanonicalPath(resource));
+            Assert.Equal($"{prefix.TrimEnd('/')}/people/", builder.BuildCanonicalPath(resource));
+        }
+
+        [Theory(DisplayName = "Finds correct prefix from template, virtual path root & url")]
+        [MemberData("GetPrefixData")]
+        public void FindsCorrectPrefixWithVirtualPath(string prefix, string template)
+        {
+            var resource = new PersonResource();
+            template = $"test/{template}";
+
+            var builder = new DefaultUrlPathBuilder(prefix, template);
+
+            var url = builder.BuildCanonicalPath(resource);
+
+            _output.WriteLine($"template: {template}\ngenerated result: {url}");
+
+            Assert.Equal($"{prefix.TrimEnd('/')}/test/people/", builder.BuildCanonicalPath(resource));
         }
 
         [Fact(DisplayName = "Collection uses ApiResource.UrlPath")]