Merge branch 'api-endpoint-users' into users_api

[bookstack] / app / Http / Controllers / Api / ApiController.php

diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php
index 5eb8b1e3d286f0f82ce23b41362b1dbd557f7507..5d6f4a926c9ce4c5a186106f986f52361ef46583 100644 (file)
--- a/app/Http/Controllers/Api/ApiController.php
+++ b/app/Http/Controllers/Api/ApiController.php
@@ -1,4 +1,6 @@
-<?php namespace BookStack\Http\Controllers\Api;
+<?php
+
+namespace BookStack\Http\Controllers\Api;

 
 use BookStack\Api\ListingResponseBuilder;
 use BookStack\Http\Controllers\Controller;
 
 use BookStack\Api\ListingResponseBuilder;
 use BookStack\Http\Controllers\Controller;


@@ -7,7 +9,6 @@ use Illuminate\Http\JsonResponse;
 
 abstract class ApiController extends Controller
 {
 
 abstract class ApiController extends Controller
 {

-

     protected $rules = [];
     protected $printHidden = [];
 
     protected $rules = [];
     protected $printHidden = [];
 


@@ -18,14 +19,20 @@ abstract class ApiController extends Controller
     protected function apiListingResponse(Builder $query, array $fields, array $protectedFieldsToPrint = []): JsonResponse
     {
         $listing = new ListingResponseBuilder($query, request(), $fields, $protectedFieldsToPrint);
     protected function apiListingResponse(Builder $query, array $fields, array $protectedFieldsToPrint = []): JsonResponse
     {
         $listing = new ListingResponseBuilder($query, request(), $fields, $protectedFieldsToPrint);

+

         return $listing->toResponse();
     }
 
     /**
      * Get the validation rules for this controller.
         return $listing->toResponse();
     }
 
     /**
      * Get the validation rules for this controller.

+     * Defaults to a $rules property but can be a rules() method.

      */
     public function getValdationRules(): array
     {
      */
     public function getValdationRules(): array
     {

+        if (method_exists($this, 'rules')) {
+            return $this->rules();
+        }
+

         return $this->rules;
     }
 }
         return $this->rules;
     }
 }