Laravel version update

Laravel version update

vendor/laravel/socialite/src/Two/FacebookProvider.php

@@ -2,9 +2,6 @@
 
 namespace Laravel\Socialite\Two;
 
-use Illuminate\Support\Arr;
-use GuzzleHttp\ClientInterface;
-
 class FacebookProvider extends AbstractProvider implements ProviderInterface
 {
     /**
@@ -19,14 +16,14 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
      *
      * @var string
      */
-    protected $version = 'v2.6';
+    protected $version = 'v2.5';
 
     /**
      * The user fields being requested.
      *
      * @var array
      */
-    protected $fields = ['name', 'email', 'gender', 'verified'];
+    protected $fields = ['first_name', 'last_name', 'email', 'gender', 'verified'];
 
     /**
      * The scopes being requested.
@@ -42,13 +39,6 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
      */
     protected $popup = false;
 
-    /**
-     * Re-request a declined permission.
-     *
-     * @var bool
-     */
-    protected $reRequest = false;
-
     /**
      * {@inheritdoc}
      */
@@ -62,23 +52,32 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
      */
     protected function getTokenUrl()
     {
-        return $this->graphUrl.'/'.$this->version.'/oauth/access_token';
+        return $this->graphUrl.'/oauth/access_token';
+    }
+
+    /**
+     * Get the access token for the given code.
+     *
+     * @param  string  $code
+     * @return string
+     */
+    public function getAccessToken($code)
+    {
+        $response = $this->getHttpClient()->get($this->getTokenUrl(), [
+            'query' => $this->getTokenFields($code),
+        ]);
+
+        return $this->parseAccessToken($response->getBody());
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getAccessTokenResponse($code)
+    protected function parseAccessToken($body)
     {
-        $postKey = (version_compare(ClientInterface::VERSION, '6') === 1) ? 'form_params' : 'body';
+        parse_str($body);
 
-        $response = $this->getHttpClient()->post($this->getTokenUrl(), [
-            $postKey => $this->getTokenFields($code),
-        ]);
-
-        $data = json_decode($response->getBody(), true);
-
-        return Arr::add($data, 'expires_in', Arr::pull($data, 'expires'));
+        return $access_token;
     }
 
     /**
@@ -86,15 +85,9 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
      */
     protected function getUserByToken($token)
     {
-        $meUrl = $this->graphUrl.'/'.$this->version.'/me?access_token='.$token.'&fields='.implode(',', $this->fields);
+        $appSecretProof = hash_hmac('sha256', $token, $this->clientSecret);
 
-        if (! empty($this->clientSecret)) {
-            $appSecretProof = hash_hmac('sha256', $token, $this->clientSecret);
-
-            $meUrl .= '&appsecret_proof='.$appSecretProof;
-        }
-
-        $response = $this->getHttpClient()->get($meUrl, [
+        $response = $this->getHttpClient()->get($this->graphUrl.'/'.$this->version.'/me?access_token='.$token.'&appsecret_proof='.$appSecretProof.'&fields='.implode(',', $this->fields), [
             'headers' => [
                 'Accept' => 'application/json',
             ],
@@ -110,8 +103,12 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
     {
         $avatarUrl = $this->graphUrl.'/'.$this->version.'/'.$user['id'].'/picture';
 
+        $firstName = isset($user['first_name']) ? $user['first_name'] : null;
+
+        $lastName = isset($user['last_name']) ? $user['last_name'] : null;
+
         return (new User)->setRaw($user)->map([
-            'id' => $user['id'], 'nickname' => null, 'name' => isset($user['name']) ? $user['name'] : null,
+            'id' => $user['id'], 'nickname' => null, 'name' => $firstName.' '.$lastName,
             'email' => isset($user['email']) ? $user['email'] : null, 'avatar' => $avatarUrl.'?type=normal',
             'avatar_original' => $avatarUrl.'?width=1920',
         ]);
@@ -128,10 +125,6 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
             $fields['display'] = 'popup';
         }
 
-        if ($this->reRequest) {
-            $fields['auth_type'] = 'rerequest';
-        }
-
         return $fields;
     }
 
@@ -159,14 +152,4 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
 
         return $this;
     }
-
-    /**
-     * Re-request permissions which were previously declined.
-     *
-     * @return $this
-     */
-    public function reRequest()
-    {
-        $this->reRequest = true;
-    }
 }