override fieldsets with a custom fieldset parameter. (#77)

Co-authored-by: Craig Smith <[email protected]>

Author: phpsa

src/Http/Api/Contracts/HasResources.php

@@ -51,7 +51,7 @@ protected function getDefaultFields(): array
     {
         $resource = $this->getResourceSingle();
 
-        return (method_exists($resource, 'getDefaultFields')) ? ($resource)::getDefaultFields() : ['*'];
+        return (method_exists($resource, 'getDefaultFields')) ? ($resource)::getDefaultFields($this->request) : ['*'];
     }
 
     /**
@@ -63,7 +63,7 @@ protected function getAllowedScopes(): array
     {
         $resource = $this->getResourceSingle();
 
-        $scopes = collect((method_exists($resource, 'getAllowedScopes')) ? ($resource)::getAllowedScopes() : []);
+        $scopes = collect((method_exists($resource, 'getAllowedScopes')) ? ($resource)::getAllowedScopes($this->request) : []);
 
         return $scopes->map(function ($scope) {
             return strpos($scope, 'scope') === 0 ? substr($scope, 5) : $scope;

src/Http/Resources/ApiResource.php

@@ -2,9 +2,10 @@
 
 namespace Phpsa\LaravelApiController\Http\Resources;
 
+use Phpsa\LaravelApiController\Helpers;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Phpsa\LaravelApiController\Http\Resources\Contracts\AllowableFields;
 use Phpsa\LaravelApiController\Http\Resources\Contracts\CaseFormat;
+use Phpsa\LaravelApiController\Http\Resources\Contracts\AllowableFields;
 
 class ApiResource extends JsonResource
 {

src/Http/Resources/Contracts/AllowableFields.php

@@ -95,7 +95,7 @@ protected function mapFieldData($request, $fields)
      */
     protected function mapFields($request): array
     {
-        $map = $this->getDefaultFields();
+        $map = self::getDefaultFields($request);
         $defaultFields = $map === ['*'] ? array_keys($this->getResourceFields()) : $map;
         $allowedFields = static::$allowedFields ?? [];
         $fields = Helpers::filterFieldsFromRequest($request, $defaultFields, $allowedFields);
@@ -124,13 +124,17 @@ protected function getResourceFields(): array
         return is_array($this->resource) ? $this->resource : $this->resource->getAttributes();
     }
 
-    /**
+      /**
      * Return default fields for this collection.
      *
      * @return array
      */
-    public static function getDefaultFields(): array
+    public static function getDefaultFields($request): array
     {
+        if (method_exists(get_called_class(), 'defaultFields')) {
+            $c = get_called_class();
+            return $c::defaultFields($request);
+        }
         return static::$defaultFields ?? ['*'];
     }
 
@@ -140,8 +144,12 @@ public static function getDefaultFields(): array
      * @return array
      * @author Sam Sehnert <[email protected]>
      */
-    public static function getAllowedScopes(): array
+    public static function getAllowedScopes($request): array
     {
+        if (method_exists(get_called_class(), 'defaultScopes')) {
+            $c = get_called_class();
+            return $c::defaultScopes($request);
+        }
         return static::$allowedScopes ?? [];
     }
 }