Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.3] Update TokenGuard.php to look for key in query string items only. #14985

Merged
merged 2 commits into from
Aug 24, 2016
Merged

[5.3] Update TokenGuard.php to look for key in query string items only. #14985

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d12decf
Update TokenGuard.php to look for key in query string items only.
malhal Aug 24, 2016
5c99bb6
Update TokenGuard.php
malhal Aug 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Illuminate/Auth/TokenGuard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class TokenGuard implements Guard
protected $request;

/**
* The name of the field on the request containing the API token.
* The name of the query string item from the request containing the API token.
*
* @var string
*/
Expand Down Expand Up @@ -80,7 +80,7 @@ public function user()
*/
public function getTokenForRequest()
{
$token = $this->request->input($this->inputKey);
$token = $this->request->query($this->inputKey);

if (empty($token)) {
$token = $this->request->bearerToken();
Expand Down