Avoid null reference exception

Fix #15419
OrchardCMS · Feb 28, 2024 · 06f61e0 · 06f61e0
1 parent f35c8eb
commit 06f61e0
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Recipes/WorkflowTypeStep.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Recipes/WorkflowTypeStep.cs
@@ -33,7 +33,11 @@ public WorkflowTypeStep(IWorkflowTypeStore workflowTypeStore,
             _workflowTypeStore = workflowTypeStore;
             _securityTokenService = securityTokenService;
             _jsonSerializerOptions = jsonSerializerOptions.Value;
-            _urlHelper = urlHelperFactory.GetUrlHelper(actionContextAccessor.ActionContext);
+            // When an instance of this class is created outside of a controller's action, the ActionContext is null.
+            if (actionContextAccessor.ActionContext != null)
+            {
+                _urlHelper = urlHelperFactory.GetUrlHelper(actionContextAccessor.ActionContext);
+            }
         }
 
         public async Task ExecuteAsync(RecipeExecutionContext context)
@@ -49,12 +53,15 @@ public async Task ExecuteAsync(RecipeExecutionContext context)
             {
                 var workflow = token.ToObject<WorkflowType>(_jsonSerializerOptions);
 
-                foreach (var activity in workflow.Activities.Where(a => a.Name == nameof(HttpRequestEvent)))
+                if (_urlHelper is not null)
                 {
-                    var tokenLifeSpan = activity.Properties["TokenLifeSpan"];
-                    if (tokenLifeSpan != null)
+                    foreach (var activity in workflow.Activities.Where(a => a.Name == nameof(HttpRequestEvent)))
                     {
-                        activity.Properties["Url"] = ReGenerateHttpRequestEventUrl(workflow, activity, tokenLifeSpan.ToObject<int>());
+                        var tokenLifeSpan = activity.Properties["TokenLifeSpan"];
+                        if (tokenLifeSpan != null)
+                        {
+                            activity.Properties["Url"] = ReGenerateHttpRequestEventUrl(workflow, activity, tokenLifeSpan.ToObject<int>());
+                        }
                     }
                 }