Provide service provider to subscription execution (#691)

Author: Shane32

src/Transports.Subscriptions.Abstractions/SubscriptionManager.cs

@@ -7,6 +7,7 @@
 using GraphQL.NewtonsoftJson;
 using GraphQL.Server.Transports.Subscriptions.Abstractions.Internal;
 using GraphQL.Subscription;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 namespace GraphQL.Server.Transports.Subscriptions.Abstractions
@@ -17,17 +18,24 @@ public class SubscriptionManager : ISubscriptionManager, IDisposable
         private readonly IGraphQLExecuter _executer;
 
         private readonly ILogger<SubscriptionManager> _logger;
+        private readonly IServiceScopeFactory _serviceScopeFactory;
         private readonly ILoggerFactory _loggerFactory;
         private volatile bool _disposed;
 
-        private readonly ConcurrentDictionary<string, Subscription> _subscriptions =
-            new ConcurrentDictionary<string, Subscription>();
+        private readonly ConcurrentDictionary<string, Subscription> _subscriptions = new();
 
+        [Obsolete]
         public SubscriptionManager(IGraphQLExecuter executer, ILoggerFactory loggerFactory)
+            : this(executer, loggerFactory, NoopServiceScopeFactory.Instance)
+        {
+        }
+
+        public SubscriptionManager(IGraphQLExecuter executer, ILoggerFactory loggerFactory, IServiceScopeFactory serviceScopeFactory)
         {
             _executer = executer;
             _loggerFactory = loggerFactory;
             _logger = loggerFactory.CreateLogger<SubscriptionManager>();
+            _serviceScopeFactory = serviceScopeFactory;
         }
 
         public Subscription this[string id] => _subscriptions[id];
@@ -82,13 +90,17 @@ private async Task<Subscription> ExecuteAsync(
                 payload.OperationName,
                 payload.Query);
 
-            var result = await _executer.ExecuteAsync(
-                payload.OperationName,
-                payload.Query,
-                payload.Variables?.ToInputs(),
-                context,
-                null // TODO: find later a better way to specify services
-            ).ConfigureAwait(false);
+            ExecutionResult result;
+            using (var scope = _serviceScopeFactory.CreateScope())
+            {
+                result = await _executer.ExecuteAsync(
+                    payload.OperationName,
+                    payload.Query,
+                    payload.Variables?.ToInputs(),
+                    context,
+                    scope.ServiceProvider
+                ).ConfigureAwait(false);
+            }
 
             if (result.Errors != null && result.Errors.Any())
             {
@@ -169,5 +181,14 @@ public virtual void Dispose()
                 }
             }
         }
+
+        private sealed class NoopServiceScopeFactory : IServiceScopeFactory, IServiceScope
+        {
+            public static IServiceScopeFactory Instance { get; } = new NoopServiceScopeFactory();
+            private NoopServiceScopeFactory() { }
+            IServiceScope IServiceScopeFactory.CreateScope() => this;
+            IServiceProvider IServiceScope.ServiceProvider => null;
+            void IDisposable.Dispose() { }
+        }
     }
 }

src/Transports.Subscriptions.WebSockets/WebSocketConnectionFactory.cs

@@ -1,7 +1,9 @@
+using System;
 using System.Collections.Generic;
 using System.Net.WebSockets;
 using GraphQL.Server.Transports.Subscriptions.Abstractions;
 using GraphQL.Types;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 namespace GraphQL.Server.Transports.WebSockets
@@ -14,26 +16,45 @@ public class WebSocketConnectionFactory<TSchema> : IWebSocketConnectionFactory<T
         private readonly IGraphQLExecuter<TSchema> _executer;
         private readonly IEnumerable<IOperationMessageListener> _messageListeners;
         private readonly IDocumentWriter _documentWriter;
+        private readonly IServiceScopeFactory _serviceScopeFactory;
 
-        public WebSocketConnectionFactory(ILogger<WebSocketConnectionFactory<TSchema>> logger,
+        [Obsolete]
+        public WebSocketConnectionFactory(
+            ILogger<WebSocketConnectionFactory<TSchema>> logger,
             ILoggerFactory loggerFactory,
             IGraphQLExecuter<TSchema> executer,
             IEnumerable<IOperationMessageListener> messageListeners,
             IDocumentWriter documentWriter)
+            : this(logger, loggerFactory, executer, messageListeners, documentWriter, null)
+        {
+        }
+
+        public WebSocketConnectionFactory(
+            ILogger<WebSocketConnectionFactory<TSchema>> logger,
+            ILoggerFactory loggerFactory,
+            IGraphQLExecuter<TSchema> executer,
+            IEnumerable<IOperationMessageListener> messageListeners,
+            IDocumentWriter documentWriter,
+            IServiceScopeFactory serviceScopeFactory)
         {
             _logger = logger;
             _loggerFactory = loggerFactory;
             _executer = executer;
             _messageListeners = messageListeners;
             _documentWriter = documentWriter;
+            _serviceScopeFactory = serviceScopeFactory;
         }
 
         public WebSocketConnection CreateConnection(WebSocket socket, string connectionId)
         {
             _logger.LogDebug("Creating server for connection {connectionId}", connectionId);
 
             var transport = new WebSocketTransport(socket, _documentWriter);
-            var manager = new SubscriptionManager(_executer, _loggerFactory);
+            var manager = _serviceScopeFactory != null
+                ? new SubscriptionManager(_executer, _loggerFactory, _serviceScopeFactory)
+#pragma warning disable CS0612 // Type or member is obsolete
+                : new SubscriptionManager(_executer, _loggerFactory);
+#pragma warning restore CS0612 // Type or member is obsolete
             var server = new SubscriptionServer(
                 transport,
                 manager,

tests/ApiApprovalTests/GraphQL.Server.Transports.Subscriptions.Abstractions.approved.txt

@@ -109,7 +109,9 @@ namespace GraphQL.Server.Transports.Subscriptions.Abstractions
     }
     public class SubscriptionManager : GraphQL.Server.Transports.Subscriptions.Abstractions.ISubscriptionManager, System.Collections.Generic.IEnumerable<GraphQL.Server.Transports.Subscriptions.Abstractions.Subscription>, System.Collections.IEnumerable, System.IDisposable
     {
+        [System.Obsolete]
         public SubscriptionManager(GraphQL.Server.IGraphQLExecuter executer, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { }
+        public SubscriptionManager(GraphQL.Server.IGraphQLExecuter executer, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.DependencyInjection.IServiceScopeFactory serviceScopeFactory) { }
         public GraphQL.Server.Transports.Subscriptions.Abstractions.Subscription this[string id] { get; }
         public virtual void Dispose() { }
         public System.Collections.Generic.IEnumerator<GraphQL.Server.Transports.Subscriptions.Abstractions.Subscription> GetEnumerator() { }

tests/ApiApprovalTests/GraphQL.Server.Transports.Subscriptions.WebSockets.approved.txt

@@ -29,7 +29,9 @@ namespace GraphQL.Server.Transports.WebSockets
     public class WebSocketConnectionFactory<TSchema> : GraphQL.Server.Transports.WebSockets.IWebSocketConnectionFactory<TSchema>
         where TSchema : GraphQL.Types.ISchema
     {
+        [System.Obsolete]
         public WebSocketConnectionFactory(Microsoft.Extensions.Logging.ILogger<GraphQL.Server.Transports.WebSockets.WebSocketConnectionFactory<TSchema>> logger, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, GraphQL.Server.IGraphQLExecuter<TSchema> executer, System.Collections.Generic.IEnumerable<GraphQL.Server.Transports.Subscriptions.Abstractions.IOperationMessageListener> messageListeners, GraphQL.IDocumentWriter documentWriter) { }
+        public WebSocketConnectionFactory(Microsoft.Extensions.Logging.ILogger<GraphQL.Server.Transports.WebSockets.WebSocketConnectionFactory<TSchema>> logger, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, GraphQL.Server.IGraphQLExecuter<TSchema> executer, System.Collections.Generic.IEnumerable<GraphQL.Server.Transports.Subscriptions.Abstractions.IOperationMessageListener> messageListeners, GraphQL.IDocumentWriter documentWriter, Microsoft.Extensions.DependencyInjection.IServiceScopeFactory serviceScopeFactory) { }
         public GraphQL.Server.Transports.WebSockets.WebSocketConnection CreateConnection(System.Net.WebSockets.WebSocket socket, string connectionId) { }
     }
     public class WebSocketReaderPipeline : GraphQL.Server.Transports.Subscriptions.Abstractions.IReaderPipeline