cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

laravel-6 support

Browse Source
This commit is contained in:
RafficMohammed
2023-01-08 01:17:22 +05:30
parent 1a5c16ae4b
commit 774eed8b0e
4962 changed files with 279380 additions and 297961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vendor/laravel/socialite/src/Two/BitbucketProvider.php vendored
View File

@@ -3,7 +3,7 @@
namespace Laravel\Socialite\Two;
use Exception;
use GuzzleHttp\ClientInterface;
use Illuminate\Support\Arr;
class BitbucketProvider extends AbstractProvider implements ProviderInterface
{
@@ -86,9 +86,11 @@ class BitbucketProvider extends AbstractProvider implements ProviderInterface
protected function mapUserToObject(array $user)
{
return (new User)->setRaw($user)->map([
'id' => $user['uuid'], 'nickname' => $user['username'],
'name' => array_get($user, 'display_name'), 'email' => array_get($user, 'email'),
'avatar' => array_get($user, 'links.avatar.href'),
'id' => $user['uuid'],
'nickname' => $user['username'],
'name' => Arr::get($user, 'display_name'),
'email' => Arr::get($user, 'email'),
'avatar' => Arr::get($user, 'links.avatar.href'),
]);
}
@@ -100,12 +102,10 @@ class BitbucketProvider extends AbstractProvider implements ProviderInterface
*/
public function getAccessToken($code)
{
$postKey = (version_compare(ClientInterface::VERSION, '6') === 1) ? 'form_params' : 'body';
$response = $this->getHttpClient()->post($this->getTokenUrl(), [
'auth' => [$this->clientId, $this->clientSecret],
'headers' => ['Accept' => 'application/json'],
$postKey => $this->getTokenFields($code),
'form_params' => $this->getTokenFields($code),
]);
return json_decode($response->getBody(), true)['access_token'];