Skip to content

Fix Issue #1 #2

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

Merged
Adyg merged 2 commits into from
Jul 11, 2014
Merged

Fix Issue #1 #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
189a689
Fix Issue #1
Jun 25, 2014
eea8131
Fix OAuth set AccessToken
Jul 9, 2014
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
8 changes: 7 additions & 1 deletion lib/Imgur/Auth/OAuth2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Imgur\Auth;

use Imgur\Listener;
use Imgur\Exception\AuthException;

/**
* Authentication class used for handling OAuth2
Expand Down Expand Up @@ -143,6 +144,11 @@ public function setAccessToken($token, $httpClient) {
throw new AuthException('Token is not a valid json string.');
}

if ( isset($token['data']['access_token'])) {
$token = $token['data'];
}


if (! isset($token['access_token'])) {
throw new AuthException('Access token could not be retrieved from the decoded json response.');
}
Expand Down Expand Up @@ -196,4 +202,4 @@ public function sign($httpClient) {
public function addListener($httpClient, $eventName, $listener) {
$httpClient->addListener($eventName, $listener);
}
}
}