Clear HttpContext in background, also allows bg job from bg task. (#1…

…4140)
OrchardCMS · Aug 15, 2023 · 25b098b · 25b098b
1 parent 9b44b9e
commit 25b098b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/OrchardCore/OrchardCore.Abstractions/BackgroundJobs/HttpBackgroundJob.cs b/src/OrchardCore/OrchardCore.Abstractions/BackgroundJobs/HttpBackgroundJob.cs
@@ -25,9 +25,9 @@ public static Task ExecuteAfterEndOfRequestAsync(string jobName, Func<ShellScope
             return Task.CompletedTask;
         }
 
-        // Can't be executed outside the context of a real http request scope.
+        // Can't be executed outside of an http context.
         var httpContextAccessor = scope.ServiceProvider.GetRequiredService<IHttpContextAccessor>();
-        if (httpContextAccessor.HttpContext == null || httpContextAccessor.HttpContext.Items.TryGetValue("IsBackground", out _))
+        if (httpContextAccessor.HttpContext == null)
         {
             return Task.CompletedTask;
         }
@@ -57,7 +57,7 @@ public static Task ExecuteAfterEndOfRequestAsync(string jobName, Func<ShellScope
                 return;
             }
 
-            // Initialize a new 'HttpContext' to be used in the background.
+            // Create a new 'HttpContext' to be used in the background.
             httpContextAccessor.HttpContext = shellContext.CreateHttpContext();
 
             // Here the 'IActionContextAccessor.ActionContext' need to be cleared, this 'AsyncLocal'
@@ -87,6 +87,9 @@ await ShellScope.UsingChildScopeAsync(async scope =>
                         scope.ShellContext.Settings.Name);
                 }
             });
+
+            // Clear the 'HttpContext' for this async flow.
+            httpContextAccessor.HttpContext = null;
         });
 
         return Task.CompletedTask;

diff --git a/src/OrchardCore/OrchardCore/Modules/ModularBackgroundService.cs b/src/OrchardCore/OrchardCore/Modules/ModularBackgroundService.cs
@@ -106,6 +106,7 @@ await GetShellsToRun(runningShells).ForEachAsync(async shell =>
             {
                 var tenant = shell.Settings.Name;
 
+                // Create a new 'HttpContext' to be used in the background.
                 _httpContextAccessor.HttpContext = shell.CreateHttpContext();
 
                 var schedulers = GetSchedulersToRun(tenant);
@@ -182,6 +183,9 @@ await shellScope.UsingAsync(async scope =>
                         await handlers.InvokeAsync((handler, context, token) => handler.ExecutedAsync(context, token), context, stoppingToken, _logger);
                     });
                 }
+
+                // Clear the 'HttpContext' for this async flow.
+                _httpContextAccessor.HttpContext = null;
             });
         }
 
@@ -198,6 +202,7 @@ await GetShellsToUpdate(previousShells, runningShells).ForEachAsync(async shell
                     return;
                 }
 
+                // Create a new 'HttpContext' to be used in the background.
                 _httpContextAccessor.HttpContext = shell.CreateHttpContext();
 
                 var shellScope = await _shellHost.GetScopeAsync(shell.Settings);
@@ -273,6 +278,9 @@ await shellScope.UsingAsync(async scope =>
                         scheduler.Updated = true;
                     }
                 });
+
+                // Clear the 'HttpContext' for this async flow.
+                _httpContextAccessor.HttpContext = null;
             });
         }