From 7d5437a18787549955a62f847eba0d008da09725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= <sara.el-saig@lombiq.com>
Date: Tue, 11 Jun 2024 17:58:42 +0200
Subject: [PATCH] Shortcut for no validation.

---
 .../Users/AuthorizationServiceExtensions.cs   | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Users/AuthorizationServiceExtensions.cs b/Lombiq.HelpfulLibraries.OrchardCore/Users/AuthorizationServiceExtensions.cs
index debbe64b..04af57d1 100644
--- a/Lombiq.HelpfulLibraries.OrchardCore/Users/AuthorizationServiceExtensions.cs
+++ b/Lombiq.HelpfulLibraries.OrchardCore/Users/AuthorizationServiceExtensions.cs
@@ -43,7 +43,7 @@ public static Task<bool> AuthorizeCurrentUserAsync(
     /// name="executeAsync"/>.
     /// </typeparam>
     /// <typeparam name="TResult">The final outcome.</typeparam>
-    public static async Task<IActionResult> AuthorizeForCurrentUserAndExecuteAsync<TData, TResult>(
+    public static async Task<IActionResult> AuthorizeForCurrentUserValidateAndExecuteAsync<TData, TResult>(
         this IAuthorizationService service,
         Controller controller,
         IEnumerable<Permission> permissions,
@@ -66,7 +66,21 @@ public static async Task<IActionResult> AuthorizeForCurrentUserAndExecuteAsync<T
         return result is IActionResult actionResult ? actionResult : controller.Ok(result);
     }
 
-    /// <inheritdoc cref="AuthorizeForCurrentUserAndExecuteAsync{TData,TResult}"/>
+    /// <inheritdoc cref="AuthorizeForCurrentUserValidateAndExecuteAsync{TData,TResult}"/>
+    public static Task<IActionResult> AuthorizeForCurrentUserAndExecuteAsync<TResult>(
+        this IAuthorizationService service,
+        Controller controller,
+        IEnumerable<Permission> permissions,
+        Func<Task<TResult>> executeAsync,
+        string authenticationScheme = "Api") =>
+        service.AuthorizeForCurrentUserValidateAndExecuteAsync<object, TResult>(
+            controller,
+            permissions,
+            validateAsync: null,
+            _ => executeAsync(),
+            authenticationScheme);
+
+    /// <inheritdoc cref="AuthorizeForCurrentUserValidateAndExecuteAsync{TData,TResult}"/>
     public static Task<IActionResult> AuthorizeForCurrentUserValidateNotNullAndExecuteAsync<TData, TResult>(
         this IAuthorizationService service,
         Controller controller,
@@ -75,7 +89,7 @@ public static Task<IActionResult> AuthorizeForCurrentUserValidateNotNullAndExecu
         Func<TData, Task<TResult>> executeAsync,
         string authenticationScheme = "Api")
         where TData : class =>
-        service.AuthorizeForCurrentUserAndExecuteAsync(
+        service.AuthorizeForCurrentUserValidateAndExecuteAsync(
             controller,
             permissions,
             async () => await validateAsync() is { } data ? (true, data) : (false, default),