Merge remote-tracking branch 'origin/main' into issue/OCC-310

OrchardCMS · Feb 25, 2025 · b4d7665 · b4d7665
2 parents 0035bc2 + 3fe276f
commit b4d7665
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/src/Modules/OrchardCore.Commerce.Payment/Controllers/PaymentBaseController.cs b/src/Modules/OrchardCore.Commerce.Payment/Controllers/PaymentBaseController.cs
@@ -6,7 +6,6 @@
 using OrchardCore.DisplayManagement.Notify;
 using OrchardCore.Mvc.Core.Utilities;
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 
 namespace OrchardCore.Commerce.Payment.Controllers;
@@ -20,11 +19,7 @@ protected PaymentBaseController(INotifier notifier, ILogger logger)
         _logger = logger;
     }
 
-    [SuppressMessage(
-        "Critical Code Smell",
-        "S6967:ModelState.IsValid should be called in controller actions",
-        Justification = "This is not a controller action.")]
-    public async Task<IActionResult> ProduceActionResultAsync(PaymentOperationStatusViewModel paidStatusViewModel)
+    protected async Task<IActionResult> ProduceActionResultAsync(PaymentOperationStatusViewModel paidStatusViewModel)
     {
         if (paidStatusViewModel.ShowMessage != null)
         {
@@ -87,7 +82,7 @@ private RedirectToActionResult RedirectToActionWithParams<TController>(
                     : returnUrl;
         }
 
-        object? routeValues = new { area, returnUrl = localReturnUrl };
+        object routeValues = new { area, returnUrl = localReturnUrl };
 
         if (!string.IsNullOrEmpty(orderId))
         {