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

Breaking change in GoogleProvider between laravel/socialite:2.0.21 and laravel/socialite:2.0.22 #5

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
+9 −5
Open

Breaking change in GoogleProvider between laravel/socialite:2.0.21 and laravel/socialite:2.0.22 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0095d17
Merge branch 'release/0.14.0' into develop
Dec 29, 2017
5733f78
Removed the service name from the email
splessons Mar 30, 2019
43f15de
Change to our own package
splessons Mar 31, 2019
3640f5d
Merge branch 'release/0.15.0'
splessons Mar 31, 2019
2b805e8
Merge tag '0.15.0' into develop
splessons Mar 31, 2019
77dd22d
Merge branch 'release/spl-0.14.0'
splessons Mar 31, 2019
1b4e2d1
Updated the read me file
splessons Mar 31, 2019
32b53c5
Small checking
splessons Mar 31, 2019
3ca921b
Using
splessons Mar 31, 2019
fba7a04
Testing
splessons Mar 31, 2019
fc8965e
Making sure it's picking the right version
splessons Apr 1, 2019
62077d8
Finally it got it.
splessons Apr 1, 2019
cc302e3
Merge branch 'spl-updated'
splessons Apr 1, 2019
1914ab3
Final
splessons Apr 1, 2019
dca2adc
Merge branch 'spl-updated'
splessons Apr 1, 2019
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
11 changes: 7 additions & 4 deletions src/Components/GoogleProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,15 @@ public function __construct($clientId, $clientSecret, $redirectUrl)
*/
protected function mapUserToObject(array $user)
{
$avatarUrl = array_get($user, 'picture');

return (new User)->setRaw($user)->map([
'id' => $user['id'],
'id' => array_get($user, 'id'),
'nickname' => array_get($user, 'nickname'),
'name' => $user['displayName'],
'email' => $user['emails'][0]['value'],
'avatar' => array_get($user, 'image')['url'],
'name' => array_get($user, 'name'),
'email' => array_get($user, 'email'),
'avatar' => $avatarUrl,
'avatar_original' => preg_replace('/\?sz=([0-9]+)/', '', $avatarUrl),
]);
}
}
3 changes: 2 additions & 1 deletion src/Services/BaseOAuthService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ public function createShadowOAuthUser(OAuthUserContract $OAuthUser)

if (empty($email)) {
$email = $OAuthUser->getId() . '+' . $serviceName . '@' . $serviceName . '.com';
} else {
}
else {
list($emailId, $domain) = explode('@', $email);
$email = $emailId . '+' . $serviceName . '@' . $domain;
}
Expand Down