Only register routes from api resource controller that implements the…

… RestController action Signed-off-by: Sam Poyigi <[email protected]>
tastyigniter · Nov 12, 2022 · 0b467b7 · 0b467b7
1 parent f5218f8
commit 0b467b7
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/classes/ApiManager.php b/classes/ApiManager.php
@@ -4,6 +4,7 @@
 
 use Igniter\Api\Models\Resource;
 use Igniter\Flame\Traits\Singleton;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Str;
 
@@ -63,7 +64,7 @@ public function buildResource($name, $model, $meta = [])
         $singularController = str_singular($controller);
         $namespace = '\\Igniter\\Api\\ApiResources';
 
-        \Artisan::call('create:apiresource', [
+        Artisan::call('create:apiresource', [
             'extension' => 'Igniter.Api',
             'controller' => $controller,
             '--model' => $model,
@@ -78,17 +79,24 @@ public function buildResource($name, $model, $meta = [])
 
     protected function loadResources()
     {
-        $resources = Resource::all()->mapWithKeys(function ($resource) {
-            $resourceObj = (object)[
-                'endpoint' => $resource->endpoint,
-                'controller' => $resource->controller,
-                'options' => array_merge($resource->meta, [
-                    'only' => $resource->getAvailableActions(),
-                ]),
-            ];
-
-            return [$resource->endpoint => $resourceObj];
-        });
+        $resources = Resource::all()
+            ->filter(function ($resource) {
+                return resolve($resource->controller)->isClassExtendedWith('Igniter.Api.Actions.RestController');
+            })
+            ->filter(function ($resource) {
+                return count($resource->getAvailableActions()) > 0;
+            })
+            ->mapWithKeys(function ($resource) {
+                $resourceObj = (object)[
+                    'endpoint' => $resource->endpoint,
+                    'controller' => $resource->controller,
+                    'options' => array_merge($resource->meta, [
+                        'only' => $resource->getAvailableActions(),
+                    ]),
+                ];
+
+                return [$resource->endpoint => $resourceObj];
+            });
 
         $this->resources = $resources;
     }