Merge from master

Shane32 · Shane32 · commit 9c5232407f19 · 2022-02-14T09:27:29.000-05:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,9 +1,18 @@
 version: 2
 updates:
+
 - package-ecosystem: "nuget"
   directory: "/"
   schedule:
     interval: "daily"
+  ignore:
+    - dependency-name: "GraphQL.DataLoader"
+    - dependency-name: "GraphQL.MemoryCache"
+    - dependency-name: "GraphQL.MicrosoftDI"
+    - dependency-name: "GraphQL.NewtonsoftJson"
+    - dependency-name: "GraphQL.SystemTextJson"
+    - dependency-name: "GraphQL.SystemReactive"
+
 - package-ecosystem: "github-actions"
   directory: "/"
   schedule:
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,4 +1,6 @@
-test: ['tests/**/*', '!tests/ApiApprovalTests/**/*.txt']
+test:
+  - tests/*.Tests/**/*
+  - tests/ApiApprovalTests/**/*.cs
 
 CI:
   - .github/workflows/**/*
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -49,7 +49,7 @@ jobs:
       - name: Publish Nuget packages to Nuget registry
         run: dotnet nuget push "out/*" -k ${{secrets.NUGET_AUTH_TOKEN}}
       - name: Upload Nuget packages as release artifacts
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
diff --git a/Tests.props b/Tests.props
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="3.1.0">
+    <PackageReference Include="coverlet.msbuild" Version="3.1.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -16,7 +16,7 @@
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="NSubstitute" Version="4.2.2" />
+    <PackageReference Include="NSubstitute" Version="4.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.19" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.10" Condition="'$(TargetFramework)' == 'net5'" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6'" />
diff --git a/samples/Samples.Schemas.Chat/IChat.cs b/samples/Samples.Schemas.Chat/IChat.cs
@@ -44,7 +44,7 @@ public Message AddMessage(ReceivedMessage message)
             return AddMessage(new Message
             {
                 Content = message.Content,
-                SentAt = message.SentAt,
+                SentAt = message.SentAt ?? DateTime.UtcNow,
                 From = new MessageFrom
                 {
                     DisplayName = displayName,
diff --git a/samples/Samples.Schemas.Chat/Message.cs b/samples/Samples.Schemas.Chat/Message.cs
@@ -10,6 +10,6 @@ public class Message
 
         public string Content { get; set; }
 
-        public DateTime SentAt { get; set; }
+        public DateTime? SentAt { get; set; }
     }
 }
diff --git a/samples/Samples.Schemas.Chat/MessageType.cs b/samples/Samples.Schemas.Chat/MessageType.cs
@@ -7,7 +7,7 @@ public class MessageType : ObjectGraphType<Message>
         public MessageType()
         {
             Field(o => o.Content);
-            Field(o => o.SentAt, type: typeof(DateGraphType));
+            Field(o => o.SentAt, type: typeof(DateTimeGraphType));
             Field(o => o.Sub);
             Field(o => o.From, false, typeof(MessageFromType)).Resolve(ResolveFrom);
         }
diff --git a/samples/Samples.Schemas.Chat/ReceivedMessage.cs b/samples/Samples.Schemas.Chat/ReceivedMessage.cs
@@ -8,6 +8,6 @@ public class ReceivedMessage
 
         public string Content { get; set; }
 
-        public DateTime SentAt { get; set; }
+        public DateTime? SentAt { get; set; }
     }
 }
diff --git a/samples/Samples.Server/Samples.Server.csproj b/samples/Samples.Server/Samples.Server.csproj
@@ -12,6 +12,7 @@
     <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
     <PackageReference Include="GraphQL.MicrosoftDI" Version="5.0.0-preview-457" />
+    <PackageReference Include="GraphQL.SystemReactive" Version="5.0.0-preview-457" />
     <PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0-preview-457" />
   </ItemGroup>
 
diff --git a/samples/Samples.Server/Startup.cs b/samples/Samples.Server/Startup.cs
@@ -10,6 +10,7 @@
 using GraphQL.Server.Ui.GraphiQL;
 using GraphQL.Server.Ui.Playground;
 using GraphQL.Server.Ui.Voyager;
+using GraphQL.SystemReactive;
 using GraphQL.SystemTextJson;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
diff --git a/samples/Samples.Server/StartupWithRouting.cs b/samples/Samples.Server/StartupWithRouting.cs
@@ -8,6 +8,7 @@
 using GraphQL.Server.Ui.GraphiQL;
 using GraphQL.Server.Ui.Playground;
 using GraphQL.Server.Ui.Voyager;
+using GraphQL.SystemReactive;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
diff --git a/src/Transports.Subscriptions.Abstractions/SubscriptionManager.cs b/src/Transports.Subscriptions.Abstractions/SubscriptionManager.cs
@@ -7,6 +7,7 @@
 using GraphQL.Server.Transports.Subscriptions.Abstractions.Internal;
 using GraphQL.Subscription;
 using GraphQL.Transport;
+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,
-                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,
+                    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() { }
+        }
     }
 }
diff --git a/src/Transports.Subscriptions.WebSockets/WebSocketConnectionFactory.cs b/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,17 +16,32 @@ public class WebSocketConnectionFactory<TSchema> : IWebSocketConnectionFactory<T
         private readonly IGraphQLExecuter<TSchema> _executer;
         private readonly IEnumerable<IOperationMessageListener> _messageListeners;
         private readonly IGraphQLTextSerializer _serializer;
+        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,
             IGraphQLTextSerializer serializer)
+            : this(logger, loggerFactory, executer, messageListeners, serializer, null)
+        {
+        }
+
+        public WebSocketConnectionFactory(
+            ILogger<WebSocketConnectionFactory<TSchema>> logger,
+            ILoggerFactory loggerFactory,
+            IGraphQLExecuter<TSchema> executer,
+            IEnumerable<IOperationMessageListener> messageListeners,
+            IGraphQLTextSerializer serializer,
+            IServiceScopeFactory serviceScopeFactory)
         {
             _logger = logger;
             _loggerFactory = loggerFactory;
             _executer = executer;
             _messageListeners = messageListeners;
+            _serviceScopeFactory = serviceScopeFactory;
             _serializer = serializer;
         }
 
@@ -33,7 +50,11 @@ public WebSocketConnection CreateConnection(WebSocket socket, string connectionI
             _logger.LogDebug("Creating server for connection {connectionId}", connectionId);
 
             var transport = new WebSocketTransport(socket, _serializer);
-            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,
diff --git a/src/Ui.GraphiQL/GraphiQLOptions.cs b/src/Ui.GraphiQL/GraphiQLOptions.cs
@@ -35,5 +35,19 @@ public class GraphiQLOptions
         /// Gets or sets a delegate that is called after all transformations of the GraphiQL UI page.
         /// </summary>
         public Func<GraphiQLOptions, string, string> PostConfigure { get; set; } = (options, result) => result;
+
+        /// <summary>
+        /// Enables the header editor when <see langword="true"/>.
+        /// Not supported when <see cref="ExplorerExtensionEnabled"/> is <see langword="true"/>.
+        /// </summary>
+        /// <remarks>
+        /// Original setting from <see href="https://github.com/graphql/graphiql/blob/08250feb6ee8335c3b1ca83a912911ae92a75722/packages/graphiql/src/components/GraphiQL.tsx#L186">GraphiQL</see>.
+        /// </remarks>
+        public bool HeaderEditorEnabled { get; set; } = true;
+
+        /// <summary>
+        /// Enables the explorer extension when <see langword="true"/>.
+        /// </summary>
+        public bool ExplorerExtensionEnabled { get; set; } = true;
     }
 }
diff --git a/src/Ui.GraphiQL/Internal/GraphiQLPageModel.cs b/src/Ui.GraphiQL/Internal/GraphiQLPageModel.cs
@@ -39,7 +39,9 @@ public string Render()
                 var builder = new StringBuilder(streamReader.ReadToEnd())
                     .Replace("@Model.GraphQLEndPoint", _options.GraphQLEndPoint)
                     .Replace("@Model.SubscriptionsEndPoint", _options.SubscriptionsEndPoint)
-                    .Replace("@Model.Headers", JsonSerializer.Serialize<object>(headers));
+                    .Replace("@Model.Headers", JsonSerializer.Serialize<object>(headers))
+                    .Replace("@Model.HeaderEditorEnabled", _options.HeaderEditorEnabled ? "true" : "false")
+                    .Replace("@Model.GraphiQLElement", _options.ExplorerExtensionEnabled ? "GraphiQLWithExtensions.GraphiQLWithExtensions" : "GraphiQL");
 
                 _graphiQLCSHtml = _options.PostConfigure(_options, builder.ToString());
             }
diff --git a/src/Ui.GraphiQL/Internal/graphiql.cshtml b/src/Ui.GraphiQL/Internal/graphiql.cshtml
diff --git a/tests/ApiApprovalTests/ApiApprovalTests.csproj b/tests/ApiApprovalTests/ApiApprovalTests.csproj
diff --git a/tests/ApiApprovalTests/GraphQL.Server.Transports.Subscriptions.Abstractions.approved.txt b/tests/ApiApprovalTests/GraphQL.Server.Transports.Subscriptions.Abstractions.approved.txt
diff --git a/tests/ApiApprovalTests/GraphQL.Server.Transports.Subscriptions.WebSockets.approved.txt b/tests/ApiApprovalTests/GraphQL.Server.Transports.Subscriptions.WebSockets.approved.txt
diff --git a/tests/ApiApprovalTests/GraphQL.Server.Ui.GraphiQL.approved.txt b/tests/ApiApprovalTests/GraphQL.Server.Ui.GraphiQL.approved.txt
diff --git a/tests/Samples.Server.Tests/ResponseTests.cs b/tests/Samples.Server.Tests/ResponseTests.cs

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public Message AddMessage(ReceivedMessage message)`
`44`	`44`	`return AddMessage(new Message`
`45`	`45`	`{`
`46`	`46`	`Content = message.Content,`
`47`		`- SentAt = message.SentAt,`
	`47`	`+ SentAt = message.SentAt ?? DateTime.UtcNow,`
`48`	`48`	`From = new MessageFrom`
`49`	`49`	`{`
`50`	`50`	`DisplayName = displayName,`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ public class Message`
`10`	`10`
`11`	`11`	`public string Content { get; set; }`
`12`	`12`
`13`		`- public DateTime SentAt { get; set; }`
	`13`	`+ public DateTime? SentAt { get; set; }`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class MessageType : ObjectGraphType<Message>`
`7`	`7`	`public MessageType()`
`8`	`8`	`{`
`9`	`9`	`Field(o => o.Content);`
`10`		`- Field(o => o.SentAt, type: typeof(DateGraphType));`
	`10`	`+ Field(o => o.SentAt, type: typeof(DateTimeGraphType));`
`11`	`11`	`Field(o => o.Sub);`
`12`	`12`	`Field(o => o.From, false, typeof(MessageFromType)).Resolve(ResolveFrom);`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ public class ReceivedMessage`
`8`	`8`
`9`	`9`	`public string Content { get; set; }`
`10`	`10`
`11`		`- public DateTime SentAt { get; set; }`
	`11`	`+ public DateTime? SentAt { get; set; }`
`12`	`12`	`}`
`13`	`13`	`}`