hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-1751_GOOGLE-AUTH_master (#2384)

Browse Source 
* PHRAS-1751_GOOGLE-AUTH_master
replace lib "alchemy/google-plus-api-client" by "google/apiclient"
had to downgrade facebook/php-sdk from 4 (does not exists ?) to 3 (abandoned anyway) to allow composer update.
see PHRAS-1752

* PHRAS-1751_GOOGLE-AUTH_master
revert composer.lock, only remove & update new google-sdk (composer full update make tests boot to fail. to see later)

* PHRAS-1751_GOOGLE-AUTH_master
fix unit test
This commit is contained in:
jygaulier
2017-11-30 10:45:56 +01:00
committed by GitHub
parent be811e8876
commit 8117d1ebc0
4 changed files with 583 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
tests/Alchemy/Tests/Phrasea/Authentication/Provider/GooglePlusTest.php
View File

@@ -125,7 +125,6 @@ class GooglePlusTest extends ProviderTestCase
protected function getProviderForSuccessIdentity()
{
$this->markTestIncomplete('Incomplete flow for google plus API check');
$provider = $this->getProvider();
$guzzle = $this->getMock('Guzzle\Http\ClientInterface');
@@ -166,24 +165,46 @@ class GooglePlusTest extends ProviderTestCase
$provider->setGuzzleClient($guzzle);
$provider->getSession()->set('google-plus.provider.id', '12345678');
$people = $this->getMockBuilder('Google_PeopleServiceResource')
$googleClient = $this->getMockBuilder('\Google_Client')
->disableOriginalConstructor()
->getMock();
$people->expects($this->once())
->method('get')
->will($this->returnValue([
'name' => [
'givenName' => self::FIRSTNAME,
'familyName' => self::LASTNAME,
],
'id' => self::ID,
'image' => [
'url' => self::IMAGEURL
]
]));
$googleClient->expects($this->any())
->method("getAccessToken")
->will($this->returnValue(
json_encode([
'access_token' => 'fakeAccessToken',
'expires_in' => 3599,
'id_token' => 'fakeIdToken',
'token_type' => 'Bearer',
'created' => 1511374176,
])
));
$provider->getGooglePlusService()->people = $people;
$googleClient->expects($this->any())
->method("verifyIdToken")
->with($this->equalTo("fakeIdToken"))
->will($this->returnValue(
[
'azp' => '1234azerty.apps.googleusercontent.com',
'aud' => '1234azerty.apps.googleusercontent.com',
'sub' => self::ID,
'hd' => 'somewhere.fr',
'email' => self::EMAIL,
'email_verified' => true,
'at_hash' => '123456789',
'iss' => 'https://accounts.google.com',
'iat' => 1511522056,
'exp' => 1511525656,
'name' => self::FIRSTNAME . ' ' . self::LASTNAME,
'picture' => self::IMAGEURL,
'given_name' => self::FIRSTNAME,
'family_name' => self::LASTNAME,
'locale' => 'fr',
]
));
$provider->setGoogleClient($googleClient);
return $provider;
}
@@ -256,12 +277,7 @@ class GooglePlusTest extends ProviderTestCase
->method('createAuthUrl')
->will($this->returnValue('https://www.google.com/auth'));
$plus = $this->getMockBuilder('Google_PlusService')
->disableOriginalConstructor()
->getMock();
$google = new GooglePlus($this->getUrlGeneratorMock(), $this->getMockSession(), $googleMock, $this->getGuzzleMock());
$google->setGooglePlusService($plus);
return $google;
}