From c497a9446b8bd90fcb8278f9ef96a0737e4a01ef Mon Sep 17 00:00:00 2001 From: Adrian Holfter Date: Fri, 8 Oct 2021 15:49:03 +0200 Subject: [PATCH] [8.x] Fix code locating Bearer token in InteractsWithInput (#39150) * Fix code locating Bearer token * Update HttpRequestTest.php --- src/Illuminate/Http/Concerns/InteractsWithInput.php | 2 +- tests/Http/HttpRequestTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Illuminate/Http/Concerns/InteractsWithInput.php b/src/Illuminate/Http/Concerns/InteractsWithInput.php index 490d74f139db..70a96f0ae971 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); diff --git a/tests/Http/HttpRequestTest.php b/tests/Http/HttpRequestTest.php index 637b450e100b..b9b847e7e0ab 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());