Implemented cors handling with cors headers on exceptions, refactored…

Contract/Exception/Handler.php

@@ -11,6 +11,7 @@
 namespace Spira\Core\Contract\Exception;
 
 use Exception;
+use Illuminate\Http\JsonResponse;
 use Laravel\Lumen\Exceptions\Handler as ExceptionHandler;
 use Spira\Core\Responder\Contract\TransformableInterface;
 use Spira\Core\Responder\Transformers\EloquentModelTransformer;
@@ -66,28 +67,32 @@ public function render($request, Exception $e)
             'trace' => explode("\n", $e->getTraceAsString()),
         ];
 
-        $response = [
+        $responseData = [
             'message' => $message,
         ];
 
-        $statusCode = Response::HTTP_INTERNAL_SERVER_ERROR; //default
-
         if ($e instanceof HttpExceptionInterface) {
-            $statusCode = $e->getStatusCode();
-
             if (method_exists($e, 'getResponse')) {
                 if ($e instanceof TransformableInterface) {
-                    $response = $e->transform(\App::make(EloquentModelTransformer::class));
+                    $responseData = $e->transform(\App::make(EloquentModelTransformer::class));
                 } else {
-                    $response = $e->getResponse();
+                    $responseData = $e->getResponse();
                 }
             }
         }
 
         if ($debug) {
-            $response['debug'] = $debugData;
+            $responseData['debug'] = $debugData;
         }
 
-        return response()->json($response, $statusCode, [], JSON_PRETTY_PRINT);
+        $response = parent::render($request, $e);
+
+        $response = new JsonResponse($responseData, $response->getStatusCode(), $response->headers->all(), JSON_PRETTY_PRINT);
+
+        $response->exception = $e;
+
+        app('Asm89\Stack\CorsService')->addActualRequestHeaders($response, $request);
+
+        return $response;
     }
 }

Controllers/RequestValidationTrait.php

@@ -54,7 +54,7 @@ protected function notFoundException($keyName = '')
             // @codeCoverageIgnoreEnd
         }
 
-        throw new ValidationException($validation->getMessageBag());
+        return new ValidationException($validation->getMessageBag());
     }
 
     /**
@@ -72,11 +72,7 @@ protected function notFoundManyException($ids, $models, $keyName = '')
             if ($models->get($id)) {
                 $errors[] = null;
             } else {
-                try {
-                    throw $this->notFoundException($keyName);
-                } catch (ValidationException $e) {
-                    $errors[] = $e;
-                }
+                $errors[] = $this->notFoundException($keyName);
             }
         }
 

Validation/ValidationException.php

@@ -28,20 +28,16 @@ class ValidationException extends HttpException implements  TransformableInterfa
     /**
      * Create a new validation exception instance.
      * @param MessageBag $errors
+     * @param string $message
+     * @param \Exception $previous
+     * @param array $headers
+     * @param int $code
      */
-    public function __construct(MessageBag $errors)
+    public function __construct(MessageBag $errors, $message = 'There was an issue with the validation of provided entity', \Exception $previous = null, array $headers = [], $code = 0)
     {
         $this->errors = $errors->toArray();
-    }
 
-    /**
-     * Returns the status code.
-     *
-     * @return int An HTTP response status code
-     */
-    public function getStatusCode()
-    {
-        return Response::HTTP_UNPROCESSABLE_ENTITY;
+        parent::__construct(Response::HTTP_UNPROCESSABLE_ENTITY, $message, $previous, $headers, $code);
     }
 
     /**
@@ -52,21 +48,11 @@ public function getStatusCode()
     public function getResponse()
     {
         return [
-            'message' => 'There was an issue with the validation of provided entity',
+            'message' => $this->getMessage(),
             'invalid' => $this->errors,
         ];
     }
 
-    /**
-     * Returns response headers.
-     *
-     * @return array Response headers
-     */
-    public function getHeaders()
-    {
-        return [];
-    }
-
     /**
      * @param TransformerInterface $transformer
      * @return mixed

Validation/ValidationExceptionCollection.php

@@ -22,19 +22,19 @@ class ValidationExceptionCollection extends HttpException implements Transformab
      */
     private $exceptions;
 
-    public function __construct(array $exceptions)
-    {
-        $this->exceptions = $exceptions;
-    }
-
     /**
-     * Returns the status code.
-     *
-     * @return int An HTTP response status code
+     * Create a new validation collection exception instance.
+     * @param array $exceptions
+     * @param string $message
+     * @param \Exception $previous
+     * @param array $headers
+     * @param int $code
      */
-    public function getStatusCode()
+    public function __construct(array $exceptions, $message = 'There was an issue with the validation of provided entities', \Exception $previous = null, array $headers = [], $code = 0)
     {
-        return Response::HTTP_UNPROCESSABLE_ENTITY;
+        $this->exceptions = $exceptions;
+
+        parent::__construct(Response::HTTP_UNPROCESSABLE_ENTITY, $message, $previous, $headers, $code);
     }
 
     /**
@@ -63,7 +63,7 @@ public function getResponse()
     public function transform(TransformerInterface $transformer)
     {
         return [
-            'message' => 'There was an issue with the validation of provided entity',
+            'message' => $this->getMessage(),
             'invalid' => $transformer->transformCollection($this->getResponse()),
         ];
     }

bootstrap/app.php

@@ -32,6 +32,7 @@
 $app->withEloquent();
 
 $app->configure('regions');
+$app->configure('cors');
 
 /*
 |--------------------------------------------------------------------------
@@ -67,7 +68,7 @@
 
 $app->middleware([
     Spira\Core\Middleware\TransformInputDataMiddleware::class,
-
+    Barryvdh\Cors\HandleCors::class,
 ]);
 
 $app->routeMiddleware([
@@ -86,9 +87,10 @@
 | totally optional, so you are not required to uncomment this line.
 |
 */
-$app->register(Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
+$app->register(Barryvdh\Cors\LumenServiceProvider::class);
 $app->register(Spira\Core\Providers\AppServiceProvider::class);
 $app->register(Bosnadev\Database\DatabaseServiceProvider::class);
+$app->register(Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
 
 /*
 |--------------------------------------------------------------------------

composer.json

@@ -20,7 +20,8 @@
     "bosnadev/database": "^0.11.0",
     "league/fractal": "0.12.*",
     "illuminate/mail": "^5.0",
-    "elasticquent/elasticquent": "1.1.*"
+    "elasticquent/elasticquent": "1.1.*",
+    "barryvdh/laravel-cors": "0.7.x"
   },
   "require-dev": {
     "satooshi/php-coveralls": "dev-master",

config/cors.php

@@ -0,0 +1,20 @@
+<?php
+
+return [
+    /*
+     |--------------------------------------------------------------------------
+     | Laravel CORS
+     |--------------------------------------------------------------------------
+     |
+     | allowedOrigins, allowedHeaders and allowedMethods can be set to array('*')
+     | to accept any value, the allowed methods however have to be explicitly listed.
+     |
+     */
+    'supportsCredentials' => false,
+    'allowedOrigins' => ['*'],
+    'allowedHeaders' => ['*'],
+    'allowedMethods' => ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'],
+    'exposedHeaders' => [],
+    'maxAge' => 0,
+    'hosts' => [],
+];