refactor(jsonapi-context): use IHttpContextAccessor

Author: jaredcnance

src/JsonApiDotNetCore/Controllers/JsonApiController.cs

@@ -5,7 +5,6 @@
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
@@ -34,7 +33,7 @@ public JsonApiController(
             IEntityRepository<T, TId> entityRepository,
             ILoggerFactory loggerFactory)
         {
-            _jsonApiContext = jsonApiContext;
+            _jsonApiContext = jsonApiContext.ApplyContext<T>();
             _entities = entityRepository;
 
             _logger = loggerFactory.CreateLogger<JsonApiController<T, TId>>();
@@ -53,8 +52,6 @@ public JsonApiController(
         [HttpGet]
         public virtual IActionResult Get()
         {
-            ApplyContext();
-
             var entities = _entities.Get();
 
             entities = ApplyQuery(entities);
@@ -65,8 +62,6 @@ public virtual IActionResult Get()
         [HttpGet("{id}")]
         public virtual async Task<IActionResult> GetAsync(TId id)
         {
-            ApplyContext();
-
             var entity = await _entities.GetAsync(id);
 
             if (entity == null)
@@ -78,8 +73,6 @@ public virtual async Task<IActionResult> GetAsync(TId id)
         [HttpGet("{id}/{relationshipName}")]
         public virtual async Task<IActionResult> GetRelationshipAsync(TId id, string relationshipName)
         {
-            ApplyContext();
-
             relationshipName = _jsonApiContext.ContextGraph
                 .GetRelationshipName<T>(relationshipName);
 
@@ -103,8 +96,6 @@ public virtual async Task<IActionResult> GetRelationshipAsync(TId id, string rel
         [HttpPost]
         public virtual async Task<IActionResult> PostAsync([FromBody] T entity)
         {
-            ApplyContext();
-
             if (entity == null)
                 return BadRequest();
 
@@ -116,8 +107,6 @@ public virtual async Task<IActionResult> PostAsync([FromBody] T entity)
         [HttpPatch("{id}")]
         public virtual async Task<IActionResult> PatchAsync(TId id, [FromBody] T entity)
         {
-            ApplyContext();
-
             if (entity == null)
                 return BadRequest();
 
@@ -135,8 +124,6 @@ public virtual async Task<IActionResult> PatchAsync(TId id, [FromBody] T entity)
         [HttpDelete("{id}")]
         public virtual async Task<IActionResult> DeleteAsync(TId id)
         {
-            ApplyContext();
-
             var wasDeleted = await _entities.DeleteAsync(id);
 
             if (!wasDeleted)
@@ -151,19 +138,12 @@ public virtual async Task<IActionResult> DeleteAsync(TId id)
         //     return Ok("Delete Id/relationship");
         // }
 
-        private void ApplyContext()
-        {
-            var routeData = HttpContext.GetRouteData();
-            _jsonApiContext.RequestEntity = _jsonApiContext.ContextGraph.GetContextEntity(typeof(T));
-            _jsonApiContext.ApplyContext(HttpContext);
-        }
-
         private IQueryable<T> ApplyQuery(IQueryable<T> entities)
         {
             if(!HttpContext.Request.Query.Any())
                 return entities;
 
-            var querySet = new QuerySet<T>( _jsonApiContext);
+            var querySet = new QuerySet<T>(_jsonApiContext);
 
             entities = _entities.Filter(entities, querySet.Filter);
 

src/JsonApiDotNetCore/Extensions/ServiceProviderExtensions.cs

@@ -2,6 +2,7 @@
 using JsonApiDotNetCore.Formatters;
 using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Services;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
@@ -30,7 +31,9 @@ public static void AddJsonApiInternals<TContext>(this IServiceCollection service
             services.AddScoped(typeof(IEntityRepository<,>), typeof(DefaultEntityRepository<,>));
 
             services.AddSingleton<IContextGraph>(contextGraph);
-            services.AddSingleton<IJsonApiContext, JsonApiContext>();
+            services.AddSingleton<IJsonApiContext,JsonApiContext>();
+            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+
             services.AddScoped<JsonApiRouteHandler>();
         }
 

src/JsonApiDotNetCore/Serialization/JsonApiSerializer.cs

@@ -18,6 +18,7 @@ public static string Serialize(object entity, IJsonApiContext jsonApiContext)
         private static string _serializeDocuments(object entity, IJsonApiContext jsonApiContext)
         {
             var documentBuilder = new DocumentBuilder(jsonApiContext);
+
             var entities = entity as IEnumerable<IIdentifiable>;
             var documents = documentBuilder.Build(entities);
             return JsonConvert.SerializeObject(documents);

src/JsonApiDotNetCore/Services/IJsonApiContext.cs

@@ -5,7 +5,7 @@ namespace JsonApiDotNetCore.Services
 {
     public interface IJsonApiContext
     {
-        void ApplyContext(HttpContext context);
+        IJsonApiContext ApplyContext<T>();
         IContextGraph ContextGraph { get; set; }
         ContextEntity RequestEntity { get; set; }
         string BasePath { get; set; }

src/JsonApiDotNetCore/Services/JsonApiContext.cs

@@ -6,21 +6,32 @@ namespace JsonApiDotNetCore.Services
 {
     public class JsonApiContext : IJsonApiContext
     {
-        public JsonApiContext(IContextGraph contextGraph)
+        private IHttpContextAccessor _httpContextAccessor;
+        public JsonApiContext(
+            IContextGraph contextGraph,
+            IHttpContextAccessor httpContextAccessor)
         {
             ContextGraph = contextGraph;
+            _httpContextAccessor = httpContextAccessor;
         }
 
         public IContextGraph ContextGraph { get; set; }
         public ContextEntity RequestEntity { get; set; }
         public string BasePath { get; set; }
         public IQueryCollection Query { get; set; }
 
-        public void ApplyContext(HttpContext context)
+        public IJsonApiContext ApplyContext<T>()
         {
+            var context = _httpContextAccessor.HttpContext;
+
+            RequestEntity = ContextGraph.GetContextEntity(typeof(T));
+            
+            Query = context.Request.Query;
+
             var linkBuilder = new LinkBuilder(this);
             BasePath = linkBuilder.GetBasePath(context, RequestEntity.EntityName);
-            Query = context.Request.Query;
-        }        
+            
+            return this;
+        }
     }
 }

src/JsonApiDotNetCoreExample/Controllers/TodoItemsController.cs

@@ -11,7 +11,7 @@ namespace JsonApiDotNetCoreExample.Controllers
     public class TodoItemsController : JsonApiController<TodoItem>
     {
         public TodoItemsController(
-           IJsonApiContext jsonApiContext,
+            IJsonApiContext jsonApiContext,
             IEntityRepository<TodoItem> entityRepository,
             ILoggerFactory loggerFactory) 
             : base(jsonApiContext, entityRepository, loggerFactory)