Remove unnecessary null check in 2FA authorization filter (#17009)

Co-authored-by: Georg von Kries <[email protected]>
OrchardCMS · Nov 30, 2024 · f74a99b · f74a99b
1 parent 62ec4b0
commit f74a99b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Services/ContainerService.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Services/ContainerService.cs
@@ -362,7 +362,7 @@ private void ApplyContainedItemOptionsFilter(ContainedItemOptions containedItemO
                 query.With<ContentItemIndex>(i => !i.Published && i.Latest);
                 break;
             case ContentsStatus.Owner:
-                var currentUserName = _httpContextAccessor.HttpContext?.User?.FindFirstValue(ClaimTypes.NameIdentifier);
+                var currentUserName = _httpContextAccessor.HttpContext?.User.FindFirstValue(ClaimTypes.NameIdentifier);
 
                 if (currentUserName != null)
                 {

diff --git a/...chardCore.Modules/OrchardCore.Users/Filters/TwoFactorAuthenticationAuthorizationFilter.cs b/...chardCore.Modules/OrchardCore.Users/Filters/TwoFactorAuthenticationAuthorizationFilter.cs
@@ -36,7 +36,7 @@ public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
     {
         ArgumentNullException.ThrowIfNull(context);
 
-        if (context.HttpContext?.User?.Identity?.IsAuthenticated == false ||
+        if ((context.HttpContext?.User.Identity?.IsAuthenticated ?? false) == false ||
             context.HttpContext.Request.Path.Equals("/" + _userOptions.LogoffPath, StringComparison.OrdinalIgnoreCase) ||
             context.HttpContext.Request.Path.Equals("/" + _userOptions.TwoFactorAuthenticationPath, StringComparison.OrdinalIgnoreCase) ||
             context.HttpContext.Request.Path.Equals("/TwoFactor-Authenticator/", StringComparison.OrdinalIgnoreCase))

diff --git a/...odules/OrchardCore.Users/Localization/Providers/UserLocalizationRequestCultureProvider.cs b/...odules/OrchardCore.Users/Localization/Providers/UserLocalizationRequestCultureProvider.cs
@@ -10,7 +10,7 @@ public override Task<ProviderCultureResult> DetermineProviderCultureResult(HttpC
     {
         ArgumentNullException.ThrowIfNull(httpContext);
 
-        if (httpContext?.User?.Identity?.IsAuthenticated == false)
+        if ((httpContext?.User.Identity?.IsAuthenticated ?? false) == false)
         {
             return NullProviderCultureResult;
         }

diff --git a/src/OrchardCore/OrchardCore.ContentManagement/Handlers/UpdateContentsHandler.cs b/src/OrchardCore/OrchardCore.ContentManagement/Handlers/UpdateContentsHandler.cs
@@ -26,7 +26,7 @@ public override Task CreatingAsync(CreateContentContext context)
         context.ContentItem.ModifiedUtc = utcNow;
 
         var httpContext = _httpContextAccessor.HttpContext;
-        if (context.ContentItem.Owner == null && (httpContext?.User?.Identity?.IsAuthenticated ?? false))
+        if (context.ContentItem.Owner == null && (httpContext?.User.Identity?.IsAuthenticated ?? false))
         {
             context.ContentItem.Owner = httpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
             context.ContentItem.Author = httpContext.User.Identity.Name;
@@ -40,7 +40,7 @@ public override Task UpdatingAsync(UpdateContentContext context)
         var utcNow = _clock.UtcNow;
         context.ContentItem.ModifiedUtc = utcNow;
         var httpContext = _httpContextAccessor.HttpContext;
-        if (httpContext?.User?.Identity?.IsAuthenticated ?? false)
+        if (httpContext?.User.Identity?.IsAuthenticated ?? false)
         {
             // The value is only modified during update so that another event like
             // publishing in a Workflow doesn't change it.