add IBaseUrlService

JSONAPI.Autofac/JsonApiAutofacModule.cs

@@ -3,6 +3,7 @@
 using Autofac;
 using JSONAPI.ActionFilters;
 using JSONAPI.Core;
+using JSONAPI.Http;
 using JSONAPI.Json;
 using JSONAPI.Payload;
 using JSONAPI.Payload.Builders;
@@ -36,6 +37,7 @@ protected override void Load(ContainerBuilder builder)
             }).As<IResourceTypeRegistry>().SingleInstance();
 
             builder.RegisterType<JsonApiHttpConfiguration>();
+            builder.RegisterType<BaseUrlService>().As<IBaseUrlService>();
 
             // Serialization
             builder.RegisterType<MetadataSerializer>().As<IMetadataSerializer>().SingleInstance();

JSONAPI.EntityFramework/Http/EntityFrameworkPayloadMaterializer.cs

@@ -23,6 +23,7 @@ public class EntityFrameworkPayloadMaterializer<T> : IPayloadMaterializer<T> whe
         private readonly IResourceTypeRegistry _resourceTypeRegistry;
         private readonly IQueryableResourceCollectionPayloadBuilder _queryableResourceCollectionPayloadBuilder;
         private readonly ISingleResourcePayloadBuilder _singleResourcePayloadBuilder;
+        private readonly IBaseUrlService _baseUrlService;
         private readonly MethodInfo _getRelatedToManyMethod;
         private readonly MethodInfo _getRelatedToOneMethod;
 
@@ -33,16 +34,19 @@ public class EntityFrameworkPayloadMaterializer<T> : IPayloadMaterializer<T> whe
         /// <param name="resourceTypeRegistry"></param>
         /// <param name="queryableResourceCollectionPayloadBuilder"></param>
         /// <param name="singleResourcePayloadBuilder"></param>
+        /// <param name="baseUrlService"></param>
         public EntityFrameworkPayloadMaterializer(
             DbContext dbContext,
             IResourceTypeRegistry resourceTypeRegistry,
             IQueryableResourceCollectionPayloadBuilder queryableResourceCollectionPayloadBuilder,
-            ISingleResourcePayloadBuilder singleResourcePayloadBuilder)
+            ISingleResourcePayloadBuilder singleResourcePayloadBuilder,
+            IBaseUrlService baseUrlService)
         {
             _dbContext = dbContext;
             _resourceTypeRegistry = resourceTypeRegistry;
             _queryableResourceCollectionPayloadBuilder = queryableResourceCollectionPayloadBuilder;
             _singleResourcePayloadBuilder = singleResourcePayloadBuilder;
+            _baseUrlService = baseUrlService;
             _getRelatedToManyMethod = GetType()
                 .GetMethod("GetRelatedToMany", BindingFlags.NonPublic | BindingFlags.Instance);
             _getRelatedToOneMethod = GetType()
@@ -116,11 +120,9 @@ public virtual async Task<IJsonApiPayload> DeleteRecord(string id, CancellationT
         /// <summary>
         /// Gets the base URL for link creation from the current request
         /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        protected static string GetBaseUrlFromRequest(HttpRequestMessage request)
+        protected string GetBaseUrlFromRequest(HttpRequestMessage request)
         {
-            return new Uri(request.RequestUri.AbsoluteUri.Replace(request.RequestUri.PathAndQuery, String.Empty)).ToString();
+            return _baseUrlService.GetBaseUrl(request);
         }
 
         /// <summary>

JSONAPI.Tests/Payload/Builders/FallbackPayloadBuilderTests.cs

@@ -9,6 +9,7 @@
 using System.Web.Http.Controllers;
 using FluentAssertions;
 using JSONAPI.Core;
+using JSONAPI.Http;
 using JSONAPI.Payload;
 using JSONAPI.Payload.Builders;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -45,13 +46,12 @@ public async Task Creates_single_resource_payload_for_registered_non_collection_
             var cancellationTokenSource = new CancellationTokenSource();
 
             var request = new HttpRequestMessage(HttpMethod.Get, "https://www.example.com/fruits");
-            var mockRequestContext = new Mock<HttpRequestContext>();
-            mockRequestContext.Setup(c => c.VirtualPathRoot).Returns("https://www.example.com/fruits");
-            request.SetRequestContext(mockRequestContext.Object);
+            var mockBaseUrlService = new Mock<IBaseUrlService>(MockBehavior.Strict);
+            mockBaseUrlService.Setup(s => s.GetBaseUrl(request)).Returns("https://www.example.com");
 
             // Act
             var fallbackPayloadBuilder = new FallbackPayloadBuilder(singleResourcePayloadBuilder.Object,
-                mockQueryablePayloadBuilder.Object, mockResourceCollectionPayloadBuilder.Object);
+                mockQueryablePayloadBuilder.Object, mockResourceCollectionPayloadBuilder.Object, mockBaseUrlService.Object);
             var resultPayload = await fallbackPayloadBuilder.BuildPayload(objectContent, request, cancellationTokenSource.Token);
 
             // Assert
@@ -73,6 +73,9 @@ public async Task Creates_resource_collection_payload_for_queryables()
             var singleResourcePayloadBuilder = new Mock<ISingleResourcePayloadBuilder>(MockBehavior.Strict);
 
             var request = new HttpRequestMessage();
+
+            var mockBaseUrlService = new Mock<IBaseUrlService>(MockBehavior.Strict);
+            mockBaseUrlService.Setup(s => s.GetBaseUrl(request)).Returns("https://www.example.com/");
 
             var cancellationTokenSource = new CancellationTokenSource();
 
@@ -85,7 +88,7 @@ public async Task Creates_resource_collection_payload_for_queryables()
 
             // Act
             var fallbackPayloadBuilder = new FallbackPayloadBuilder(singleResourcePayloadBuilder.Object,
-                mockQueryablePayloadBuilder.Object, mockResourceCollectionPayloadBuilder.Object);
+                mockQueryablePayloadBuilder.Object, mockResourceCollectionPayloadBuilder.Object, mockBaseUrlService.Object);
             var resultPayload = await fallbackPayloadBuilder.BuildPayload(items, request, cancellationTokenSource.Token);
 
             // Assert
@@ -110,6 +113,9 @@ public async Task Creates_resource_collection_payload_for_non_queryable_enumerab
 
             var request = new HttpRequestMessage(HttpMethod.Get, "https://www.example.com/fruits");
 
+            var mockBaseUrlService = new Mock<IBaseUrlService>(MockBehavior.Strict);
+            mockBaseUrlService.Setup(s => s.GetBaseUrl(request)).Returns("https://www.example.com/");
+
             var mockQueryablePayloadBuilder = new Mock<IQueryableResourceCollectionPayloadBuilder>(MockBehavior.Strict);
             var mockResourceCollectionPayloadBuilder = new Mock<IResourceCollectionPayloadBuilder>(MockBehavior.Strict);
             mockResourceCollectionPayloadBuilder
@@ -118,7 +124,7 @@ public async Task Creates_resource_collection_payload_for_non_queryable_enumerab
 
             // Act
             var fallbackPayloadBuilder = new FallbackPayloadBuilder(singleResourcePayloadBuilder.Object,
-                mockQueryablePayloadBuilder.Object, mockResourceCollectionPayloadBuilder.Object);
+                mockQueryablePayloadBuilder.Object, mockResourceCollectionPayloadBuilder.Object, mockBaseUrlService.Object);
             var resultPayload = await fallbackPayloadBuilder.BuildPayload(items, request, cancellationTokenSource.Token);
 
             // Assert

JSONAPI/Core/JsonApiConfiguration.cs

@@ -1,5 +1,6 @@
 using System.Web.Http;
 using JSONAPI.ActionFilters;
+using JSONAPI.Http;
 using JSONAPI.Json;
 using JSONAPI.Payload;
 using JSONAPI.Payload.Builders;
@@ -67,12 +68,14 @@ public void Apply(HttpConfiguration httpConfig)
             var paginationTransformer = new DefaultPaginationTransformer();
 
             // Builders
+            var baseUrlService = new BaseUrlService();
             var singleResourcePayloadBuilder = new RegistryDrivenSingleResourcePayloadBuilder(_resourceTypeRegistry, linkConventions);
             var resourceCollectionPayloadBuilder = new RegistryDrivenResourceCollectionPayloadBuilder(_resourceTypeRegistry, linkConventions);
             var queryableResourcePayloadBuilder = new DefaultQueryableResourceCollectionPayloadBuilder(resourceCollectionPayloadBuilder,
-                queryableEnumerationTransformer, filteringTransformer, sortingTransformer, paginationTransformer);
+                queryableEnumerationTransformer, filteringTransformer, sortingTransformer, paginationTransformer, baseUrlService);
             var errorPayloadBuilder = new ErrorPayloadBuilder();
-            var fallbackPayloadBuilder = new FallbackPayloadBuilder(singleResourcePayloadBuilder, queryableResourcePayloadBuilder, resourceCollectionPayloadBuilder);
+            var fallbackPayloadBuilder = new FallbackPayloadBuilder(singleResourcePayloadBuilder,
+                queryableResourcePayloadBuilder, resourceCollectionPayloadBuilder, baseUrlService);
 
             // Dependencies for JsonApiHttpConfiguration
             var formatter = new JsonApiFormatter(singleResourcePayloadSerializer, resourceCollectionPayloadSerializer, errorPayloadSerializer, errorPayloadBuilder);

JSONAPI/Http/BaseUrlService.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Net.Http;
+
+namespace JSONAPI.Http
+{
+    /// <summary>
+    /// Default implementation of IBaseUrlService
+    /// </summary>
+    public class BaseUrlService : IBaseUrlService
+    {
+        public string GetBaseUrl(HttpRequestMessage requestMessage)
+        {
+            return
+                new Uri(requestMessage.RequestUri.AbsoluteUri.Replace(requestMessage.RequestUri.PathAndQuery,
+                    String.Empty)).ToString();
+        }
+    }
+}

JSONAPI/Http/IBaseUrlService.cs

@@ -0,0 +1,15 @@
+using System.Net.Http;
+
+namespace JSONAPI.Http
+{
+    /// <summary>
+    /// Service allowing you to get the base URL for a request
+    /// </summary>
+    public interface IBaseUrlService
+    {
+        /// <summary>
+        /// Gets the base URL for a request
+        /// </summary>
+        string GetBaseUrl(HttpRequestMessage requestMessage);
+    }
+}

JSONAPI/JSONAPI.csproj

@@ -93,6 +93,8 @@
     <Compile Include="Extensions\QueryableExtensions.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="Extensions\TypeExtensions.cs" />
+    <Compile Include="Http\BaseUrlService.cs" />
+    <Compile Include="Http\IBaseUrlService.cs" />
     <Compile Include="Http\IPayloadMaterializer.cs" />
     <Compile Include="Http\JsonApiController.cs" />
     <Compile Include="Http\PascalizedControllerSelector.cs" />

JSONAPI/Payload/Builders/DefaultQueryableResourceCollectionPayloadBuilder.cs

@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using JSONAPI.ActionFilters;
+using JSONAPI.Http;
 
 namespace JSONAPI.Payload.Builders
 {
@@ -17,6 +18,7 @@ public class DefaultQueryableResourceCollectionPayloadBuilder : IQueryableResour
         private readonly IQueryableFilteringTransformer _filteringTransformer;
         private readonly IQueryableSortingTransformer _sortingTransformer;
         private readonly IQueryablePaginationTransformer _paginationTransformer;
+        private readonly IBaseUrlService _baseUrlService;
 
         /// <summary>
         /// 
@@ -26,18 +28,21 @@ public class DefaultQueryableResourceCollectionPayloadBuilder : IQueryableResour
         /// <param name="filteringTransformer"></param>
         /// <param name="sortingTransformer"></param>
         /// <param name="paginationTransformer"></param>
+        /// <param name="baseUrlService"></param>
         public DefaultQueryableResourceCollectionPayloadBuilder(
             IResourceCollectionPayloadBuilder resourceCollectionPayloadBuilder,
             IQueryableEnumerationTransformer enumerationTransformer,
             IQueryableFilteringTransformer filteringTransformer,
             IQueryableSortingTransformer sortingTransformer,
-            IQueryablePaginationTransformer paginationTransformer)
+            IQueryablePaginationTransformer paginationTransformer,
+            IBaseUrlService baseUrlService)
         {
             _resourceCollectionPayloadBuilder = resourceCollectionPayloadBuilder;
             _enumerationTransformer = enumerationTransformer;
             _filteringTransformer = filteringTransformer;
             _sortingTransformer = sortingTransformer;
             _paginationTransformer = paginationTransformer;
+            _baseUrlService = baseUrlService;
         }
 
         public async Task<IResourceCollectionPayload> BuildPayload<T>(IQueryable<T> query, HttpRequestMessage request, CancellationToken cancellationToken)
@@ -54,7 +59,7 @@ public async Task<IResourceCollectionPayload> BuildPayload<T>(IQueryable<T> quer
                 query = paginationResults.PagedQuery;
             }
 
-            var linkBaseUrl = new Uri(request.RequestUri.AbsoluteUri.Replace(request.RequestUri.PathAndQuery, String.Empty)).ToString();
+            var linkBaseUrl = _baseUrlService.GetBaseUrl(request);
 
             var results = await _enumerationTransformer.Enumerate(query, cancellationToken);
             return _resourceCollectionPayloadBuilder.BuildPayload(results, linkBaseUrl, null, null);

JSONAPI/Payload/Builders/FallbackPayloadBuilder.cs

@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+using JSONAPI.Http;
 
 namespace JSONAPI.Payload.Builders
 {
@@ -16,6 +17,7 @@ public class FallbackPayloadBuilder : IFallbackPayloadBuilder
         private readonly ISingleResourcePayloadBuilder _singleResourcePayloadBuilder;
         private readonly IQueryableResourceCollectionPayloadBuilder _queryableResourceCollectionPayloadBuilder;
         private readonly IResourceCollectionPayloadBuilder _resourceCollectionPayloadBuilder;
+        private readonly IBaseUrlService _baseUrlService;
         private readonly Lazy<MethodInfo> _openBuildPayloadFromQueryableMethod;
         private readonly Lazy<MethodInfo> _openBuildPayloadFromEnumerableMethod;
 
@@ -25,13 +27,16 @@ public class FallbackPayloadBuilder : IFallbackPayloadBuilder
         /// <param name="singleResourcePayloadBuilder"></param>
         /// <param name="queryableResourceCollectionPayloadBuilder"></param>
         /// <param name="resourceCollectionPayloadBuilder"></param>
+        /// <param name="baseUrlService"></param>
         public FallbackPayloadBuilder(ISingleResourcePayloadBuilder singleResourcePayloadBuilder,
             IQueryableResourceCollectionPayloadBuilder queryableResourceCollectionPayloadBuilder,
-            IResourceCollectionPayloadBuilder resourceCollectionPayloadBuilder)
+            IResourceCollectionPayloadBuilder resourceCollectionPayloadBuilder,
+            IBaseUrlService baseUrlService)
         {
             _singleResourcePayloadBuilder = singleResourcePayloadBuilder;
             _queryableResourceCollectionPayloadBuilder = queryableResourceCollectionPayloadBuilder;
             _resourceCollectionPayloadBuilder = resourceCollectionPayloadBuilder;
+            _baseUrlService = baseUrlService;
 
             _openBuildPayloadFromQueryableMethod =
                 new Lazy<MethodInfo>(
@@ -72,7 +77,7 @@ public async Task<IJsonApiPayload> BuildPayload(object obj, HttpRequestMessage r
                 isCollection = true;
             }
 
-            var linkBaseUrl = new Uri(requestMessage.RequestUri.AbsoluteUri.Replace(requestMessage.RequestUri.PathAndQuery, String.Empty)).ToString();
+            var linkBaseUrl = _baseUrlService.GetBaseUrl(requestMessage);
 
             if (isCollection)
             {