From f389cc9aa37417805f061a2d18ca88a8c21e350a Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Wed, 19 Feb 2025 09:46:14 +0100 Subject: [PATCH] Modified AspNetCoreRequestAccessor to gracefully handle the absence of an HttpContext (#18369) --- .../AspNetCore/AspNetCoreRequestAccessor.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreRequestAccessor.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreRequestAccessor.cs index 6e6de49521..ca548586a1 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreRequestAccessor.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreRequestAccessor.cs @@ -34,7 +34,7 @@ public class AspNetCoreRequestAccessor : IRequestAccessor, IDisposable public string? GetRequestValue(string name) => GetFormValue(name) ?? GetQueryStringValue(name); /// - public string? GetQueryStringValue(string name) => _httpContextAccessor.GetRequiredHttpContext().Request.Query[name]; + public string? GetQueryStringValue(string name) => _httpContextAccessor.HttpContext?.Request.Query[name]; /// public Uri? GetRequestUrl() => _httpContextAccessor.HttpContext != null @@ -86,8 +86,8 @@ public class AspNetCoreRequestAccessor : IRequestAccessor, IDisposable private string? GetFormValue(string name) { - HttpRequest request = _httpContextAccessor.GetRequiredHttpContext().Request; - if (!request.HasFormContentType) + HttpRequest? request = _httpContextAccessor.HttpContext?.Request; + if (request?.HasFormContentType is not true) { return null; }