dependencies-upgrade

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

@@ -2,6 +2,7 @@
 
 namespace Laravel\Socialite\Two;
 
+use GuzzleHttp\RequestOptions;
 use Illuminate\Support\Arr;
 
 class FacebookProvider extends AbstractProvider implements ProviderInterface
@@ -48,6 +49,13 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
      */
     protected $reRequest = false;
 
+    /**
+     * The access token that was last used to retrieve a user.
+     *
+     * @var string|null
+     */
+    protected $lastToken;
+
     /**
      * {@inheritdoc}
      */
@@ -70,7 +78,7 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
     public function getAccessTokenResponse($code)
     {
         $response = $this->getHttpClient()->post($this->getTokenUrl(), [
-            'form_params' => $this->getTokenFields($code),
+            RequestOptions::FORM_PARAMS => $this->getTokenFields($code),
         ]);
 
         $data = json_decode($response->getBody(), true);
@@ -83,18 +91,22 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
      */
     protected function getUserByToken($token)
     {
-        $meUrl = $this->graphUrl.'/'.$this->version.'/me?access_token='.$token.'&fields='.implode(',', $this->fields);
+        $this->lastToken = $token;
+
+        $params = [
+            'access_token' => $token,
+            'fields' => implode(',', $this->fields),
+        ];
 
         if (! empty($this->clientSecret)) {
-            $appSecretProof = hash_hmac('sha256', $token, $this->clientSecret);
-
-            $meUrl .= '&appsecret_proof='.$appSecretProof;
+            $params['appsecret_proof'] = hash_hmac('sha256', $token, $this->clientSecret);
         }
 
-        $response = $this->getHttpClient()->get($meUrl, [
-            'headers' => [
+        $response = $this->getHttpClient()->get($this->graphUrl.'/'.$this->version.'/me', [
+            RequestOptions::HEADERS => [
                 'Accept' => 'application/json',
             ],
+            RequestOptions::QUERY => $params,
         ]);
 
         return json_decode($response->getBody(), true);
@@ -173,6 +185,16 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
         return $this;
     }
 
+    /**
+     * Get the last access token used.
+     *
+     * @return string|null
+     */
+    public function lastToken()
+    {
+        return $this->lastToken;
+    }
+
     /**
      * Specify which graph version should be used.
      *