Fix Google Oauth Login

dreamfactorysoftware · Jun 7, 2022 · f14a9af · f14a9af
1 parent bceaf71
commit f14a9af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Components/DfOAuthTwoProvider.php b/src/Components/DfOAuthTwoProvider.php
@@ -3,7 +3,7 @@
 namespace DreamFactory\Core\OAuth\Components;
 
 use Illuminate\Support\Str;
-use Symfony\Component\HttpFoundation\RedirectResponse;
+use Illuminate\Http\RedirectResponse;
 use Laravel\Socialite\Two\InvalidStateException;
 use SocialiteProviders\Manager\OAuth2\User;
 

diff --git a/src/Components/GoogleProvider.php b/src/Components/GoogleProvider.php
@@ -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),
         ]);
     }
 }