fix request scope issue

Author: jaredcnance

JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using AutoMapper;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Routing;
@@ -11,10 +10,11 @@ public static class IServiceCollectionExtensions
   {
     public static void AddJsonApi(this IServiceCollection services, Action<IJsonApiModelConfiguration> configurationAction)
     {
-      var configBuilder = new JsonApiConfigurationBuilder(configurationAction);
-      var config = configBuilder.Build();
-      IRouter router = new Router(config, new RouteBuilder(config), new ControllerBuilder());
-      services.AddSingleton(_ => router);
+      services.AddScoped(_ => {
+        var configBuilder = new JsonApiConfigurationBuilder(configurationAction);
+        var config = configBuilder.Build();
+        return (IRouter)new Router(config, new RouteBuilder(config), new ControllerBuilder());
+      });
     }
   }
 }

JsonApiDotNetCore/Routing/Router.cs

@@ -33,7 +33,7 @@ public async Task<bool> HandleJsonApiRouteAsync(HttpContext context, IServicePro
             if (route == null) return false;
 
             InitializeContext(context, route);
-            await CallController();
+            await CallController(context);
 
             return true;
         }
@@ -44,15 +44,15 @@ private void InitializeContext(HttpContext context, Route route)
             _jsonApiContext = new JsonApiContext(context, route, dbContext, _jsonApiModelConfiguration);
         }
 
-        private async Task CallController()
+        private async Task CallController(HttpContext context)
         {
             var controller = _controllerBuilder.BuildController(_jsonApiContext);
 
             var result = ActivateControllerMethod(controller);
 
             result.Value = SerializeResult(result.Value);
 
-            await SendResponse(result);
+            await SendResponse(context, result);
         }
 
         private ObjectResult ActivateControllerMethod(IJsonApiController controller)
@@ -78,9 +78,8 @@ private object SerializeResult(object result)
             return result == null ? null : new JsonApiSerializer(_jsonApiContext).ToJsonApiDocument(result);
         }
 
-        private async Task SendResponse(ObjectResult result)
+        private async Task SendResponse(HttpContext context, ObjectResult result)
         {
-            var context = _jsonApiContext.HttpContext;
             context.Response.StatusCode = result.StatusCode ?? 500;
             context.Response.ContentType = "application/vnd.api+json";
             await context.Response.WriteAsync(result.Value == null ? "" : result.Value.ToString(), Encoding.UTF8);