Removed RequestScopedServiceProvider

Author: Bart Koelman

src/JsonApiDotNetCore/Configuration/IRequestScopedServiceProvider.cs

@@ -175,7 +175,6 @@ private void AddMiddlewareLayer()
             _services.AddSingleton<IJsonApiRoutingConvention, JsonApiRoutingConvention>();
             _services.AddSingleton<IControllerResourceMapping>(sp => sp.GetRequiredService<IJsonApiRoutingConvention>());
             _services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-            _services.AddSingleton<IRequestScopedServiceProvider, RequestScopedServiceProvider>();
             _services.AddScoped<IJsonApiRequest, JsonApiRequest>();
             _services.AddScoped<IJsonApiWriter, JsonApiWriter>();
             _services.AddScoped<IJsonApiReader, JsonApiReader>();

src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs

@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
@@ -13,18 +14,18 @@ internal sealed class JsonApiModelMetadataProvider : DefaultModelMetadataProvide
         private readonly JsonApiValidationFilter _jsonApiValidationFilter;
 
         /// <inheritdoc />
-        public JsonApiModelMetadataProvider(ICompositeMetadataDetailsProvider detailsProvider, IRequestScopedServiceProvider serviceProvider)
+        public JsonApiModelMetadataProvider(ICompositeMetadataDetailsProvider detailsProvider, IHttpContextAccessor httpContextAccessor)
             : base(detailsProvider)
         {
-            _jsonApiValidationFilter = new JsonApiValidationFilter(serviceProvider);
+            _jsonApiValidationFilter = new JsonApiValidationFilter(httpContextAccessor);
         }
 
         /// <inheritdoc />
         public JsonApiModelMetadataProvider(ICompositeMetadataDetailsProvider detailsProvider, IOptions<MvcOptions> optionsAccessor,
-            IRequestScopedServiceProvider serviceProvider)
+            IHttpContextAccessor httpContextAccessor)
             : base(detailsProvider, optionsAccessor)
         {
-            _jsonApiValidationFilter = new JsonApiValidationFilter(serviceProvider);
+            _jsonApiValidationFilter = new JsonApiValidationFilter(httpContextAccessor);
         }
 
         /// <inheritdoc />

src/JsonApiDotNetCore/Configuration/JsonApiModelMetadataProvider.cs

@@ -13,19 +13,21 @@ namespace JsonApiDotNetCore.Configuration
     /// </summary>
     internal sealed class JsonApiValidationFilter : IPropertyValidationFilter
     {
-        private readonly IRequestScopedServiceProvider _serviceProvider;
+        private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public JsonApiValidationFilter(IRequestScopedServiceProvider serviceProvider)
+        public JsonApiValidationFilter(IHttpContextAccessor httpContextAccessor)
         {
-            ArgumentGuard.NotNull(serviceProvider, nameof(serviceProvider));
+            ArgumentGuard.NotNull(httpContextAccessor, nameof(httpContextAccessor));
 
-            _serviceProvider = serviceProvider;
+            _httpContextAccessor = httpContextAccessor;
         }
 
         /// <inheritdoc />
         public bool ShouldValidateEntry(ValidationEntry entry, ValidationEntry parentEntry)
         {
-            var request = _serviceProvider.GetRequiredService<IJsonApiRequest>();
+            IServiceProvider serviceProvider = GetServiceProvider();
+
+            var request = serviceProvider.GetRequiredService<IJsonApiRequest>();
 
             if (IsId(entry.Key))
             {
@@ -39,17 +41,27 @@ public bool ShouldValidateEntry(ValidationEntry entry, ValidationEntry parentEnt
                 return false;
             }
 
-            var httpContextAccessor = _serviceProvider.GetRequiredService<IHttpContextAccessor>();
-
-            if (httpContextAccessor.HttpContext!.Request.Method == HttpMethods.Patch || request.WriteOperation == WriteOperationKind.UpdateResource)
+            if (_httpContextAccessor.HttpContext!.Request.Method == HttpMethods.Patch || request.WriteOperation == WriteOperationKind.UpdateResource)
             {
-                var targetedFields = _serviceProvider.GetRequiredService<ITargetedFields>();
+                var targetedFields = serviceProvider.GetRequiredService<ITargetedFields>();
                 return IsFieldTargeted(entry, targetedFields);
             }
 
             return true;
         }
 
+        private IServiceProvider GetServiceProvider()
+        {
+            HttpContext httpContext = _httpContextAccessor.HttpContext;
+
+            if (httpContext == null)
+            {
+                throw new InvalidOperationException("Cannot resolve scoped services outside the context of an HTTP request.");
+            }
+
+            return httpContext.RequestServices;
+        }
+
         private static bool IsId(string key)
         {
             return key == nameof(Identifiable.Id) || key.EndsWith($".{nameof(Identifiable.Id)}", StringComparison.Ordinal);

src/JsonApiDotNetCore/Configuration/JsonApiValidationFilter.cs

@@ -29,10 +29,6 @@ public void RegisterResource_DeviatingDbContextPropertyName_RegistersCorrectly()
             services.AddLogging();
             services.AddDbContext<TestDbContext>(options => options.UseInMemoryDatabase("UnitTestDb"));
 
-            // this is required because the DbContextResolver requires access to the current HttpContext
-            // to get the request scoped DbContext instance
-            services.AddScoped<IRequestScopedServiceProvider, TestScopedServiceProvider>();
-
             // Act
             services.AddJsonApi<TestDbContext>();
 
@@ -171,8 +167,6 @@ public void AddJsonApi_With_Context_Uses_Resource_Type_Name_If_NoOtherSpecified(
             services.AddLogging();
             services.AddDbContext<TestDbContext>(options => options.UseInMemoryDatabase(Guid.NewGuid().ToString()));
 
-            services.AddScoped<IRequestScopedServiceProvider, TestScopedServiceProvider>();
-
             // Act
             services.AddJsonApi<TestDbContext>();