fix(RequestScopedServiceProvider): do not access disposed scope

Author: jaredcnance

src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs

@@ -122,6 +122,7 @@ public static void AddJsonApiInternals(
 
             services.AddScoped(typeof(IResourceService<>), typeof(EntityResourceService<>));
             services.AddScoped(typeof(IResourceService<,>), typeof(EntityResourceService<,>));
+
             services.AddSingleton<JsonApiOptions>(jsonApiOptions);
             services.AddSingleton<IContextGraph>(jsonApiOptions.ContextGraph);
             services.AddScoped<IJsonApiContext, JsonApiContext>();

src/JsonApiDotNetCore/Services/Operations/OperationProcessorResolver.cs

@@ -1,3 +1,4 @@
+using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Internal.Generics;
 using JsonApiDotNetCore.Models.Operations;
 using JsonApiDotNetCore.Services.Operations.Processors;
@@ -90,6 +91,9 @@ public IOpProcessor LocateUpdateService(Operation operation)
             var resource = operation.GetResourceTypeName();
 
             var contextEntity = _context.ContextGraph.GetContextEntity(resource);
+            if (contextEntity == null)
+                throw new JsonApiException(400, $"This API does not expose a resource of type '{resource}'.");
+
             var processor = _processorFactory.GetProcessor<IOpProcessor>(
                 typeof(IUpdateOpProcessor<,>), contextEntity.EntityType, contextEntity.IdentityType
             );

src/JsonApiDotNetCore/Services/Operations/Processors/UpdateOpProcessor.cs

@@ -53,16 +53,17 @@ public async Task<Operation> ProcessAsync(Operation operation)
                 throw new JsonApiException(400, "The data.id parameter is required for replace operations");
 
             var model = (T)_deSerializer.DocumentToObject(operation.DataObject);
+
             var result = await _service.UpdateAsync(model.Id, model);
+            if (result == null)
+                throw new JsonApiException(404, $"Could not find an instance of '{operation.DataObject.Type}' with id {operation.DataObject.Id}");
 
             var operationResult = new Operation
             {
                 Op = OperationCode.update
             };
 
-            operationResult.Data = _documentBuilder.GetData(
-                _contextGraph.GetContextEntity(operation.GetResourceTypeName()),
-                result);
+            operationResult.Data = _documentBuilder.GetData(_contextGraph.GetContextEntity(operation.GetResourceTypeName()), result);
 
             return operationResult;
         }

src/JsonApiDotNetCore/Services/ScopedServiceProvider.cs

@@ -15,14 +15,14 @@ public interface IScopedServiceProvider : IServiceProvider { }
     /// </summary>
     public class RequestScopedServiceProvider : IScopedServiceProvider
     {
-        private readonly IServiceProvider _serviceProvider;
+        private readonly IHttpContextAccessor _httpContextAccessor;
 
         public RequestScopedServiceProvider(IHttpContextAccessor httpContextAccessor)
         {
-            _serviceProvider = httpContextAccessor.HttpContext.RequestServices;
+            _httpContextAccessor = httpContextAccessor;
         }
 
         /// <inheritdoc />
-        public object GetService(Type serviceType) => _serviceProvider.GetService(serviceType);
+        public object GetService(Type serviceType) => _httpContextAccessor.HttpContext.RequestServices.GetService(serviceType);
     }
 }