Merge branch 'feature/password-reset-merge' into feature/password-reset

spira · Jul 23, 2015 · f68f670 · f68f670
2 parents c2dcff5 + d7689a2
commit f68f670
Show file tree

Hide file tree

Showing 72 changed files with 2,882 additions and 1,573 deletions.
diff --git a/api/.local.env b/api/.local.env
@@ -10,14 +10,14 @@ APP_HOSTNAME=local.api.spira.io
 AUTH_MODEL=App\Models\User
 
 DB_CONNECTION=pgsql
-DB_HOST=%DB_PORT_5432_TCP_ADDR%
+DB_HOST=%DATABASE_PORT_5432_TCP_ADDR%
 DB_PORT=5432
 DB_DATABASE=spira
 DB_USERNAME=spira
 DB_PASSWORD=spira
 
 CACHE_DRIVER=redis
-REDIS_HOST=%REDIS_PORT_6379_TCP_ADDR%
+REDIS_HOST=%CACHE_PORT_6379_TCP_ADDR%
 REDIS_PORT=6379
 
 WEBSERVER_HOST=%WEB_PORT_8080_TCP_ADDR%

diff --git a/api/.travis.env b/api/.travis.env
@@ -24,8 +24,6 @@ SESSION_DRIVER=array
 QUEUE_DRIVER=beanstalkd
 BEANSTALKD_HOST=127.0.0.1
 
-MAIL_DRIVER=log
-
 MAIL_DRIVER=smtp
 MAIL_HOST=localhost
 MAIL_PORT=1025

diff --git a/api/app/Console/Commands/GenerateKeysCommand.php b/api/app/Console/Commands/GenerateKeysCommand.php
@@ -25,7 +25,7 @@ class GenerateKeysCommand extends Command
     /**
      * Filesystem.
      *
-     * @var Illuminate\Filesystem\Filesystem
+     * @var Filesystem
      */
     protected $file;
 

diff --git a/api/app/Exceptions/Handler.php b/api/app/Exceptions/Handler.php
@@ -2,9 +2,12 @@
 
 namespace App\Exceptions;
 
-use App\Http\Controllers\BaseController;
+use App\Http\Transformers\IlluminateModelTransformer;
 use Exception;
 use Laravel\Lumen\Exceptions\Handler as ExceptionHandler;
+use Spira\Responder\Contract\TransformableInterface;
+use Spira\Responder\Contract\TransformerInterface;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
 class Handler extends ExceptionHandler
 {
@@ -22,13 +25,12 @@ class Handler extends ExceptionHandler
      *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
-     * @param \Exception $e
+     * @param  \Exception  $e
      *
-     * @return void
      */
     public function report(Exception $e)
     {
-        return parent::report($e);
+        parent::report($e);
     }
 
     /**
@@ -41,8 +43,44 @@ public function report(Exception $e)
      */
     public function render($request, Exception $e)
     {
-        return BaseController::renderException($request, $e, env('APP_DEBUG', false));
+        $debug = env('APP_DEBUG', false);
 
-//        return parent::render($request, $e);
+        $message = $e->getMessage();
+        if (!$message) {
+            $message = 'An error occurred';
+        }
+
+        $debugData = [
+            'exception' => get_class($e),
+            'message' => $e->getMessage(),
+            'code' => $e->getCode(),
+            'file' => $e->getFile(),
+            'line' => $e->getLine(),
+            'trace' => explode("\n", $e->getTraceAsString()),
+        ];
+
+        $response = [
+            'message' => $message,
+        ];
+
+        $statusCode = 500;
+
+        if ($e instanceof HttpExceptionInterface) {
+            $statusCode = $e->getStatusCode();
+
+            if (method_exists($e, 'getResponse')) {
+                if ($e instanceof TransformableInterface) {
+                    $response = $e->transform(\App::make(IlluminateModelTransformer::class));
+                } else {
+                    $response = $e->getResponse();
+                }
+            }
+        }
+
+        if ($debug) {
+            $response['debug'] = $debugData;
+        }
+
+        return response()->json($response, $statusCode, [], JSON_PRETTY_PRINT);
     }
 }
diff --git a/api/app/Exceptions/ValidationException.php b/api/app/Exceptions/ValidationException.php
@@ -3,23 +3,23 @@
 namespace App\Exceptions;
 
 use Illuminate\Support\MessageBag;
+use Spira\Responder\Contract\TransformableInterface;
+use Spira\Responder\Contract\TransformerInterface;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
-class ValidationException extends HttpException
+class ValidationException extends HttpException implements  TransformableInterface
 {
     /**
      * The validation error messages.
      *
-     * @var \Illuminate\Support\MessageBag
+     * @var MessageBag
      */
     protected $errors;
 
     /**
      * Create a new validation exception instance.
      *
      * @param  \Illuminate\Support\MessageBag
-     *
-     * @return void
      */
     public function __construct(MessageBag $errors)
     {
@@ -48,4 +48,31 @@ public function getResponse()
             'invalid' => $this->errors,
         ];
     }
+
+    /**
+     * Returns response headers.
+     *
+     * @return array Response headers
+     */
+    public function getHeaders()
+    {
+        return [];
+    }
+
+    /**
+     * @param TransformerInterface $transformer
+     * @return mixed
+     */
+    public function transform(TransformerInterface $transformer)
+    {
+        return $transformer->transformItem($this->getResponse());
+    }
+
+    /**
+     * @return MessageBag
+     */
+    public function getErrors()
+    {
+        return $this->errors;
+    }
 }
diff --git a/api/app/Exceptions/ValidationExceptionCollection.php b/api/app/Exceptions/ValidationExceptionCollection.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: redjik
+ * Date: 17.07.15
+ * Time: 20:12
+ */
+
+namespace App\Exceptions;
+
+use HttpException;
+use Spira\Responder\Contract\TransformableInterface;
+use Spira\Responder\Contract\TransformerInterface;
+
+class ValidationExceptionCollection extends HttpException implements TransformableInterface
+{
+    /**
+     * @var ValidationException[]
+     */
+    private $exceptions;
+
+    public function __construct(array $exceptions)
+    {
+        $this->exceptions = $exceptions;
+    }
+
+    /**
+     * Returns the status code.
+     *
+     * @return int An HTTP response status code
+     */
+    public function getStatusCode()
+    {
+        return 422;
+    }
+
+    /**
+     * Return the response instance.
+     *
+     * @return array
+     */
+    public function getResponse()
+    {
+        $responses = [];
+        foreach ($this->exceptions as $exception) {
+            if (!is_null($exception)) {
+                $responses[] = $exception->getResponse();
+            } else {
+                $responses[] = null;
+            }
+        }
+
+        return $responses;
+    }
+
+    /**
+     * @param TransformerInterface $transformer
+     * @return mixed
+     */
+    public function transform(TransformerInterface $transformer)
+    {
+        return $transformer->transformCollection($this->getResponse());
+    }
+}
diff --git a/api/app/Helpers/RouteHelper.php b/api/app/Helpers/RouteHelper.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: redjik
+ * Date: 17.07.15
+ * Time: 18:19
+ */
+
+namespace App\Helpers;
+
+use Spira\Repository\Model\BaseModel;
+
+class RouteHelper
+{
+    public static $badRoutes = [];
+
+    /**
+     * @param BaseModel $model
+     * @return string|false
+     */
+    public static function getRoute(BaseModel $model)
+    {
+        if (!isset(static::$badRoutes[get_class($model)])) {
+            try {
+                return route(get_class($model), ['id'=>$model->getQueueableId()]);
+            } catch (\InvalidArgumentException $e) {
+                static::$badRoutes[get_class($model)] = true;
+            }
+        }
+
+        return false;
+    }
+}