[5.x] Harden OrderBys (#14474)

Co-authored-by: Jason Varga <jason@pixelfear.com>

Author: duncanmcclean

src/GraphQL/Queries/AssetsQuery.php

@@ -13,6 +13,7 @@
 use Statamic\GraphQL\Queries\Concerns\FiltersQuery;
 use Statamic\GraphQL\Types\AssetInterface;
 use Statamic\GraphQL\Types\JsonArgument;
+use Statamic\Query\OrderBy;
 use Statamic\Support\Str;
 
 class AssetsQuery extends Query
@@ -69,7 +70,9 @@ private function sortQuery($query, $sorts)
                 [$sort, $order] = explode(' ', $sort);
             }
 
-            $query->orderBy($sort, $order);
+            if ($sort = OrderBy::column($sort)) {
+                $query->orderBy($sort, $order);
+            }
         }
     }
 

src/GraphQL/Queries/EntriesQuery.php

@@ -16,6 +16,7 @@
 use Statamic\GraphQL\Queries\Concerns\ScopesQuery;
 use Statamic\GraphQL\Types\EntryInterface;
 use Statamic\GraphQL\Types\JsonArgument;
+use Statamic\Query\OrderBy;
 use Statamic\Support\Str;
 
 class EntriesQuery extends Query
@@ -96,7 +97,9 @@ private function sortQuery($query, $sorts)
                 [$sort, $order] = explode(' ', $sort);
             }
 
-            $query->orderBy($sort, $order);
+            if ($sort = OrderBy::column($sort)) {
+                $query->orderBy($sort, $order);
+            }
         }
     }
 

src/GraphQL/Queries/TermsQuery.php

@@ -13,6 +13,7 @@
 use Statamic\GraphQL\Queries\Concerns\FiltersQuery;
 use Statamic\GraphQL\Types\JsonArgument;
 use Statamic\GraphQL\Types\TermInterface;
+use Statamic\Query\OrderBy;
 use Statamic\Support\Str;
 
 class TermsQuery extends Query
@@ -76,7 +77,9 @@ private function sortQuery($query, $sorts)
                 [$sort, $order] = explode(' ', $sort);
             }
 
-            $query->orderBy($sort, $order);
+            if ($sort = OrderBy::column($sort)) {
+                $query->orderBy($sort, $order);
+            }
         }
     }
 

src/GraphQL/Queries/UsersQuery.php

@@ -11,6 +11,7 @@
 use Statamic\GraphQL\Queries\Concerns\FiltersQuery;
 use Statamic\GraphQL\Types\JsonArgument;
 use Statamic\GraphQL\Types\UserType;
+use Statamic\Query\OrderBy;
 use Statamic\Support\Str;
 
 class UsersQuery extends Query
@@ -65,7 +66,9 @@ private function sortQuery($query, $sorts)
                 [$sort, $order] = explode(' ', $sort);
             }
 
-            $query->orderBy($sort, $order);
+            if ($sort = OrderBy::column($sort)) {
+                $query->orderBy($sort, $order);
+            }
         }
     }
 

src/Http/Controllers/CP/Assets/BrowserController.php

@@ -14,6 +14,7 @@
 use Statamic\Http\Resources\CP\Assets\Folder;
 use Statamic\Http\Resources\CP\Assets\FolderAsset;
 use Statamic\Http\Resources\CP\Assets\SearchedAssetsCollection;
+use Statamic\Query\OrderBy;
 use Statamic\Support\Arr;
 
 class BrowserController extends CpController
@@ -87,8 +88,7 @@ public function folder(Request $request, $container, $path = '/')
         $totalAssets = $folder->queryAssets()->count();
         $totalItems = $totalAssets + $totalFolders;
 
-        if ($request->sort) {
-            $sort = $request->sort;
+        if ($sort = OrderBy::column($request->sort)) {
             $order = $request->order ?? 'asc';
         } else {
             $sort = $container->sortField();
@@ -153,8 +153,8 @@ public function search(Request $request, $container, $path = null)
             $query->where('folder', $path);
         }
 
-        if ($request->sort) {
-            $query->orderBy($request->sort, $request->order ?? 'asc');
+        if ($sort = OrderBy::column($request->sort)) {
+            $query->orderBy($sort, $request->order ?? 'asc');
         }
 
         $this->applyQueryScopes($query, $request->all());