Middleware: ResponseJsonNested and ResponseJsonFlat implemented

membrane-php · Dec 15, 2022 · 394a392 · 394a392
1 parent dfc5e31
commit 394a392
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 50 deletions.
diff --git a/src/Middleware/RequestValidation.php b/src/Middleware/RequestValidation.php
@@ -7,7 +7,6 @@
 use Closure;
 use Illuminate\Http\Request;
 use Membrane\Laravel\Http\Request as MembraneHttpRequest;
-use Membrane\Laravel\Http\Response as MembraneHttpResponse;
 use Membrane\Laravel\ToPsr7;
 use Membrane\Membrane;
 use Membrane\OpenAPI\Specification\Request as MembraneRequestSpec;
@@ -33,10 +32,6 @@ public function handle(Request $request, Closure $next): SymfonyResponse
 
         $result = $this->membrane->process($psr7Request, $specification);
 
-        if (!$result->isValid()) {
-            return new MembraneHttpResponse(status: 400, result: $result);
-        }
-
         $membraneRequest = MembraneHttpRequest::createFromResult($result, $request);
 
         return $next($membraneRequest);

diff --git a/src/Middleware/ResponseJsonFlat.php b/src/Middleware/ResponseJsonFlat.php
@@ -4,7 +4,35 @@
 
 namespace Membrane\Laravel\Middleware;
 
+use Closure;
+use Crell\ApiProblem\ApiProblem;
+use Crell\ApiProblem\HttpConverter;
+use Membrane\Laravel\Http\Request as MembraneHttpRequest;
+use Membrane\Laravel\ToSymfony;
+use Nyholm\Psr7\Factory\Psr17Factory;
+use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
+
 class ResponseJsonFlat
 {
+    public function handle(MembraneHttpRequest $request, Closure $next): SymfonyResponse
+    {
+        $result = $request->getResult();
+
+        if (!$result->isValid()) {
+            $renderer = new JsonFlat($result);
+
+            $problem = (new ApiProblem('Request payload failed validation'))
+                ->setStatus(400);
+            $problem['errors'] = $renderer->jsonSerialize();
+
+            $factory = new Psr17Factory();
+            $converter = new HttpConverter($factory);
+            $response = $converter->toJsonResponse($problem);
+            $toSymfony = new ToSymfony();
+
+            return $toSymfony($response);
+        }
 
+        return $next($request);
+    }
 }
diff --git a/src/Middleware/ResponseJsonNested.php b/src/Middleware/ResponseJsonNested.php
@@ -4,7 +4,35 @@
 
 namespace Membrane\Laravel\Middleware;
 
+use Closure;
+use Crell\ApiProblem\ApiProblem;
+use Crell\ApiProblem\HttpConverter;
+use Membrane\Laravel\Http\Request as MembraneHttpRequest;
+use Membrane\Laravel\ToSymfony;
+use Nyholm\Psr7\Factory\Psr17Factory;
+use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
+
 class ResponseJsonNested
 {
+    public function handle(MembraneHttpRequest $request, Closure $next): SymfonyResponse
+    {
+        $result = $request->getResult();
+
+        if (!$result->isValid()) {
+            $renderer = new JsonNested($result);
+
+            $problem = (new ApiProblem('Request payload failed validation'))
+                ->setStatus(400);
+            $problem['errors'] = $renderer->jsonSerialize();
+
+            $factory = new Psr17Factory();
+            $converter = new HttpConverter($factory);
+            $response = $converter->toJsonResponse($problem);
+            $toSymfony = new ToSymfony();
+
+            return $toSymfony($response);
+        }
 
+        return $next($request);
+    }
 }
diff --git a/tests/Middleware/RequestValidationTest.php b/tests/Middleware/RequestValidationTest.php
@@ -6,9 +6,6 @@
 
 use Illuminate\Http\Request as IlluminateRequest;
 use Membrane\Laravel\Http\Response as MembraneResponse;
-use Membrane\Result\FieldName;
-use Membrane\Result\Message;
-use Membrane\Result\MessageSet;
 use Membrane\Result\Result;
 use PHPUnit\Framework\TestCase;
 
@@ -20,52 +17,23 @@
  */
 class RequestValidationTest extends TestCase
 {
-    public function dataSetsToHandle(): array
+    /** @test */
+    public function handleTest(): void
     {
+        $expected = new MembraneResponse(
+            result: Result::valid([
+            'path' => [],
+            'query' => [],
+            'header' => [],
+            'cookie' => [],
+            'body' => '',
+        ])
+        );
         $api = __DIR__ . '/../fixtures/petstore-expanded.json';
-        return [
-            [
-                $api,
-                IlluminateRequest::create('/pets'),
-                new MembraneResponse(result: Result::valid(1)),
-            ],
-            [
-                $api,
-                IlluminateRequest::create('/pets?tags[]=Ben'),
-                new MembraneResponse(result: Result::valid(1)),
-            ],
-            [
-                $api,
-                IlluminateRequest::create('/pets?tags=Ben'),
-                new MembraneResponse(
-                    status: 400,
-                    result: Result::invalid(
-                        [
-                            'path' => [],
-                            'query' => ['tags' => 'Ben'],
-                            'header' => [],
-                            'cookie' => [],
-                            'body' => '',
-                        ],
-                        new MessageSet(
-                            new FieldName('', '', 'query', 'tags'),
-                            new Message('IsList validator expects list value, %s passed instead', ['string'])
-                        )
-                    )
-                ),
-            ],
-        ];
-    }
-
-    /**
-     * @test
-     * @dataProvider dataSetsToHandle
-     */
-    public function handleTest(string $api, IlluminateRequest $request, MembraneResponse $expected): void
-    {
         $sut = new RequestValidation($api);
+        $request = IlluminateRequest::create('/pets');
 
-        $actual = $sut->handle($request, fn($var) => new MembraneResponse(status: 200, result: $expected->result));
+        $actual = $sut->handle($request, fn($var) => new MembraneResponse(status: 200, result: $var->getResult()));
 
         self::assertEquals($expected, $actual);
     }