change to request content and fixed test

Signed-off-by: Valentin Sickert <[email protected]>
RadioRoster · Dec 13, 2023 · 353f899 · 353f899
1 parent a5a8ae7
commit 353f899
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/app/Http/Middleware/JsonOnlyMiddleware.php b/app/Http/Middleware/JsonOnlyMiddleware.php
@@ -15,7 +15,7 @@ class JsonOnlyMiddleware
      */
     public function handle(Request $request, Closure $next): Response
     {
-        if (!empty($request->all()) && !$request->isJson()) {
+        if (!empty($request->getContent()) && !$request->isJson()) {
             return response()->json([
                 'message' => 'Only JSON requests are accepted'
             ], Response::HTTP_BAD_REQUEST);

diff --git a/tests/Feature/Http/Middleware/JsonOnlyMiddlewareTest.php b/tests/Feature/Http/Middleware/JsonOnlyMiddlewareTest.php
@@ -18,13 +18,19 @@ public function test_non_json_requests_are_rejected(): void
             'password' => bcrypt('ValidPassword'),
         ]);
 
-        $response = $this->post('/api/v1/login', [
-            'body' => '<?xml version="1.0" encoding="UTF-8"?>
+        $response = $this->call(
+            'POST',
+            '/api/v1/login',
+            server: $this->transformHeadersToServerVars([
+                'Accept' => ['text/xml', 'application/xml', 'text/plain'],
+                'Content-Type' => ['text/xml', 'application/xml', 'text/plain'],
+            ]),
+            content: '<?xml version="1.0" encoding="UTF-8"?>
                 <root>
                     <email>[email protected]</email>
                     <password>ValidPassword</password>
                 </root>'
-        ], ['Content-Type' => 'text/xml']);
+        );
 
         $response->assertStatus(400)
             ->assertJson([