.

Author: SimonCropp

src/SampleWeb/Subscription.cs

@@ -101,7 +101,6 @@
 //        {
 //            Document = document,
 //            Schema = schema,
-//            UserContext = new UserContext(dbContext),
 //            Variables = variableValues,
 //            Fragments = document.Fragments,
 //            CancellationToken = token,
@@ -141,7 +140,6 @@
 //            Document = context.Document,
 //            Fragments = context.Fragments,
 //            RootValue = context.RootValue,
-//            UserContext = context.UserContext,
 //            Operation = context.Operation,
 //            Variables = context.Variables,
 //            CancellationToken = context.CancellationToken,

src/SampleWeb/UserContext.cs

@@ -24,16 +24,16 @@ public async Task ExplicitModel()
         services.AddSingleton<DependencySchema>();
         EfGraphQLConventions.RegisterInContainer(
             services,
-            (userContext, _) => ((UserContextSingleDb<DependencyDbContext>) userContext).DbContext,
+            (_, _) => dbContext,
             sqlInstance.Model);
         await using var provider = services.BuildServiceProvider();
         using var schema = provider.GetRequiredService<DependencySchema>();
         var executionOptions = new ExecutionOptions
         {
             Schema = schema,
             Query = query,
-            UserContext = new UserContextSingleDb<DependencyDbContext>(dbContext),
-            Variables = null
+            Variables = null,
+            RequestServices = provider
         };
 
         await ExecutionResultData(executionOptions);
@@ -50,15 +50,15 @@ public async Task ScopedDbContext()
 
         EfGraphQLConventions.RegisterInContainer(
             services,
-            (userContext, _)  => ((UserContextSingleDb<DependencyDbContext>) userContext).DbContext);
+            (_, requestServices) => requestServices!.GetRequiredService<DependencyDbContext>());
         await using var provider = services.BuildServiceProvider();
         using var schema = new DependencySchema(provider);
         var executionOptions = new ExecutionOptions
         {
             Schema = schema,
             Query = query,
-            UserContext = new UserContextSingleDb<DependencyDbContext>(dbContext),
-            Variables = null
+            Variables = null,
+            RequestServices = provider
         };
 
         await ExecutionResultData(executionOptions);
@@ -75,15 +75,15 @@ public async Task TransientDbContext()
 
         EfGraphQLConventions.RegisterInContainer(
             services,
-            (userContext, _) => ((UserContextSingleDb<DependencyDbContext>) userContext).DbContext);
+            (_, requestServices) => requestServices!.GetRequiredService<DependencyDbContext>());
         await using var provider = services.BuildServiceProvider();
         using var schema = new DependencySchema(provider);
         var options = new ExecutionOptions
         {
             Schema = schema,
             Query = query,
-            UserContext = new UserContextSingleDb<DependencyDbContext>(dbContext),
-            Variables = null
+            Variables = null,
+            RequestServices = provider
         };
 
         await ExecutionResultData(options);
@@ -100,15 +100,15 @@ public async Task SingletonDbContext()
 
         EfGraphQLConventions.RegisterInContainer(
             services,
-            (userContext, _) => ((UserContextSingleDb<DependencyDbContext>) userContext).DbContext);
+            (_, requestServices) => requestServices!.GetRequiredService<DependencyDbContext>());
         await using var provider = services.BuildServiceProvider();
         using var schema = new DependencySchema(provider);
         var options = new ExecutionOptions
         {
             Schema = schema,
             Query = query,
-            UserContext = new UserContextSingleDb<DependencyDbContext>(dbContext),
-            Variables = null
+            Variables = null,
+            RequestServices = provider
         };
 
         await ExecutionResultData(options);

src/Tests/DependencyResolutionTests/DependencyTests.cs

@@ -26,8 +26,8 @@ public static async Task<string> ExecuteQuery<TDbContext>(
             Schema = schema,
             Query = query,
             ThrowOnUnhandledException = true,
-            UserContext = new UserContextSingleDb<TDbContext>(data),
             Variables = inputs,
+            RequestServices = provider,
         };
 
         var result = await executer.ExecuteWithErrorCheck(options);

src/Tests/IntegrationTests/QueryExecutor.cs

@@ -10,32 +10,32 @@ public MultiContextQuery(
             name: "entity1",
             resolve: context =>
             {
-                var userContext = (UserContext) context.UserContext;
-                return userContext.DbContext1.Entities;
+                var data = context.RequestServices!.GetRequiredService<DbContext1>();
+                return data.Entities;
             });
         efGraphQlService1.AddFirstField(
             graph: this,
             name: "entity1First",
             resolve: context =>
             {
-                var userContext = (UserContext) context.UserContext;
-                return userContext.DbContext1.Entities;
+                var data = context.RequestServices!.GetRequiredService<DbContext1>();
+                return data.Entities;
             });
         efGraphQlService2.AddSingleField(
             graph: this,
             name: "entity2",
             resolve: context =>
             {
-                var userContext = (UserContext) context.UserContext;
-                return userContext.DbContext2.Entities;
+                var data = context.RequestServices!.GetRequiredService<DbContext2>();
+                return data.Entities;
             });
         efGraphQlService2.AddFirstField(
             graph: this,
             name: "entity2First",
             resolve: context =>
             {
-                var userContext = (UserContext) context.UserContext;
-                return userContext.DbContext2.Entities;
+                var data = context.RequestServices!.GetRequiredService<DbContext2>();
+                return data.Entities;
             });
     }
 }

src/Tests/MultiContextTests/MultiContextQuery.cs

@@ -67,7 +67,6 @@ public async Task Run()
         {
             Schema = schema,
             Query = query,
-            UserContext = new UserContext(dbContext1, dbContext2),
             RequestServices = provider,
         };
 
@@ -76,12 +75,4 @@ public async Task Run()
         var result = await documentExecuter.ExecuteWithErrorCheck(executionOptions);
         await Verify(result.Serialize());
     }
-}
-
-#region MultiUserContext
-public class UserContext(DbContext1 context1, DbContext2 context2) : Dictionary<string, object?>
-{
-    public readonly DbContext1 DbContext1 = context1;
-    public readonly DbContext2 DbContext2 = context2;
-}
-#endregion
+}