Remove unnecessary null check in 2FA authorization filter

src/OrchardCore.Modules/OrchardCore.Admin/Drivers/AdminSiteSettingsDisplayDriver.cs

@@ -29,7 +29,7 @@ protected override string SettingsGroupId
 
     public override async Task<IDisplayResult> EditAsync(ISite site, AdminSettings settings, BuildEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
 
         if (!await _authorizationService.AuthorizeAsync(user, PermissionsAdminSettings.ManageAdminSettings))
         {
@@ -48,7 +48,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, AdminSettings s
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, AdminSettings settings, UpdateEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
 
         if (!await _authorizationService.AuthorizeAsync(user, PermissionsAdminSettings.ManageAdminSettings))
         {

src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuNavigationProvidersCoordinator.cs

@@ -45,7 +45,7 @@ public async ValueTask BuildNavigationAsync(string name, NavigationBuilder build
         foreach (var tree in trees)
         {
             if (await _authorizationService.AuthorizeAsync(
-                _httpContextAccessor.HttpContext?.User,
+                _httpContextAccessor.HttpContext.User,
                 Permissions.CreatePermissionForAdminMenu(tree.Name)))
             {
                 await BuildTreeAsync(tree, builder);

src/OrchardCore.Modules/OrchardCore.ArchiveLater/Drivers/ArchiveLaterPartDisplayDriver.cs

@@ -40,7 +40,7 @@ public override async Task<IDisplayResult> UpdateAsync(ArchiveLaterPart part, Up
     {
         var httpContext = _httpContextAccessor.HttpContext;
 
-        if (await _authorizationService.AuthorizeAsync(httpContext?.User, CommonPermissions.PublishContent, part.ContentItem))
+        if (await _authorizationService.AuthorizeAsync(httpContext.User, CommonPermissions.PublishContent, part.ContentItem))
         {
             var viewModel = new ArchiveLaterPartViewModel();
 

src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailSettingsDisplayDriver.cs

@@ -34,7 +34,7 @@ protected override string SettingsGroupId
 
     public override async Task<IDisplayResult> EditAsync(ISite site, AuditTrailSettings settings, BuildEditorContext context)
     {
-        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, AuditTrailPermissions.ManageAuditTrailSettings))
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, AuditTrailPermissions.ManageAuditTrailSettings))
         {
             return null;
         }
@@ -81,7 +81,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, AuditTrailSetti
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, AuditTrailSettings settings, UpdateEditorContext context)
     {
-        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, AuditTrailPermissions.ManageAuditTrailSettings))
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, AuditTrailPermissions.ManageAuditTrailSettings))
         {
             return null;
         }

src/OrchardCore.Modules/OrchardCore.AuditTrail/Drivers/AuditTrailTrimmingSettingsDisplayDriver.cs

@@ -25,7 +25,7 @@ protected override string SettingsGroupId
 
     public override async Task<IDisplayResult> EditAsync(ISite site, AuditTrailTrimmingSettings section, BuildEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, AuditTrailPermissions.ManageAuditTrailSettings))
         {
             return null;
@@ -42,7 +42,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, AuditTrailTrimm
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, AuditTrailTrimmingSettings section, UpdateEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, AuditTrailPermissions.ManageAuditTrailSettings))
         {
             return null;

src/OrchardCore.Modules/OrchardCore.ContentFields/Controllers/ContentPickerAdminController.cs

@@ -87,7 +87,7 @@ public async Task<IActionResult> SearchContentItems(string part, string field, s
             .GetAsync(results.Select(r => r.ContentItemId));
 
         var selectedItems = new List<VueMultiselectItemViewModel>();
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         foreach (var contentItem in contentItems)
         {
             selectedItems.Add(new VueMultiselectItemViewModel()

src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentCulturePickerSettingsDriver.cs

@@ -28,7 +28,7 @@ protected override string SettingsGroupId
 
     public override async Task<IDisplayResult> EditAsync(ISite site, ContentCulturePickerSettings settings, BuildEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
 
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
         {
@@ -45,7 +45,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, ContentCultureP
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, ContentCulturePickerSettings section, UpdateEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
 
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
         {

src/OrchardCore.Modules/OrchardCore.ContentLocalization/Drivers/ContentRequestCultureProviderSettingsDriver.cs

@@ -28,7 +28,7 @@ protected override string SettingsGroupId
 
     public override async Task<IDisplayResult> EditAsync(ISite site, ContentRequestCultureProviderSettings settings, BuildEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
 
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
         {
@@ -44,7 +44,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, ContentRequestC
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, ContentRequestCultureProviderSettings settings, UpdateEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
 
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageContentCulturePicker))
         {

src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailContentsDriver.cs

@@ -27,7 +27,7 @@ public override Task<IDisplayResult> DisplayAsync(ContentItem contentItem, Build
         return Task.FromResult<IDisplayResult>(
             Initialize<ContentItemViewModel>("AuditTrailContentsAction_SummaryAdmin", m => m.ContentItem = contentItem)
             .Location("SummaryAdmin", "ActionsMenu:10")
-            .RenderWhen(() => _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, AuditTrailPermissions.ViewAuditTrail))
+            .RenderWhen(() => _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, AuditTrailPermissions.ViewAuditTrail))
         );
     }
 }

src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/ContentAuditTrailSettingsDisplayDriver.cs

@@ -29,7 +29,7 @@ protected override string SettingsGroupId
 
     public override async Task<IDisplayResult> EditAsync(ISite site, ContentAuditTrailSettings section, BuildEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, AuditTrailPermissions.ManageAuditTrailSettings))
         {
             return null;
@@ -44,7 +44,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, ContentAuditTra
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, ContentAuditTrailSettings section, UpdateEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, AuditTrailPermissions.ManageAuditTrailSettings))
         {
             return null;

src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetSettingsDisplayDriver.cs

@@ -27,7 +27,7 @@ protected override string SettingsGroupId
 
     public override async Task<IDisplayResult> EditAsync(ISite site, ExportContentToDeploymentTargetSettings settings, BuildEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan))
         {
             return null;

src/OrchardCore.Modules/OrchardCore.Contents/Drivers/OwnerEditorDriver.cs

@@ -33,7 +33,7 @@ public OwnerEditorDriver(IAuthorizationService authorizationService,
 
     public override async Task<IDisplayResult> EditAsync(CommonPart part, BuildPartEditorContext context)
     {
-        var currentUser = _httpContextAccessor.HttpContext?.User;
+        var currentUser = _httpContextAccessor.HttpContext.User;
 
         if (!await _authorizationService.AuthorizeAsync(currentUser, CommonPermissions.EditContentOwner, part.ContentItem))
         {
@@ -61,7 +61,7 @@ public override async Task<IDisplayResult> EditAsync(CommonPart part, BuildPartE
 
     public override async Task<IDisplayResult> UpdateAsync(CommonPart part, UpdatePartEditorContext context)
     {
-        var currentUser = _httpContextAccessor.HttpContext?.User;
+        var currentUser = _httpContextAccessor.HttpContext.User;
 
         if (!await _authorizationService.AuthorizeAsync(currentUser, CommonPermissions.EditContentOwner, part.ContentItem))
         {

src/OrchardCore.Modules/OrchardCore.CustomSettings/Services/CustomSettingsService.cs

@@ -67,7 +67,7 @@ public async Task<ContentTypeDefinition> GetSettingsTypeAsync(string settingsTyp
 
     public Task<bool> CanUserCreateSettingsAsync(ContentTypeDefinition settingsType)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
 
         return _authorizationService.AuthorizeAsync(user, Permissions.CreatePermissionForType(settingsType));
     }

src/OrchardCore.Modules/OrchardCore.Email.Azure/Drivers/AzureEmailSettingsDisplayDriver.cs

@@ -50,7 +50,7 @@ protected override string SettingsGroupId
 
     public override async Task<IDisplayResult> EditAsync(ISite site, AzureEmailSettings settings, BuildEditorContext context)
     {
-        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, Permissions.ManageEmailSettings))
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageEmailSettings))
         {
             return null;
         }
@@ -66,7 +66,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, AzureEmailSetti
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, AzureEmailSettings settings, UpdateEditorContext context)
     {
-        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, Permissions.ManageEmailSettings))
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageEmailSettings))
         {
             return null;
         }

src/OrchardCore.Modules/OrchardCore.Email.Smtp/Drivers/SmtpSettingsDisplayDriver.cs

@@ -53,7 +53,7 @@ public SmtpSettingsDisplayDriver(
 
     public override async Task<IDisplayResult> EditAsync(ISite site, SmtpSettings settings, BuildEditorContext context)
     {
-        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, Permissions.ManageEmailSettings))
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageEmailSettings))
         {
             return null;
         }
@@ -83,7 +83,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, SmtpSettings se
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, SmtpSettings settings, UpdateEditorContext context)
     {
-        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, Permissions.ManageEmailSettings))
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageEmailSettings))
         {
             return null;
         }

src/OrchardCore.Modules/OrchardCore.Email/Drivers/EmailSettingsDisplayDriver.cs

@@ -47,7 +47,7 @@ public EmailSettingsDisplayDriver(
     }
     public override async Task<IDisplayResult> EditAsync(ISite site, EmailSettings settings, BuildEditorContext context)
     {
-        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, Permissions.ManageEmailSettings))
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageEmailSettings))
         {
             return null;
         }
@@ -64,7 +64,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, EmailSettings s
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, EmailSettings settings, UpdateEditorContext context)
     {
-        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, Permissions.ManageEmailSettings))
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageEmailSettings))
         {
             return null;
         }

src/OrchardCore.Modules/OrchardCore.Facebook/Drivers/FacebookPixelSettingsDisplayDriver.cs

@@ -27,7 +27,7 @@ protected override string SettingsGroupId
 
     public override async Task<IDisplayResult> EditAsync(ISite site, FacebookPixelSettings settings, BuildEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageFacebookApp))
         {
             return null;
@@ -42,7 +42,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, FacebookPixelSe
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, FacebookPixelSettings settings, UpdateEditorContext context)
     {
-        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, Permissions.ManageFacebookApp))
+        if (!await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User, Permissions.ManageFacebookApp))
         {
             return null;
         }

src/OrchardCore.Modules/OrchardCore.Facebook/Drivers/FacebookSettingsDisplayDriver.cs

@@ -41,7 +41,7 @@ protected override string SettingsGroupId
 
     public override async Task<IDisplayResult> EditAsync(ISite site, FacebookSettings settings, BuildEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageFacebookApp))
         {
             return null;
@@ -75,7 +75,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, FacebookSetting
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, FacebookSettings settings, UpdateEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
 
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageFacebookApp))
         {

src/OrchardCore.Modules/OrchardCore.Facebook/Login/Drivers/FacebookLoginSettingsDisplayDriver.cs

@@ -30,7 +30,7 @@ protected override string SettingsGroupId
 
     public override async Task<IDisplayResult> EditAsync(ISite site, FacebookLoginSettings settings, BuildEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageFacebookApp))
         {
             return null;
@@ -46,7 +46,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, FacebookLoginSe
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, FacebookLoginSettings settings, UpdateEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageFacebookApp))
         {
             return null;

src/OrchardCore.Modules/OrchardCore.GitHub/Drivers/GithubAuthenticationSettingsDisplayDriver.cs

@@ -40,7 +40,7 @@ protected override string SettingsGroupId
 
     public override async Task<IDisplayResult> EditAsync(ISite site, GitHubAuthenticationSettings settings, BuildEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGitHubAuthentication))
         {
             return null;
@@ -78,7 +78,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, GitHubAuthentic
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, GitHubAuthenticationSettings settings, UpdateEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGitHubAuthentication))
         {
             return null;

src/OrchardCore.Modules/OrchardCore.Google/Analytics/Drivers/GoogleAnalyticsSettingsDisplayDriver.cs

@@ -27,7 +27,7 @@ public GoogleAnalyticsSettingsDisplayDriver(
 
     public override async Task<IDisplayResult> EditAsync(ISite site, GoogleAnalyticsSettings settings, BuildEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleAnalytics))
         {
             return null;
@@ -42,7 +42,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, GoogleAnalytics
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, GoogleAnalyticsSettings settings, UpdateEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleAnalytics))
         {
             return null;

src/OrchardCore.Modules/OrchardCore.Google/Authentication/Drivers/GoogleAuthenticationSettingsDisplayDriver.cs

@@ -40,7 +40,7 @@ protected override string SettingsGroupId
 
     public override async Task<IDisplayResult> EditAsync(ISite site, GoogleAuthenticationSettings settings, BuildEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleAuthentication))
         {
             return null;
@@ -78,7 +78,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, GoogleAuthentic
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, GoogleAuthenticationSettings settings, UpdateEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleAuthentication))
         {
             return null;

src/OrchardCore.Modules/OrchardCore.Google/TagManager/Drivers/GoogleTagManagerSettingsDisplayDriver.cs

@@ -27,7 +27,7 @@ protected override string SettingsGroupId
 
     public override async Task<IDisplayResult> EditAsync(ISite site, GoogleTagManagerSettings settings, BuildEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleTagManager))
         {
             return null;
@@ -42,7 +42,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, GoogleTagManage
 
     public override async Task<IDisplayResult> UpdateAsync(ISite site, GoogleTagManagerSettings settings, UpdateEditorContext context)
     {
-        var user = _httpContextAccessor.HttpContext?.User;
+        var user = _httpContextAccessor.HttpContext.User;
         if (!await _authorizationService.AuthorizeAsync(user, Permissions.ManageGoogleTagManager))
         {
             return null;