[EH] simplify request validation

Author: tswonke

CHANGELOG.md

@@ -21,7 +21,12 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 ### Security
 - Nothing
 
-## 1.0.0 - 2018-05-XX
+## 1.1.0 - 2018-05-23
+
+### Added
+- now request validation can be used without overwriting `ajaxStore()` - just use the `setAjaxStoreRequest()` setter.
+
+## 1.0.0/1.0.5 - 2018-05-21
 
 ### Added
 - initial Version

README.md

@@ -158,7 +158,28 @@ If needed you are free to use the `data_source` attribute from the original fiel
 
 ### Request validation
 
-You can also use Request Validation! Just copy the `ajaxStore()` method to your `EntityCrudController` and replace `Request` by your desired request (usually just `StoreRequest`).
+You can also use Request Validation! Just set the `$ajaxStoreRequest` property by using the provided setter method:
+
+```php
+<?php
+
+use Webfactor\Laravel\Backpack\InstantFields\InstantFields;
+
+class EntityCrudController extends CrudController
+{
+    use InstantFields;
+
+    public function setup()
+    {
+        // other Backpack options
+        
+        $this->setAjaxEntity('entity');
+        $this->setAjaxStoreRequest(\RequestNamespace\StoreRequest::class);
+        
+        // fields/columns definitions
+    }
+}
+```
 
 ### Fields
 

src/Traits/InstantFields.php

@@ -2,6 +2,7 @@
 
 namespace Webfactor\Laravel\Backpack\InstantFields;
 
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\Request;
 
 trait InstantFields
@@ -28,6 +29,26 @@ public function setAjaxEntity(string $entity)
         $this->ajaxEntity = $entity;
     }
 
+    /**
+     * Returns instance of FormRequest for request validation if $ajaxStoreRequest is set
+     *
+     * @return FormRequest|null
+     */
+    public function getAjaxStoreRequest()
+    {
+        return isset($this->storeAjaxRequest) ? new $this->storeAjaxRequest : null;
+    }
+
+    /**
+     * Sets $ajaxStoreRequest property to use for request validation
+     *
+     * @return void
+     */
+    public function setAjaxStoreRequest(string $storeAjaxRequest)
+    {
+        $this->storeAjaxRequest = $storeAjaxRequest;
+    }
+
     /**
      * Handles the incoming ajax requests by default
      * @param Request $request
@@ -88,7 +109,7 @@ public function ajaxCreate()
 
     /**
      * Checks permission and tries to store on-the-fly entity. If you want to enable request validation,
-     * please copy this method in your EntityCrudController and replace Request by your StoreRequest.
+     * please set your StoreRequest class by using setAjaxStoreRequest() in your EntityCrudController
      *
      * @param StoreRequest $request
      * @return \Illuminate\Http\JsonResponse
@@ -99,13 +120,35 @@ public function ajaxStore(Request $request)
             return $this->ajaxRespondNoPermission();
         }
 
+        if ($storeRequest = $this->getAjaxStoreRequest()) {
+            if ($errors = $this->ajaxValidationFails($request, $storeRequest->rules())) {
+                return response()->json($errors, 422);
+            }
+        }
+
         if (parent::storeCrud($request)) {
             return $this->ajaxRespondCreated();
         }
 
         return $this->ajaxRespondError();
     }
 
+    /**
+     * Validates the request and returns an error bag if it fails
+     *
+     * @return mixed
+     */
+    public function ajaxValidationFails(Request $request, array $rules)
+    {
+        $validator = \Validator::make($request->all(), $rules);
+
+        if ($validator->fails()) {
+            return $validator->errors();
+        }
+
+        return false;
+    }
+
     /**
      * Responses 403 No Permission
      *