diff --git a/src/Auth/OAuth/Dropbox.php b/src/Auth/OAuth/Dropbox.php index 85843718da..db74215274 100644 --- a/src/Auth/OAuth/Dropbox.php +++ b/src/Auth/OAuth/Dropbox.php @@ -33,10 +33,10 @@ class Dropbox extends OAuth public function getLoginURL(): string { return 'https://www.dropbox.com/oauth2/authorize?'.http_build_query([ - 'client_id' => $this->appID, - 'redirect_uri' => $this->callback, - 'state' => json_encode($this->state), - 'response_type' => 'code' + 'client_id' => $this->appID, + 'redirect_uri' => $this->callback, + 'state' => json_encode($this->state), + 'response_type' => 'code' ]); } diff --git a/src/Auth/OAuth/Facebook.php b/src/Auth/OAuth/Facebook.php index ed50748bac..719d6db166 100644 --- a/src/Auth/OAuth/Facebook.php +++ b/src/Auth/OAuth/Facebook.php @@ -16,6 +16,11 @@ class Facebook extends OAuth */ protected $user = []; + /** + * @var array + */ + protected $scopes = ['email']; + /** * @return string */ @@ -29,7 +34,12 @@ class Facebook extends OAuth */ public function getLoginURL():string { - return 'https://www.facebook.com/'.$this->version.'/dialog/oauth?client_id='.urlencode($this->appID).'&redirect_uri='.urlencode($this->callback).'&scope=email&state='.urlencode(json_encode($this->state)); + return 'https://www.facebook.com/'.$this->version.'/dialog/oauth?'.http_build_query([ + 'client_id'=> $this->appID, + 'redirect_uri' => $this->callback, + 'scope' => implode(' ', $this->getScopes()), + 'state' => json_encode($this->state) + ]); } /** @@ -41,19 +51,20 @@ class Facebook extends OAuth { $accessToken = $this->request( 'GET', - 'https://graph.facebook.com/'.$this->version.'/oauth/access_token?'. - 'client_id='.urlencode($this->appID). - '&redirect_uri='.urlencode($this->callback). - '&client_secret='.urlencode($this->appSecret). - '&code='.urlencode($code) + 'https://graph.facebook.com/'.$this->version.'/oauth/access_token?'.http_build_query([ + 'client_id' => $this->appID, + 'redirect_uri' => $this->callback, + 'client_secret' => $this->appSecret, + 'code' => $code + ]) ); - $accessToken = json_decode($accessToken, true); // + $accessToken = json_decode($accessToken, true); if (isset($accessToken['access_token'])) { return $accessToken['access_token']; } - + return ''; }