drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated packages

Browse Source
This commit is contained in:
drkthunder02
2019-05-18 09:06:43 +00:00
parent 901d16349e
commit e9487fa58a
2025 changed files with 30366 additions and 49653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/laravel/socialite/README.md vendored
View File

@@ -13,8 +13,6 @@ Laravel Socialite provides an expressive, fluent interface to OAuth authenticati
**We are not accepting new adapters.**
**If you are using Laravel 5.3 or below, please use [Socialite 2.0](https://github.com/laravel/socialite/tree/2.0).**
Adapters for other platforms are listed at the community driven [Socialite Providers](https://socialiteproviders.github.io/) website.
## Official Documentation

2
vendor/laravel/socialite/composer.json vendored
View File

@@ -33,7 +33,7 @@
},
"autoload-dev": {
"psr-4": {
"Tests\\": "tests/"
"Laravel\\Socialite\\Tests\\": "tests/"
}
},
"extra": {

14
vendor/laravel/socialite/src/One/AbstractProvider.php vendored
View File

@@ -81,8 +81,11 @@ abstract class AbstractProvider implements ProviderContract
->setToken($token->getIdentifier(), $token->getSecret());
return $instance->map([
'id' => $user->uid, 'nickname' => $user->nickname,
'name' => $user->name, 'email' => $user->email, 'avatar' => $user->imageUrl,
'id' => $user->uid,
'nickname' => $user->nickname,
'name' => $user->name,
'email' => $user->email,
'avatar' => $user->imageUrl,
]);
}
@@ -108,8 +111,11 @@ abstract class AbstractProvider implements ProviderContract
->setToken($tokenCredentials->getIdentifier(), $tokenCredentials->getSecret());
return $instance->map([
'id' => $user->uid, 'nickname' => $user->nickname,
'name' => $user->name, 'email' => $user->email, 'avatar' => $user->imageUrl,
'id' => $user->uid,
'nickname' => $user->nickname,
'name' => $user->name,
'email' => $user->email,
'avatar' => $user->imageUrl,
]);
}

7
vendor/laravel/socialite/src/One/TwitterProvider.php vendored
View File

@@ -26,8 +26,11 @@ class TwitterProvider extends AbstractProvider
->setToken($token->getIdentifier(), $token->getSecret());
return $instance->map([
'id' => $user->uid, 'nickname' => $user->nickname,
'name' => $user->name, 'email' => $user->email, 'avatar' => $user->imageUrl,
'id' => $user->uid,
'nickname' => $user->nickname,
'name' => $user->name,
'email' => $user->email,
'avatar' => $user->imageUrl,
'avatar_original' => str_replace('_normal', '', $user->imageUrl),
]);
}

3
vendor/laravel/socialite/src/SocialiteManager.php vendored
View File

@@ -7,6 +7,7 @@ use Illuminate\Support\Str;
use InvalidArgumentException;
use Illuminate\Support\Manager;
use Laravel\Socialite\Two\GithubProvider;
use Laravel\Socialite\Two\GitlabProvider;
use Laravel\Socialite\Two\GoogleProvider;
use Laravel\Socialite\One\TwitterProvider;
use Laravel\Socialite\Two\FacebookProvider;
@@ -107,7 +108,7 @@ class SocialiteManager extends Manager implements Contracts\Factory
$config = $this->app['config']['services.gitlab'];
return $this->buildProvider(
\Laravel\Socialite\Two\GitlabProvider::class, $config
GitlabProvider::class, $config
);
}

9
vendor/laravel/socialite/src/Two/AbstractProvider.php vendored
View File

@@ -176,7 +176,8 @@ abstract class AbstractProvider implements ProviderContract
protected function getCodeFields($state = null)
{
$fields = [
'client_id' => $this->clientId, 'redirect_uri' => $this->redirectUrl,
'client_id' => $this->clientId,
'redirect_uri' => $this->redirectUrl,
'scope' => $this->formatScopes($this->getScopes(), $this->scopeSeparator),
'response_type' => 'code',
];
@@ -276,8 +277,10 @@ abstract class AbstractProvider implements ProviderContract
protected function getTokenFields($code)
{
return [
'client_id' => $this->clientId, 'client_secret' => $this->clientSecret,
'code' => $code, 'redirect_uri' => $this->redirectUrl,
'client_id' => $this->clientId,
'client_secret' => $this->clientSecret,
'code' => $code,
'redirect_uri' => $this->redirectUrl,
];
}

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

@@ -87,8 +87,10 @@ class BitbucketProvider extends AbstractProvider implements ProviderInterface
protected function mapUserToObject(array $user)
{
return (new User)->setRaw($user)->map([
'id' => $user['uuid'], 'nickname' => $user['username'],
'name' => Arr::get($user, 'display_name'), 'email' => Arr::get($user, 'email'),
'id' => $user['uuid'],
'nickname' => $user['username'],
'name' => Arr::get($user, 'display_name'),
'email' => Arr::get($user, 'email'),
'avatar' => Arr::get($user, 'links.avatar.href'),
]);
}

7
vendor/laravel/socialite/src/Two/FacebookProvider.php vendored
View File

@@ -111,8 +111,11 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
$avatarUrl = $this->graphUrl.'/'.$this->version.'/'.$user['id'].'/picture';
return (new User)->setRaw($user)->map([
'id' => $user['id'], 'nickname' => null, 'name' => isset($user['name']) ? $user['name'] : null,
'email' => isset($user['email']) ? $user['email'] : null, 'avatar' => $avatarUrl.'?type=normal',
'id' => $user['id'],
'nickname' => null,
'name' => isset($user['name']) ? $user['name'] : null,
'email' => isset($user['email']) ? $user['email'] : null,
'avatar' => $avatarUrl.'?type=normal',
'avatar_original' => $avatarUrl.'?width=1920',
'profileUrl' => isset($user['link']) ? $user['link'] : null,
]);

7
vendor/laravel/socialite/src/Two/GithubProvider.php vendored
View File

@@ -81,8 +81,11 @@ class GithubProvider extends AbstractProvider implements ProviderInterface
protected function mapUserToObject(array $user)
{
return (new User)->setRaw($user)->map([
'id' => $user['id'], 'nickname' => $user['login'], 'name' => Arr::get($user, 'name'),
'email' => Arr::get($user, 'email'), 'avatar' => $user['avatar_url'],
'id' => $user['id'],
'nickname' => $user['login'],
'name' => Arr::get($user, 'name'),
'email' => Arr::get($user, 'email'),
'avatar' => $user['avatar_url'],
]);
}

13
vendor/laravel/socialite/src/Two/GoogleProvider.php vendored
View File

@@ -48,7 +48,7 @@ class GoogleProvider extends AbstractProvider implements ProviderInterface
*/
protected function getTokenFields($code)
{
return array_add(
return Arr::add(
parent::getTokenFields($code), 'grant_type', 'authorization_code'
);
}
@@ -58,7 +58,7 @@ class GoogleProvider extends AbstractProvider implements ProviderInterface
*/
protected function getUserByToken($token)
{
$response = $this->getHttpClient()->get('https://www.googleapis.com/plus/v1/people/me?', [
$response = $this->getHttpClient()->get('https://www.googleapis.com/userinfo/v2/me?', [
'query' => [
'prettyPrint' => 'false',
],
@@ -76,11 +76,14 @@ class GoogleProvider extends AbstractProvider implements ProviderInterface
*/
protected function mapUserToObject(array $user)
{
$avatarUrl = Arr::get($user, 'image.url');
$avatarUrl = Arr::get($user, 'picture');
return (new User)->setRaw($user)->map([
'id' => $user['id'], 'nickname' => Arr::get($user, 'nickname'), 'name' => $user['displayName'],
'email' => Arr::get($user, 'emails.0.value'), 'avatar' => $avatarUrl,
'id' => $user['id'],
'nickname' => Arr::get($user, 'nickname'),
'name' => Arr::get($user, 'name'),
'email' => Arr::get($user, 'email'),
'avatar' => $avatarUrl,
'avatar_original' => preg_replace('/\?sz=([0-9]+)/', '', $avatarUrl),
]);
}

7
vendor/laravel/socialite/src/Two/LinkedInProvider.php vendored
View File

@@ -83,8 +83,11 @@ class LinkedInProvider extends AbstractProvider implements ProviderInterface
protected function mapUserToObject(array $user)
{
return (new User)->setRaw($user)->map([
'id' => $user['id'], 'nickname' => null, 'name' => Arr::get($user, 'formattedName'),
'email' => Arr::get($user, 'emailAddress'), 'avatar' => Arr::get($user, 'pictureUrl'),
'id' => $user['id'],
'nickname' => null,
'name' => Arr::get($user, 'formattedName'),
'email' => Arr::get($user, 'emailAddress'),
'avatar' => Arr::get($user, 'pictureUrl'),
'avatar_original' => Arr::get($user, 'pictureUrls.values.0'),
]);
}