vitalif
/
oauth2-client
mirror of https://github.com/vitalif/oauth2-client
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #187 from geofflancaster/master 

update google scopes and endpoint to remove deprecated values
oauth1test
Ben Ramsey 2014-12-29 05:01:03 -05:00
parent ce7ea3ddfc 5952f5d8f5
commit a3fd10e9cf
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Provider/Google.php
View File

@ -9,8 +9,8 @@ class Google extends AbstractProvider
public $scopeSeparator = ' '; public $scopeSeparator = ' ';
public $scopes = [ public $scopes = [
'https://www.googleapis.com/auth/userinfo.profile', 'profile',
'https://www.googleapis.com/auth/userinfo.email', 'email',
]; ];
/** /**
@ -41,7 +41,10 @@ class Google extends AbstractProvider
public function urlUserDetails(\League\OAuth2\Client\Token\AccessToken $token) public function urlUserDetails(\League\OAuth2\Client\Token\AccessToken $token)
{ {
return 'https://www.googleapis.com/oauth2/v1/userinfo?alt=json&access_token='.$token; return
'https://www.googleapis.com/plus/v1/people/me?'.
'fields=name(familyName%2CgivenName)%2CdisplayName%2C'.
'emails%2Fvalue%2Cimage%2Furl&alt=json&access_token='.$token;
} }
public function userDetails($response, \League\OAuth2\Client\Token\AccessToken $token) public function userDetails($response, \League\OAuth2\Client\Token\AccessToken $token)
@ -50,14 +53,19 @@ class Google extends AbstractProvider
$user = new User(); $user = new User();
$imageUrl = (isset($response['picture'])) ? $response['picture'] : null; $imageUrl = (isset($response['image']) &&
$response['image']->url) ? $response['image']->url : null;
$email =
(isset($response['emails']) &&
count($response['emails']) &&
$response['emails'][0]->value)? $response['emails'][0]->value : null;
$user->exchangeArray([ $user->exchangeArray([
'uid' => $response['id'], 'uid' => $response['id'],
'name' => $response['name'], 'name' => $response['displayName'],
'firstname' => $response['given_name'], 'firstname' => $response['name']->givenName,
'lastName' => $response['family_name'], 'lastName' => $response['name']->familyName,
'email' => $response['email'], 'email' => $email,
'imageUrl' => $imageUrl, 'imageUrl' => $imageUrl,
]); ]);
@ -71,12 +79,14 @@ class Google extends AbstractProvider
public function userEmail($response, \League\OAuth2\Client\Token\AccessToken $token) public function userEmail($response, \League\OAuth2\Client\Token\AccessToken $token)
{ {
return isset($response->email) && $response->email ? $response->email : null; return ($response->emails &&
count($response->emails) &&
$response->emails[0]->value) ? $response->emails[0]->value : null;
} }
public function userScreenName($response, \League\OAuth2\Client\Token\AccessToken $token) public function userScreenName($response, \League\OAuth2\Client\Token\AccessToken $token)
{ {
return [$response->given_name, $response->family_name]; return [$response->name->givenName, $response->name->familyName];
} }
public function getAuthorizationUrl($options = array()) public function getAuthorizationUrl($options = array())

4
test/src/Provider/GoogleTest.php
View File

@ -71,7 +71,7 @@ class GoogleTest extends \PHPUnit_Framework_TestCase
public function testScopes() public function testScopes()
{ {
$this->assertEquals(['https://www.googleapis.com/auth/userinfo.profile', 'https://www.googleapis.com/auth/userinfo.email'], $this->provider->getScopes()); $this->assertEquals(['profile', 'email'], $this->provider->getScopes());
} }
public function testUserData() public function testUserData()
@ -80,7 +80,7 @@ class GoogleTest extends \PHPUnit_Framework_TestCase
$postResponse->shouldReceive('getBody')->times(1)->andReturn('{"access_token": "mock_access_token", "expires": 3600, "refresh_token": "mock_refresh_token", "uid": 1}'); $postResponse->shouldReceive('getBody')->times(1)->andReturn('{"access_token": "mock_access_token", "expires": 3600, "refresh_token": "mock_refresh_token", "uid": 1}');
$getResponse = m::mock('Guzzle\Http\Message\Response'); $getResponse = m::mock('Guzzle\Http\Message\Response');
$getResponse->shouldReceive('getBody')->times(4)->andReturn('{"id": 12345, "name": "mock_name", "given_name": "mock_first_name", "family_name": "mock_last_name", "email": "mock_email"}'); $getResponse->shouldReceive('getBody')->times(4)->andReturn('{"emails": [{"value": "mock_email"}],"id": "12345","displayName": "mock_name","name": {"familyName": "mock_last_name","givenName": "mock_first_name"},"image": {"url": "mock_image_url"}}');
$client = m::mock('Guzzle\Service\Client'); $client = m::mock('Guzzle\Service\Client');
$client->shouldReceive('setBaseUrl')->times(5); $client->shouldReceive('setBaseUrl')->times(5);