Refactor filters to allow for authorization based on indexes.

CatLabInteractive · Mar 23, 2022 · 0546cdd · 0546cdd
1 parent f630101
commit 0546cdd
Showing 1 changed file with 9 additions and 16 deletions.
diff --git a/src/Controllers/ResourceController.php b/src/Controllers/ResourceController.php
@@ -110,23 +110,16 @@ protected function getFilteredModels(
         $factory = null;
         $filterResults = null;
 
-        if ($resourceDefinition) {
-            $factory = StaticResourceDefinitionFactory::getFactoryOrDefaultFactory($resourceDefinition);
-
-            if ($isQueryBuilder) {
-                $filterResults = $this->resourceTransformer->applyFilters(
-                    $this->getRequest()->query(),
-                    $filters,
-                    $context,
-                    $queryBuilder
-                );
-
-                $queryBuilder = $filterResults->getQueryBuilder();
-            }
-        }
-
-        // apply global filters.
         if ($isQueryBuilder) {
+            $filterResults = $this->resourceTransformer->applyFilters(
+                $this->getRequest()->query(),
+                $filters,
+                $context,
+                $queryBuilder
+            );
+
+            $queryBuilder = $filterResults->getQueryBuilder();
+
             $this->applyGlobalFilters($queryBuilder, $factory?->getDefault(), $context);
         }