Update InteractsWithInput.php (#38426)

* Update InteractsWithInput.php

Recently I came across some conditions that I needed to send both `Basic` and `Bearer` token. As we can send `Authorization Basic X, Bearer Y` we need to change logic how to get token from the `Authorization` header.

* Update InteractsWithInput.php

* Update InteractsWithInput.php

* formatting

* use strpos method

Co-authored-by: Taylor Otwell <[email protected]>

Author: heiswald

src/Illuminate/Http/Concerns/InteractsWithInput.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
 use SplFileInfo;
 use stdClass;
 use Symfony\Component\VarDumper\VarDumper;
@@ -55,8 +54,12 @@ public function bearerToken()
     {
         $header = $this->header('Authorization', '');
 
-        if (Str::startsWith($header, 'Bearer ')) {
-            return Str::substr($header, 7);
+        $position = strrpos($header, 'Bearer');
+
+        if ($position !== false) {
+            $header = substr($header, $position + 7);
+
+            return strpos($header, ',') !== false ? strstr(',', $header, true) : $header;
         }
     }
 

tests/Http/HttpRequestTest.php

@@ -695,6 +695,15 @@ public function testHeaderMethod()
         $this->assertSame('foo', $all['do-this'][0]);
     }
 
+    public function testBearerTokenMethod()
+    {
+        $request = Request::create('/', 'GET', [], [], [], ['HTTP_AUTHORIZATION' => 'Bearer foo']);
+        $this->assertSame('foo', $request->bearerToken());
+
+        $request = Request::create('/', 'GET', [], [], [], ['HTTP_AUTHORIZATION' => 'Basic foo, Bearer bar']);
+        $this->assertSame('bar', $request->bearerToken());
+    }
+
     public function testJSONMethod()
     {
         $payload = ['name' => 'taylor'];