From ca031bc3c0c2919a1fa30c02ed427c2c6073fd81 Mon Sep 17 00:00:00 2001 From: Adrian Holfter Date: Fri, 8 Oct 2021 12:06:48 +0200 Subject: [PATCH 1/2] Fix code locating Bearer token --- src/Illuminate/Http/Concerns/InteractsWithInput.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Http/Concerns/InteractsWithInput.php b/src/Illuminate/Http/Concerns/InteractsWithInput.php index 6d78acd88685..147ca7b76e84 100644 --- a/src/Illuminate/Http/Concerns/InteractsWithInput.php +++ b/src/Illuminate/Http/Concerns/InteractsWithInput.php @@ -54,7 +54,7 @@ public function bearerToken() { $header = $this->header('Authorization', ''); - $position = strrpos($header, 'Bearer'); + $position = strrpos($header, 'Bearer '); if ($position !== false) { $header = substr($header, $position + 7); From 7589a92f50336ea42da9d82eee7ef8139dd21e01 Mon Sep 17 00:00:00 2001 From: Adrian Holfter Date: Fri, 8 Oct 2021 12:09:08 +0200 Subject: [PATCH 2/2] Update HttpRequestTest.php --- tests/Http/HttpRequestTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Http/HttpRequestTest.php b/tests/Http/HttpRequestTest.php index 811555a692f9..17bbc5927b22 100644 --- a/tests/Http/HttpRequestTest.php +++ b/tests/Http/HttpRequestTest.php @@ -718,8 +718,8 @@ public function testHeaderMethod() public function testBearerTokenMethod() { - $request = Request::create('/', 'GET', [], [], [], ['HTTP_AUTHORIZATION' => 'Bearer foo']); - $this->assertSame('foo', $request->bearerToken()); + $request = Request::create('/', 'GET', [], [], [], ['HTTP_AUTHORIZATION' => 'Bearer fooBearerbar']); + $this->assertSame('fooBearerbar', $request->bearerToken()); $request = Request::create('/', 'GET', [], [], [], ['HTTP_AUTHORIZATION' => 'Basic foo, Bearer bar']); $this->assertSame('bar', $request->bearerToken());