Merge pull request #289 from Lombiq/issue/OFFI-135

OFFI-135: OC 2.0 upgrade post fixup
Lombiq · Oct 8, 2024 · b060ddc · b060ddc
2 parents 415b9a6 + 5b1a6e8
commit b060ddc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Lombiq.HelpfulLibraries.Common/Utilities/Union.cs b/Lombiq.HelpfulLibraries.Common/Utilities/Union.cs
@@ -27,7 +27,7 @@ internal Union(T1 left, T2 right, bool leftIsSet)
 
 public static class Union
 {
+    // The value of leftIsSet doesn't matter.
     public static Union<T1, T2> Neither<T1, T2>() =>
-        // The value of leftIsSet doesn't matter.
         new(default, default, leftIsSet: true);
 }
diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs b/Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs
@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using YesSql.Indexes;
 
@@ -195,4 +196,9 @@ public static Task<GetPageAndPagerViewModel<T>> GetPageAndPagerAsync<T>(
     }
 }
 
-public record GetPageAndPagerViewModel<T>(IList<T> Items, IShape Pager, int Total, int PageSize, int PageIndex);
+public record GetPageAndPagerViewModel<T>(
+    IList<T> Items,
+    [property: JsonIgnore] IShape Pager,
+    int Total,
+    int PageSize,
+    int PageIndex);
diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Users/AuthorizationServiceExtensions.cs b/Lombiq.HelpfulLibraries.OrchardCore/Users/AuthorizationServiceExtensions.cs
@@ -51,7 +51,7 @@ public static Task<bool> AuthorizeCurrentUserAsync(
     /// <typeparam name="TResult">The final outcome.</typeparam>
     public static async Task<IActionResult> AuthorizeForCurrentUserValidateAndExecuteAsync<TData, TResult>(
         this IAuthorizationService service,
-        Controller controller,
+        ControllerBase controller,
         IEnumerable<Permission> permissions,
         Func<Task<(bool IsSuccess, TData Data)>> validateAsync,
         Func<TData, Task<TResult>> executeAsync,
@@ -82,7 +82,7 @@ public static async Task<IActionResult> AuthorizeForCurrentUserValidateAndExecut
     /// <inheritdoc cref="AuthorizeForCurrentUserValidateAndExecuteAsync{TData,TResult}"/>
     public static Task<IActionResult> AuthorizeForCurrentUserAndExecuteAsync<TResult>(
         this IAuthorizationService service,
-        Controller controller,
+        ControllerBase controller,
         IEnumerable<Permission> permissions,
         Func<Task<TResult>> executeAsync,
         string authenticationScheme = "Api",
@@ -98,7 +98,7 @@ public static Task<IActionResult> AuthorizeForCurrentUserAndExecuteAsync<TResult
     /// <inheritdoc cref="AuthorizeForCurrentUserValidateAndExecuteAsync{TData,TResult}"/>
     public static Task<IActionResult> AuthorizeForCurrentUserValidateNotNullAndExecuteAsync<TData, TResult>(
         this IAuthorizationService service,
-        Controller controller,
+        ControllerBase controller,
         IEnumerable<Permission> permissions,
         Func<Task<TData>> validateAsync,
         Func<TData, Task<TResult>> executeAsync,