Reintroduce RequestContextAccessor

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100-preview.6.23330.14"
+    "version": "8.0.100-preview.7.23376.3"
   }
 }

src/HotChocolate/Core/src/Execution/DefaultRequestContextAccessor.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Threading;
+
+namespace HotChocolate.Execution;
+
+internal sealed class DefaultRequestContextAccessor : IRequestContextAccessor
+{
+    private static readonly AsyncLocal<RequestContextHolder> _requestContextCurrent = new();
+
+    public IRequestContext RequestContext
+    {
+        get
+        {
+            return _requestContextCurrent.Value?.Context ??
+                throw new InvalidCastException("Can only be accessed in a request context.");
+        }
+        set
+        {
+            RequestContextHolder? holder = _requestContextCurrent.Value;
+
+            if (holder is null)
+            {
+                holder = new RequestContextHolder();
+                _requestContextCurrent.Value = holder;
+            }
+
+            holder.Context = value;
+        }
+    }
+
+    private class RequestContextHolder
+    {
+        public IRequestContext Context = default!;
+    }
+}

src/HotChocolate/Core/src/Execution/DependencyInjection/RequestExecutorServiceCollectionExtensions.cs

@@ -33,6 +33,8 @@ public static IServiceCollection AddGraphQLCore(this IServiceCollection services
         services.AddOptions();
 
         services.TryAddSingleton<ObjectPoolProvider, DefaultObjectPoolProvider>();
+        services.TryAddSingleton<DefaultRequestContextAccessor>();
+        services.TryAddSingleton<IRequestContextAccessor>(sp => sp.GetRequiredService<DefaultRequestContextAccessor>());
 
         services.TryAddSingleton<ObjectPool<StringBuilder>>(sp =>
         {

src/HotChocolate/Core/src/Execution/IRequestContextAccessor.cs

@@ -0,0 +1,16 @@
+namespace HotChocolate.Execution;
+
+/// <summary>
+/// The <see cref="IRequestContextAccessor"/> allows access to the
+/// <see cref="IRequestContext"/> during request execution.
+///
+/// Be aware that the <see cref="IRequestContext"/> is not thread-safe and should
+/// not be mutated within resolvers.
+/// </summary>
+public interface IRequestContextAccessor
+{
+    /// <summary>
+    /// Gets the <see cref="IRequestContext"/>.
+    /// </summary>
+    IRequestContext RequestContext { get; }
+}

src/HotChocolate/Core/src/Execution/RequestExecutor.cs

@@ -17,6 +17,7 @@ internal sealed class RequestExecutor : IRequestExecutor
     private readonly RequestDelegate _requestDelegate;
     private readonly BatchExecutor _batchExecutor;
     private readonly ObjectPool<RequestContext> _contextPool;
+    private readonly DefaultRequestContextAccessor _contextAccessor;
     private readonly IRequestContextEnricher[] _enricher;
 
     public RequestExecutor(
@@ -26,6 +27,7 @@ public RequestExecutor(
         RequestDelegate requestDelegate,
         BatchExecutor batchExecutor,
         ObjectPool<RequestContext> contextPool,
+        DefaultRequestContextAccessor contextAccessor,
         ulong version)
     {
         Schema = schema ??
@@ -40,6 +42,8 @@ public RequestExecutor(
             throw new ArgumentNullException(nameof(batchExecutor));
         _contextPool = contextPool ??
             throw new ArgumentNullException(nameof(contextPool));
+        _contextAccessor = contextAccessor ?? 
+            throw new ArgumentNullException(nameof(contextAccessor));
         Version = version;
 
         var list = new List<IRequestContextEnricher>();
@@ -88,6 +92,8 @@ public async Task<IExecutionResult> ExecuteAsync(
             context.RequestAborted = cancellationToken;
             context.Initialize(request, services);
             EnrichContext(context);
+
+            _contextAccessor.RequestContext = context;
 
             await _requestDelegate(context).ConfigureAwait(false);
 

src/HotChocolate/Core/src/Execution/RequestExecutorResolver.cs

@@ -320,6 +320,7 @@ await typeModuleChangeMonitor.ConfigureAsync(context, cancellationToken)
                 sp.GetRequiredService<RequestDelegate>(),
                 sp.GetRequiredService<BatchExecutor>(),
                 sp.GetRequiredService<ObjectPool<RequestContext>>(),
+                sp.GetApplicationService<DefaultRequestContextAccessor>(),
                 version));
 
         OnConfigureSchemaServices(context, serviceCollection, setup);