Update Dispatcher to only throw InternalHttpException if the response is

not successful, and not a redirect.

References dingo#998. Closes dingo#1014. References dingo#1024

Author: Hunter Skrasek

src/Dispatcher.php

@@ -539,7 +539,7 @@ protected function dispatch(InternalRequest $request)
 
             $response = $this->router->dispatch($request);
 
-            if (! $response->isSuccessful()) {
+            if (! $response->isSuccessful() && ! $response->isRedirection()) {
                 throw new InternalHttpException($response);
             } elseif (! $this->raw) {
                 $response = $response->getOriginalContent();

tests/DispatcherTest.php

@@ -2,6 +2,7 @@
 
 namespace Dingo\Api\Tests;
 
+use Dingo\Api\Exception\ValidationHttpException;
 use Mockery as m;
 use Dingo\Api\Http;
 use Dingo\Api\Auth\Auth;
@@ -368,4 +369,46 @@ public function testUsingRequestFacadeDoesNotCacheRequestInstance()
         $this->assertSame('bar', $response);
         $this->assertNull(RequestFacade::input('foo'));
     }
+
+    public function testRedirectResponseThrowsException()
+    {
+        $this->router->version('v1', function () {
+            $this->router->get('redirect', function () {
+                return new \Illuminate\Http\RedirectResponse('redirect-test');
+            });
+        });
+
+        $response = $this->dispatcher->get('redirect');
+        $this->assertInstanceOf('Illuminate\Http\RedirectResponse', $response);
+        $this->assertSame('redirect-test', $response->getTargetUrl());
+    }
+
+    /**
+     * @expectedException \Dingo\Api\Exception\InternalHttpException
+     */
+    public function testNotOkJsonResponseThrowsException()
+    {
+        $this->router->version('v1', function () {
+            $this->router->get('json', function () {
+                return new \Illuminate\Http\JsonResponse(['is' => 'json'], 422);
+            });
+        });
+
+        $this->dispatcher->get('json');
+    }
+
+    /**
+     * @expectedException \Dingo\Api\Exception\ValidationHttpException
+     */
+    public function testFormRequestValidationFailureThrowsValidationException()
+    {
+        $this->router->version('v1', function () {
+            $this->router->get('fail', function () {
+                //Mocking the form validation call is challenging at the moment, so next best thing
+                throw new ValidationHttpException(['foo' => 'bar']);
+            });
+        });
+
+        $this->dispatcher->get('fail');
+    }
 }

tests/Stubs/RoutingAdapterStub.php

@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Container\Container;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Dingo\Api\Http\Response;
 use Dingo\Api\Contract\Routing\Adapter;
@@ -45,8 +46,10 @@ protected function findRouteClosure(array $action)
 
     protected function prepareResponse($request, $response)
     {
-        if (! $response instanceof Response && ! $response instanceof IlluminateResponse) {
-            $response = new Response($response);
+        if ($response instanceof IlluminateResponse) {
+            $response = Response::makeFromExisting($response);
+        } elseif ($response instanceof JsonResponse) {
+            $response = Response::makeFromJson($response);
         }
 
         return $response->prepare($request);